diff --git a/.gitignore b/.gitignore index dc184db3ee..94294666e5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ packages/**/main packages/**/module launch.json .vscode/settings.json +.idea/ diff --git a/README.md b/README.md index 9c681236dc..29e155cbfe 100644 --- a/README.md +++ b/README.md @@ -262,12 +262,15 @@ telescope({ | option | description | defaults | | ------------------------------ | -------------------------------------------------------------- | ---------- | | `aminoEncoding.enabled` | generate amino types and amino converters | `true` | +| `aminoEncoding.omitEmptyTags` | An array of strings that determines whether a field should be omitted when serialized to JSON. If the array includes "omitempty", any field with the "omitempty" option in either gogoproto.jsontag or cosmos_proto.json_tag will be omitted. If the array includes "dont_omitempty", the field will be omitted or not based on the value of "(amino.dont_omitempty)": if it's null or false, the field will be omitted; if it's true, the field will not be omitted. | `["omitempty", "dont_omitempty"]` | | `aminoEncoding.disableMsgTypes` | disable generating AminoMsg types | `false` | | `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` | @deprecated. To use legacy inline encoding instead of using v2 recursive encoding | `false`| | `aminoEncoding.useRecursiveV2encoding` | this's been removed. See useLegacyInlineEncoding instead. | | +| `aminoEncoding.legacy.useNullHandling` | handle null case when generating legacy amino converters(those in tx.amino.ts) | | +| `aminoEncoding.legacy.useOmitEmpty` | handle omit empty or not when generating legacy amino converters(those in tx.amino.ts) | | ### Implemented Interface Options diff --git a/__fixtures__/misc/output-impl-interfaces-gen/akash/deployment/v1beta1/authz.ts b/__fixtures__/misc/output-impl-interfaces-gen/akash/deployment/v1beta1/authz.ts index fd817b11f3..0d56b06860 100644 --- a/__fixtures__/misc/output-impl-interfaces-gen/akash/deployment/v1beta1/authz.ts +++ b/__fixtures__/misc/output-impl-interfaces-gen/akash/deployment/v1beta1/authz.ts @@ -27,7 +27,7 @@ export interface DepositDeploymentAuthorizationAmino { * SpendLimit is the amount the grantee is authorized to spend from the granter's account for * the purpose of deployment. */ - spend_limit?: CoinAmino; + spend_limit: CoinAmino; } export interface DepositDeploymentAuthorizationAminoMsg { type: "/akash.deployment.v1beta1.DepositDeploymentAuthorization"; @@ -120,7 +120,7 @@ export const DepositDeploymentAuthorization = { }, toAmino(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAmino { const obj: any = {}; - obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization { diff --git a/__fixtures__/misc/output-impl-interfaces-gen/cosmos/authz/v1beta1/authz.ts b/__fixtures__/misc/output-impl-interfaces-gen/cosmos/authz/v1beta1/authz.ts index 2bb273621a..1101cf344e 100644 --- a/__fixtures__/misc/output-impl-interfaces-gen/cosmos/authz/v1beta1/authz.ts +++ b/__fixtures__/misc/output-impl-interfaces-gen/cosmos/authz/v1beta1/authz.ts @@ -312,7 +312,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { @@ -482,7 +482,7 @@ export const Grant = { message.expiration = fromTimestamp(Timestamp.fromAmino(object.expiration)); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.single_msg !== undefined && object.single_msg !== null) { message.singleMsg = Any.fromAmino(object.single_msg); @@ -494,12 +494,12 @@ export const Grant = { const obj: any = {}; obj.authorization = message.authorization ? GlobalDecoderRegistry.toAminoMsg(message.authorization) : undefined; obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; - obj.opt = message.opt; + obj.opt = message.opt === 0 ? undefined : message.opt; obj.single_msg = message.singleMsg ? Any.toAmino(message.singleMsg) : undefined; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } return obj; }, @@ -656,8 +656,8 @@ export const GrantAuthorization = { }, toAmino(message: GrantAuthorization): GrantAuthorizationAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.authorization = message.authorization ? GlobalDecoderRegistry.toAminoMsg(message.authorization) : undefined; obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -774,7 +774,7 @@ export const GrantQueueItem = { if (message.msgTypeUrls) { obj.msg_type_urls = message.msgTypeUrls.map(e => e); } else { - obj.msg_type_urls = []; + obj.msg_type_urls = message.msgTypeUrls; } return obj; }, @@ -890,7 +890,7 @@ export const Grants = { if (message.authorization) { obj.authorization = message.authorization.map(e => e ? GlobalDecoderRegistry.toAminoMsg(e) : undefined); } else { - obj.authorization = []; + obj.authorization = message.authorization; } return obj; }, diff --git a/__fixtures__/misc/output-impl-interfaces-gen/cosmos/authz/v1beta1/tx.ts b/__fixtures__/misc/output-impl-interfaces-gen/cosmos/authz/v1beta1/tx.ts index e5f3a6e792..fe6e0be47c 100644 --- a/__fixtures__/misc/output-impl-interfaces-gen/cosmos/authz/v1beta1/tx.ts +++ b/__fixtures__/misc/output-impl-interfaces-gen/cosmos/authz/v1beta1/tx.ts @@ -288,8 +288,8 @@ export const MsgGrant = { }, toAmino(message: MsgGrant): MsgGrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.grant = message.grant ? Grant.toAmino(message.grant) : undefined; return obj; }, @@ -405,7 +405,7 @@ export const MsgExecResponse = { if (message.results) { obj.results = message.results.map(e => base64FromBytes(e)); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -534,11 +534,11 @@ export const MsgExec = { }, toAmino(message: MsgExec): MsgExecAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? GlobalDecoderRegistry.toAminoMsg(e) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -763,9 +763,9 @@ export const MsgRevoke = { }, toAmino(message: MsgRevoke): MsgRevokeAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromAminoMsg(object: MsgRevokeAminoMsg): MsgRevoke { diff --git a/__fixtures__/misc/output-impl-interfaces-gen/cosmos/bank/v1beta1/authz.ts b/__fixtures__/misc/output-impl-interfaces-gen/cosmos/bank/v1beta1/authz.ts index 1222b7ea17..5f5006af35 100644 --- a/__fixtures__/misc/output-impl-interfaces-gen/cosmos/bank/v1beta1/authz.ts +++ b/__fixtures__/misc/output-impl-interfaces-gen/cosmos/bank/v1beta1/authz.ts @@ -126,7 +126,7 @@ export const SendAuthorization = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } return obj; }, diff --git a/__fixtures__/misc/output-impl-interfaces-gen/cosmos/bank/v1beta1/tx.ts b/__fixtures__/misc/output-impl-interfaces-gen/cosmos/bank/v1beta1/tx.ts index 01664a6a69..bb4f13137e 100644 --- a/__fixtures__/misc/output-impl-interfaces-gen/cosmos/bank/v1beta1/tx.ts +++ b/__fixtures__/misc/output-impl-interfaces-gen/cosmos/bank/v1beta1/tx.ts @@ -255,20 +255,20 @@ export const MsgInstantiateContract2 = { }, toAmino(message: MsgInstantiateContract2): MsgInstantiateContract2Amino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; - obj.label = message.label; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : message.label; if (message.funds) { obj.funds = message.funds.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.funds = []; + obj.funds = message.funds; } obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; - obj.fix_msg = message.fixMsg; + obj.fix_msg = message.fixMsg === false ? undefined : message.fixMsg; obj.dont_omitempty_fix_msg = message.dontOmitemptyFixMsg ?? false; if (message.aListOfBytes) { obj.a_list_of_bytes = message.aListOfBytes.map(e => base64FromBytes(e)); } else { - obj.a_list_of_bytes = []; + obj.a_list_of_bytes = message.aListOfBytes; } return obj; }, diff --git a/__fixtures__/misc/output-impl-interfaces-gen/cosmos/base/v1beta1/coin.ts b/__fixtures__/misc/output-impl-interfaces-gen/cosmos/base/v1beta1/coin.ts index 5b7c368a3c..ea32198f46 100644 --- a/__fixtures__/misc/output-impl-interfaces-gen/cosmos/base/v1beta1/coin.ts +++ b/__fixtures__/misc/output-impl-interfaces-gen/cosmos/base/v1beta1/coin.ts @@ -213,8 +213,8 @@ export const Coin = { }, toAmino(message: Coin): CoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: CoinAminoMsg): Coin { @@ -336,8 +336,8 @@ export const DecCoin = { }, toAmino(message: DecCoin): DecCoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: DecCoinAminoMsg): DecCoin { @@ -443,7 +443,7 @@ export const IntProto = { }, toAmino(message: IntProto): IntProtoAmino { const obj: any = {}; - obj.int = message.int; + obj.int = message.int === "" ? undefined : message.int; return obj; }, fromAminoMsg(object: IntProtoAminoMsg): IntProto { @@ -549,7 +549,7 @@ export const DecProto = { }, toAmino(message: DecProto): DecProtoAmino { const obj: any = {}; - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; return obj; }, fromAminoMsg(object: DecProtoAminoMsg): DecProto { diff --git a/__fixtures__/misc/output-impl-interfaces-gen/cosmos_proto/cosmos.ts b/__fixtures__/misc/output-impl-interfaces-gen/cosmos_proto/cosmos.ts index 5b67489d0f..dcef5229e6 100644 --- a/__fixtures__/misc/output-impl-interfaces-gen/cosmos_proto/cosmos.ts +++ b/__fixtures__/misc/output-impl-interfaces-gen/cosmos_proto/cosmos.ts @@ -270,8 +270,8 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: InterfaceDescriptorAminoMsg): InterfaceDescriptor { @@ -411,17 +411,17 @@ export const ScalarDescriptor = { if (object.description !== undefined && object.description !== null) { message.description = object.description; } - message.fieldType = object.field_type?.map(e => scalarTypeFromJSON(e)) || []; + message.fieldType = object.field_type?.map(e => e) || []; return message; }, toAmino(message: ScalarDescriptor): ScalarDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; if (message.fieldType) { obj.field_type = message.fieldType.map(e => e); } else { - obj.field_type = []; + obj.field_type = message.fieldType; } return obj; }, diff --git a/__fixtures__/misc/output-impl-interfaces-gen/google/protobuf/descriptor.ts b/__fixtures__/misc/output-impl-interfaces-gen/google/protobuf/descriptor.ts index 69bcb99f05..6c05a6dd8c 100644 --- a/__fixtures__/misc/output-impl-interfaces-gen/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-impl-interfaces-gen/google/protobuf/descriptor.ts @@ -2285,7 +2285,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -2624,46 +2624,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2955,47 +2955,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3128,8 +3128,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -3244,8 +3244,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -3352,7 +3352,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -3570,10 +3570,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -3597,15 +3597,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -3722,7 +3722,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3905,22 +3905,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -4035,8 +4035,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -4168,8 +4168,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -4308,11 +4308,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -4494,12 +4494,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -4874,7 +4874,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -4923,30 +4923,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5115,14 +5115,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5301,13 +5301,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -5323,16 +5323,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5440,7 +5440,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5577,12 +5577,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5703,11 +5703,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5828,11 +5828,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5962,19 +5962,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -6182,14 +6182,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -6303,8 +6303,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -6411,7 +6411,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -6613,19 +6613,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -6733,7 +6733,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -6898,11 +6898,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/misc/output-impl-interfaces-gen/helpers.ts b/__fixtures__/misc/output-impl-interfaces-gen/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output-impl-interfaces-gen/helpers.ts +++ b/__fixtures__/misc/output-impl-interfaces-gen/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/api/expr/v1alpha1/eval.ts b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/api/expr/v1alpha1/eval.ts index 09715db4dc..eb9d77b6fa 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/api/expr/v1alpha1/eval.ts @@ -127,7 +127,7 @@ export const ExprValue = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -226,7 +226,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { diff --git a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/protobuf/descriptor.ts index e33a76c376..194145283b 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/protobuf/descriptor.ts @@ -2285,7 +2285,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -2624,46 +2624,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2955,47 +2955,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3128,8 +3128,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -3244,8 +3244,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -3352,7 +3352,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -3570,10 +3570,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -3597,15 +3597,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -3722,7 +3722,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3905,22 +3905,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -4035,8 +4035,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -4168,8 +4168,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -4308,11 +4308,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -4494,12 +4494,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -4874,7 +4874,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -4923,30 +4923,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5115,14 +5115,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5301,13 +5301,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -5323,16 +5323,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5440,7 +5440,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5577,12 +5577,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5703,11 +5703,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5828,11 +5828,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5962,19 +5962,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -6182,14 +6182,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -6303,8 +6303,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -6411,7 +6411,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -6613,19 +6613,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -6733,7 +6733,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -6898,11 +6898,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/helpers.ts b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/helpers.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/misc/all_fields.ts b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/misc/all_fields.ts index a9bf14d099..eca657c32a 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/misc/all_fields.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/misc/all_fields.ts @@ -1400,10 +1400,10 @@ export const EncodingTestForDontOmit = { message.dOWasm = fromBase64(object.d_o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.d_o_opt !== undefined && object.d_o_opt !== null) { - message.dOOpt = voteOptionFromJSON(object.d_o_opt); + message.dOOpt = object.d_o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -1433,8 +1433,8 @@ export const EncodingTestForDontOmit = { message.dORaws = object.d_o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.dOWasms = object.d_o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.dOOpts = object.d_o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.dOOpts = object.d_o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.dOPeriods = object.d_o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -1453,16 +1453,16 @@ export const EncodingTestForDontOmit = { }, toAmino(message: EncodingTestForDontOmit): EncodingTestForDontOmitAmino { const obj: any = {}; - obj.str = message.str; + obj.str = message.str === "" ? undefined : message.str; obj.d_o_str = message.dOStr ?? ""; - obj.b = message.b; + obj.b = message.b === false ? undefined : message.b; obj.d_o_b = message.dOB ?? false; - obj.num = message.num; + obj.num = message.num === 0 ? undefined : message.num; obj.d_o_num = message.dONum ?? 0; - obj.big = message.big ? message.big.toString() : undefined; + obj.big = message.big !== BigInt(0) ? message.big.toString() : undefined; obj.d_o_big = message.dOBig ? message.dOBig.toString() : "0"; obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; - obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.fromPartial({}); + obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.auth = message.auth ? GlobalDecoderRegistry.toAminoMsg(message.auth) : undefined; obj.d_o_auth = message.dOAuth ? GlobalDecoderRegistry.toAminoMsg(message.dOAuth) : { type: "", @@ -1474,10 +1474,10 @@ export const EncodingTestForDontOmit = { obj.d_o_raw = message.dORaw ? JSON.parse(fromUtf8(message.dORaw)) : {}; obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; obj.d_o_wasm = message.dOWasm ? toBase64(message.dOWasm) : ""; - obj.opt = message.opt; + obj.opt = message.opt === 0 ? undefined : message.opt; obj.d_o_opt = message.dOOpt ?? 0; obj.period = message.period ? Duration.toAmino(message.period) : undefined; - obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.fromPartial({}); + obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.toAmino(Duration.fromPartial({})); obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; obj.d_o_date = message.dODate ? Timestamp.toAmino(toTimestamp(message.dODate)) : new Date(); obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; @@ -1485,104 +1485,104 @@ export const EncodingTestForDontOmit = { if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.dONums) { obj.d_o_nums = message.dONums.map(e => e); } else { - obj.d_o_nums = []; + obj.d_o_nums = message.dONums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.dOBigs) { obj.d_o_bigs = message.dOBigs.map(e => e.toString()); } else { - obj.d_o_bigs = []; + obj.d_o_bigs = message.dOBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.dOSalts) { obj.d_o_salts = message.dOSalts.map(e => base64FromBytes(e)); } else { - obj.d_o_salts = []; + obj.d_o_salts = message.dOSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.dORaws) { obj.d_o_raws = message.dORaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.d_o_raws = []; + obj.d_o_raws = message.dORaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.dOWasms) { obj.d_o_wasms = message.dOWasms.map(e => toBase64(e)); } else { - obj.d_o_wasms = []; + obj.d_o_wasms = message.dOWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.dOOpts) { obj.d_o_opts = message.dOOpts.map(e => e); } else { - obj.d_o_opts = []; + obj.d_o_opts = message.dOOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.dOPeriods) { obj.d_o_periods = message.dOPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.d_o_periods = []; + obj.d_o_periods = message.dOPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.dOProtos) { obj.d_o_protos = message.dOProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.d_o_protos = []; + obj.d_o_protos = message.dOProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? GlobalDecoderRegistry.toAminoMsg(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.dOAuths) { obj.d_o_auths = message.dOAuths.map(e => e ? GlobalDecoderRegistry.toAminoMsg(e) : undefined); } else { - obj.d_o_auths = []; + obj.d_o_auths = message.dOAuths; } - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; obj.d_o_dec = message.dODec ?? ""; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.dODecs) { obj.d_o_decs = message.dODecs.map(e => e); } else { - obj.d_o_decs = []; + obj.d_o_decs = message.dODecs; } return obj; }, @@ -2574,10 +2574,10 @@ export const EncodingTestForOmit = { message.oWasm = fromBase64(object.o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.o_opt !== undefined && object.o_opt !== null) { - message.oOpt = voteOptionFromJSON(object.o_opt); + message.oOpt = object.o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -2607,8 +2607,8 @@ export const EncodingTestForOmit = { message.oRaws = object.o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.oWasms = object.o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.oOpts = object.o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.oOpts = object.o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.oPeriods = object.o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -2627,133 +2627,136 @@ export const EncodingTestForOmit = { }, toAmino(message: EncodingTestForOmit): EncodingTestForOmitAmino { const obj: any = {}; - obj.str = message.str; - obj.o_str = message.oStr; - obj.b = message.b; - obj.o_b = message.oB; - obj.num = message.num; - obj.o_num = message.oNum; - obj.big = message.big ? message.big.toString() : undefined; - obj.o_big = message.oBig ? message.oBig.toString() : undefined; - obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; + obj.str = message.str ?? ""; + obj.o_str = message.oStr === "" ? undefined : message.oStr; + obj.b = message.b ?? false; + obj.o_b = message.oB === false ? undefined : message.oB; + obj.num = message.num ?? 0; + obj.o_num = message.oNum === 0 ? undefined : message.oNum; + obj.big = message.big ? message.big.toString() : "0"; + obj.o_big = message.oBig !== BigInt(0) ? message.oBig.toString() : undefined; + obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.o_proto = message.oProto ? AccessConfig.toAmino(message.oProto) : undefined; - obj.auth = message.auth ? GlobalDecoderRegistry.toAminoMsg(message.auth) : undefined; + obj.auth = message.auth ? GlobalDecoderRegistry.toAminoMsg(message.auth) : { + type: "", + value: {} + }; obj.o_auth = message.oAuth ? GlobalDecoderRegistry.toAminoMsg(message.oAuth) : undefined; - obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; + obj.salt = message.salt ? base64FromBytes(message.salt) : ""; obj.o_salt = message.oSalt ? base64FromBytes(message.oSalt) : undefined; - obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; + obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : {}; obj.o_raw = message.oRaw ? JSON.parse(fromUtf8(message.oRaw)) : undefined; - obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; + obj.wasm = message.wasm ? toBase64(message.wasm) : ""; obj.o_wasm = message.oWasm ? toBase64(message.oWasm) : undefined; - obj.opt = message.opt; - obj.o_opt = message.oOpt; - obj.period = message.period ? Duration.toAmino(message.period) : undefined; + obj.opt = message.opt ?? 0; + obj.o_opt = message.oOpt === 0 ? undefined : message.oOpt; + obj.period = message.period ? Duration.toAmino(message.period) : Duration.toAmino(Duration.fromPartial({})); obj.o_period = message.oPeriod ? Duration.toAmino(message.oPeriod) : undefined; - obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; + obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : null; obj.o_date = message.oDate ? Timestamp.toAmino(toTimestamp(message.oDate)) : undefined; - obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; + obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : null; obj.o_pubkey = message.oPubkey ? decodePubkey(message.oPubkey) : undefined; if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.oNums) { obj.o_nums = message.oNums.map(e => e); } else { - obj.o_nums = []; + obj.o_nums = message.oNums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.oBigs) { obj.o_bigs = message.oBigs.map(e => e.toString()); } else { - obj.o_bigs = []; + obj.o_bigs = message.oBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.oSalts) { obj.o_salts = message.oSalts.map(e => base64FromBytes(e)); } else { - obj.o_salts = []; + obj.o_salts = message.oSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.oRaws) { obj.o_raws = message.oRaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.o_raws = []; + obj.o_raws = message.oRaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.oWasms) { obj.o_wasms = message.oWasms.map(e => toBase64(e)); } else { - obj.o_wasms = []; + obj.o_wasms = message.oWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.oOpts) { obj.o_opts = message.oOpts.map(e => e); } else { - obj.o_opts = []; + obj.o_opts = message.oOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.oPeriods) { obj.o_periods = message.oPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.o_periods = []; + obj.o_periods = message.oPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.oProtos) { obj.o_protos = message.oProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.o_protos = []; + obj.o_protos = message.oProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? GlobalDecoderRegistry.toAminoMsg(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.oAuths) { obj.o_auths = message.oAuths.map(e => e ? GlobalDecoderRegistry.toAminoMsg(e) : undefined); } else { - obj.o_auths = []; + obj.o_auths = message.oAuths; } - obj.dec = message.dec; - obj.o_dec = message.oDec; + obj.dec = message.dec ?? ""; + obj.o_dec = message.oDec === "" ? undefined : message.oDec; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.oDecs) { obj.o_decs = message.oDecs.map(e => e); } else { - obj.o_decs = []; + obj.o_decs = message.oDecs; } return obj; }, diff --git a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/misc/eval_request.ts b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/misc/eval_request.ts index f9d71c13bd..629b2fab0c 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/misc/eval_request.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/misc/eval_request.ts @@ -286,7 +286,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -386,7 +386,7 @@ export const EvalRequest_RefsEntry = { }, toAmino(message: EvalRequest_RefsEntry): EvalRequest_RefsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? IdRef.toAmino(message.value) : undefined; return obj; }, @@ -712,16 +712,16 @@ export const EvalRequest = { obj.refs[k] = IdRef.toAmino(v); }); } - obj.test_num = message.testNum; - obj.test_string = message.testString; - obj.test_bool = message.testBool; + obj.test_num = message.testNum === 0 ? undefined : message.testNum; + obj.test_string = message.testString === "" ? undefined : message.testString; + obj.test_bool = message.testBool === false ? undefined : message.testBool; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; - obj.id = message.id; - obj.name = message.name; + obj.id = message.id === null ? undefined : message.id; + obj.name = message.name === null ? undefined : message.name; if (message.testArray) { obj.test_array = message.testArray.map(e => e); } else { - obj.test_array = []; + obj.test_array = message.testArray; } return obj; }, @@ -820,7 +820,7 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -919,7 +919,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { diff --git a/__fixtures__/misc/output-proto-amino/amino-interface/google/api/expr/v1alpha1/eval.ts b/__fixtures__/misc/output-proto-amino/amino-interface/google/api/expr/v1alpha1/eval.ts index 397ad917fc..4a1a836a78 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface/google/api/expr/v1alpha1/eval.ts @@ -127,7 +127,7 @@ export const ExprValue = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -226,7 +226,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { diff --git a/__fixtures__/misc/output-proto-amino/amino-interface/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/amino-interface/google/protobuf/descriptor.ts index 69bcb99f05..6c05a6dd8c 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface/google/protobuf/descriptor.ts @@ -2285,7 +2285,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -2624,46 +2624,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2955,47 +2955,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3128,8 +3128,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -3244,8 +3244,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -3352,7 +3352,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -3570,10 +3570,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -3597,15 +3597,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -3722,7 +3722,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3905,22 +3905,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -4035,8 +4035,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -4168,8 +4168,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -4308,11 +4308,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -4494,12 +4494,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -4874,7 +4874,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -4923,30 +4923,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5115,14 +5115,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5301,13 +5301,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -5323,16 +5323,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5440,7 +5440,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5577,12 +5577,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5703,11 +5703,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5828,11 +5828,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5962,19 +5962,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -6182,14 +6182,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -6303,8 +6303,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -6411,7 +6411,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -6613,19 +6613,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -6733,7 +6733,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -6898,11 +6898,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/misc/output-proto-amino/amino-interface/helpers.ts b/__fixtures__/misc/output-proto-amino/amino-interface/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface/helpers.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output-proto-amino/amino-interface/misc/all_fields.ts b/__fixtures__/misc/output-proto-amino/amino-interface/misc/all_fields.ts index 0c111fac69..f8d70f7a95 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface/misc/all_fields.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface/misc/all_fields.ts @@ -305,74 +305,74 @@ export type EncodingTestForOmitEncoded = Omit toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.dOWasms = object.d_o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.dOOpts = object.d_o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.dOOpts = object.d_o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.dOPeriods = object.d_o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -1453,16 +1453,16 @@ export const EncodingTestForDontOmit = { }, toAmino(message: EncodingTestForDontOmit): EncodingTestForDontOmitAmino { const obj: any = {}; - obj.str = message.str; + obj.str = message.str === "" ? undefined : message.str; obj.d_o_str = message.dOStr ?? ""; - obj.b = message.b; + obj.b = message.b === false ? undefined : message.b; obj.d_o_b = message.dOB ?? false; - obj.num = message.num; + obj.num = message.num === 0 ? undefined : message.num; obj.d_o_num = message.dONum ?? 0; - obj.big = message.big ? message.big.toString() : undefined; + obj.big = message.big !== BigInt(0) ? message.big.toString() : undefined; obj.d_o_big = message.dOBig ? message.dOBig.toString() : "0"; obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; - obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.fromPartial({}); + obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.auth = message.auth ? GlobalDecoderRegistry.toAminoMsg(message.auth) : undefined; obj.d_o_auth = message.dOAuth ? GlobalDecoderRegistry.toAminoMsg(message.dOAuth) : { type: "", @@ -1474,10 +1474,10 @@ export const EncodingTestForDontOmit = { obj.d_o_raw = message.dORaw ? JSON.parse(fromUtf8(message.dORaw)) : {}; obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; obj.d_o_wasm = message.dOWasm ? toBase64(message.dOWasm) : ""; - obj.opt = message.opt; + obj.opt = message.opt === 0 ? undefined : message.opt; obj.d_o_opt = message.dOOpt ?? 0; obj.period = message.period ? Duration.toAmino(message.period) : undefined; - obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.fromPartial({}); + obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.toAmino(Duration.fromPartial({})); obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; obj.d_o_date = message.dODate ? Timestamp.toAmino(toTimestamp(message.dODate)) : new Date(); obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; @@ -1485,104 +1485,104 @@ export const EncodingTestForDontOmit = { if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.dONums) { obj.d_o_nums = message.dONums.map(e => e); } else { - obj.d_o_nums = []; + obj.d_o_nums = message.dONums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.dOBigs) { obj.d_o_bigs = message.dOBigs.map(e => e.toString()); } else { - obj.d_o_bigs = []; + obj.d_o_bigs = message.dOBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.dOSalts) { obj.d_o_salts = message.dOSalts.map(e => base64FromBytes(e)); } else { - obj.d_o_salts = []; + obj.d_o_salts = message.dOSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.dORaws) { obj.d_o_raws = message.dORaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.d_o_raws = []; + obj.d_o_raws = message.dORaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.dOWasms) { obj.d_o_wasms = message.dOWasms.map(e => toBase64(e)); } else { - obj.d_o_wasms = []; + obj.d_o_wasms = message.dOWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.dOOpts) { obj.d_o_opts = message.dOOpts.map(e => e); } else { - obj.d_o_opts = []; + obj.d_o_opts = message.dOOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.dOPeriods) { obj.d_o_periods = message.dOPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.d_o_periods = []; + obj.d_o_periods = message.dOPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.dOProtos) { obj.d_o_protos = message.dOProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.d_o_protos = []; + obj.d_o_protos = message.dOProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? GlobalDecoderRegistry.toAminoMsg(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.dOAuths) { obj.d_o_auths = message.dOAuths.map(e => e ? GlobalDecoderRegistry.toAminoMsg(e) : undefined); } else { - obj.d_o_auths = []; + obj.d_o_auths = message.dOAuths; } - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; obj.d_o_dec = message.dODec ?? ""; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.dODecs) { obj.d_o_decs = message.dODecs.map(e => e); } else { - obj.d_o_decs = []; + obj.d_o_decs = message.dODecs; } return obj; }, @@ -2574,10 +2574,10 @@ export const EncodingTestForOmit = { message.oWasm = fromBase64(object.o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.o_opt !== undefined && object.o_opt !== null) { - message.oOpt = voteOptionFromJSON(object.o_opt); + message.oOpt = object.o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -2607,8 +2607,8 @@ export const EncodingTestForOmit = { message.oRaws = object.o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.oWasms = object.o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.oOpts = object.o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.oOpts = object.o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.oPeriods = object.o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -2627,133 +2627,136 @@ export const EncodingTestForOmit = { }, toAmino(message: EncodingTestForOmit): EncodingTestForOmitAmino { const obj: any = {}; - obj.str = message.str; - obj.o_str = message.oStr; - obj.b = message.b; - obj.o_b = message.oB; - obj.num = message.num; - obj.o_num = message.oNum; - obj.big = message.big ? message.big.toString() : undefined; - obj.o_big = message.oBig ? message.oBig.toString() : undefined; - obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; + obj.str = message.str ?? ""; + obj.o_str = message.oStr === "" ? undefined : message.oStr; + obj.b = message.b ?? false; + obj.o_b = message.oB === false ? undefined : message.oB; + obj.num = message.num ?? 0; + obj.o_num = message.oNum === 0 ? undefined : message.oNum; + obj.big = message.big ? message.big.toString() : "0"; + obj.o_big = message.oBig !== BigInt(0) ? message.oBig.toString() : undefined; + obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.o_proto = message.oProto ? AccessConfig.toAmino(message.oProto) : undefined; - obj.auth = message.auth ? GlobalDecoderRegistry.toAminoMsg(message.auth) : undefined; + obj.auth = message.auth ? GlobalDecoderRegistry.toAminoMsg(message.auth) : { + type: "", + value: {} + }; obj.o_auth = message.oAuth ? GlobalDecoderRegistry.toAminoMsg(message.oAuth) : undefined; - obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; + obj.salt = message.salt ? base64FromBytes(message.salt) : ""; obj.o_salt = message.oSalt ? base64FromBytes(message.oSalt) : undefined; - obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; + obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : {}; obj.o_raw = message.oRaw ? JSON.parse(fromUtf8(message.oRaw)) : undefined; - obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; + obj.wasm = message.wasm ? toBase64(message.wasm) : ""; obj.o_wasm = message.oWasm ? toBase64(message.oWasm) : undefined; - obj.opt = message.opt; - obj.o_opt = message.oOpt; - obj.period = message.period ? Duration.toAmino(message.period) : undefined; + obj.opt = message.opt ?? 0; + obj.o_opt = message.oOpt === 0 ? undefined : message.oOpt; + obj.period = message.period ? Duration.toAmino(message.period) : Duration.toAmino(Duration.fromPartial({})); obj.o_period = message.oPeriod ? Duration.toAmino(message.oPeriod) : undefined; - obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; + obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : null; obj.o_date = message.oDate ? Timestamp.toAmino(toTimestamp(message.oDate)) : undefined; - obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; + obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : null; obj.o_pubkey = message.oPubkey ? decodePubkey(message.oPubkey) : undefined; if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.oNums) { obj.o_nums = message.oNums.map(e => e); } else { - obj.o_nums = []; + obj.o_nums = message.oNums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.oBigs) { obj.o_bigs = message.oBigs.map(e => e.toString()); } else { - obj.o_bigs = []; + obj.o_bigs = message.oBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.oSalts) { obj.o_salts = message.oSalts.map(e => base64FromBytes(e)); } else { - obj.o_salts = []; + obj.o_salts = message.oSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.oRaws) { obj.o_raws = message.oRaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.o_raws = []; + obj.o_raws = message.oRaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.oWasms) { obj.o_wasms = message.oWasms.map(e => toBase64(e)); } else { - obj.o_wasms = []; + obj.o_wasms = message.oWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.oOpts) { obj.o_opts = message.oOpts.map(e => e); } else { - obj.o_opts = []; + obj.o_opts = message.oOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.oPeriods) { obj.o_periods = message.oPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.o_periods = []; + obj.o_periods = message.oPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.oProtos) { obj.o_protos = message.oProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.o_protos = []; + obj.o_protos = message.oProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? GlobalDecoderRegistry.toAminoMsg(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.oAuths) { obj.o_auths = message.oAuths.map(e => e ? GlobalDecoderRegistry.toAminoMsg(e) : undefined); } else { - obj.o_auths = []; + obj.o_auths = message.oAuths; } - obj.dec = message.dec; - obj.o_dec = message.oDec; + obj.dec = message.dec ?? ""; + obj.o_dec = message.oDec === "" ? undefined : message.oDec; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.oDecs) { obj.o_decs = message.oDecs.map(e => e); } else { - obj.o_decs = []; + obj.o_decs = message.oDecs; } return obj; }, diff --git a/__fixtures__/misc/output-proto-amino/amino-interface/misc/eval_request.ts b/__fixtures__/misc/output-proto-amino/amino-interface/misc/eval_request.ts index 978907ad8b..b175b929e4 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface/misc/eval_request.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface/misc/eval_request.ts @@ -286,7 +286,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -386,7 +386,7 @@ export const EvalRequest_RefsEntry = { }, toAmino(message: EvalRequest_RefsEntry): EvalRequest_RefsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? IdRef.toAmino(message.value) : undefined; return obj; }, @@ -712,16 +712,16 @@ export const EvalRequest = { obj.refs[k] = IdRef.toAmino(v); }); } - obj.test_num = message.testNum; - obj.test_string = message.testString; - obj.test_bool = message.testBool; + obj.test_num = message.testNum === 0 ? undefined : message.testNum; + obj.test_string = message.testString === "" ? undefined : message.testString; + obj.test_bool = message.testBool === false ? undefined : message.testBool; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; - obj.id = message.id; - obj.name = message.name; + obj.id = message.id === null ? undefined : message.id; + obj.name = message.name === null ? undefined : message.name; if (message.testArray) { obj.test_array = message.testArray.map(e => e); } else { - obj.test_array = []; + obj.test_array = message.testArray; } return obj; }, @@ -820,7 +820,7 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -919,7 +919,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { diff --git a/__fixtures__/misc/output-proto-amino/amino-legacy/google/api/expr/v1alpha1/eval.ts b/__fixtures__/misc/output-proto-amino/amino-legacy/google/api/expr/v1alpha1/eval.ts index 23b7e7ea73..50b92187a5 100644 --- a/__fixtures__/misc/output-proto-amino/amino-legacy/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/misc/output-proto-amino/amino-legacy/google/api/expr/v1alpha1/eval.ts @@ -101,7 +101,7 @@ export const ExprValue = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -190,7 +190,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { diff --git a/__fixtures__/misc/output-proto-amino/amino-legacy/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/amino-legacy/google/protobuf/descriptor.ts index 32c45bd0c3..d61dd5109c 100644 --- a/__fixtures__/misc/output-proto-amino/amino-legacy/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/amino-legacy/google/protobuf/descriptor.ts @@ -1464,7 +1464,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -1793,46 +1793,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2114,47 +2114,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -2277,8 +2277,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -2383,8 +2383,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -2481,7 +2481,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -2689,10 +2689,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -2716,15 +2716,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -2831,7 +2831,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3004,22 +3004,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3124,8 +3124,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -3247,8 +3247,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -3377,11 +3377,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -3553,12 +3553,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -3923,7 +3923,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -3972,30 +3972,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4154,14 +4154,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4330,13 +4330,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -4352,16 +4352,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4459,7 +4459,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4586,12 +4586,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4702,11 +4702,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4817,11 +4817,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4941,19 +4941,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5151,14 +5151,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -5262,8 +5262,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -5360,7 +5360,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -5552,19 +5552,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -5662,7 +5662,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -5817,11 +5817,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/misc/output-proto-amino/amino-legacy/helpers.ts b/__fixtures__/misc/output-proto-amino/amino-legacy/helpers.ts index 2f5a2a9a4c..56572a0551 100644 --- a/__fixtures__/misc/output-proto-amino/amino-legacy/helpers.ts +++ b/__fixtures__/misc/output-proto-amino/amino-legacy/helpers.ts @@ -48,7 +48,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -59,6 +59,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output-proto-amino/amino-legacy/misc/all_fields.ts b/__fixtures__/misc/output-proto-amino/amino-legacy/misc/all_fields.ts index cd1de79d9f..4033db4742 100644 --- a/__fixtures__/misc/output-proto-amino/amino-legacy/misc/all_fields.ts +++ b/__fixtures__/misc/output-proto-amino/amino-legacy/misc/all_fields.ts @@ -1222,10 +1222,10 @@ export const EncodingTestForDontOmit = { message.dOWasm = fromBase64(object.d_o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.d_o_opt !== undefined && object.d_o_opt !== null) { - message.dOOpt = voteOptionFromJSON(object.d_o_opt); + message.dOOpt = object.d_o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -1255,8 +1255,8 @@ export const EncodingTestForDontOmit = { message.dORaws = object.d_o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.dOWasms = object.d_o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.dOOpts = object.d_o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.dOOpts = object.d_o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.dOPeriods = object.d_o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -1275,28 +1275,28 @@ export const EncodingTestForDontOmit = { }, toAmino(message: EncodingTestForDontOmit): EncodingTestForDontOmitAmino { const obj: any = {}; - obj.str = message.str; + obj.str = message.str === "" ? undefined : message.str; obj.d_o_str = message.dOStr ?? ""; - obj.b = message.b; + obj.b = message.b === false ? undefined : message.b; obj.d_o_b = message.dOB ?? false; - obj.num = message.num; + obj.num = message.num === 0 ? undefined : message.num; obj.d_o_num = message.dONum ?? 0; - obj.big = message.big ? message.big.toString() : undefined; + obj.big = message.big !== BigInt(0) ? message.big.toString() : undefined; obj.d_o_big = message.dOBig ? message.dOBig.toString() : "0"; obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; - obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.fromPartial({}); + obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; - obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.fromPartial({}); + obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.toAmino(Any.fromPartial({})); obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; obj.d_o_salt = message.dOSalt ? base64FromBytes(message.dOSalt) : ""; obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; obj.d_o_raw = message.dORaw ? JSON.parse(fromUtf8(message.dORaw)) : {}; obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; obj.d_o_wasm = message.dOWasm ? toBase64(message.dOWasm) : ""; - obj.opt = message.opt; + obj.opt = message.opt === 0 ? undefined : message.opt; obj.d_o_opt = message.dOOpt ?? 0; obj.period = message.period ? Duration.toAmino(message.period) : undefined; - obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.fromPartial({}); + obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.toAmino(Duration.fromPartial({})); obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; obj.d_o_date = message.dODate ? Timestamp.toAmino(toTimestamp(message.dODate)) : new Date(); obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; @@ -1304,104 +1304,104 @@ export const EncodingTestForDontOmit = { if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.dONums) { obj.d_o_nums = message.dONums.map(e => e); } else { - obj.d_o_nums = []; + obj.d_o_nums = message.dONums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.dOBigs) { obj.d_o_bigs = message.dOBigs.map(e => e.toString()); } else { - obj.d_o_bigs = []; + obj.d_o_bigs = message.dOBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.dOSalts) { obj.d_o_salts = message.dOSalts.map(e => base64FromBytes(e)); } else { - obj.d_o_salts = []; + obj.d_o_salts = message.dOSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.dORaws) { obj.d_o_raws = message.dORaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.d_o_raws = []; + obj.d_o_raws = message.dORaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.dOWasms) { obj.d_o_wasms = message.dOWasms.map(e => toBase64(e)); } else { - obj.d_o_wasms = []; + obj.d_o_wasms = message.dOWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.dOOpts) { obj.d_o_opts = message.dOOpts.map(e => e); } else { - obj.d_o_opts = []; + obj.d_o_opts = message.dOOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.dOPeriods) { obj.d_o_periods = message.dOPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.d_o_periods = []; + obj.d_o_periods = message.dOPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.dOProtos) { obj.d_o_protos = message.dOProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.d_o_protos = []; + obj.d_o_protos = message.dOProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.dOAuths) { obj.d_o_auths = message.dOAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.d_o_auths = []; + obj.d_o_auths = message.dOAuths; } - obj.dec = padDecimal(message.dec); + obj.dec = padDecimal(message.dec) === "" ? undefined : padDecimal(message.dec); obj.d_o_dec = padDecimal(message.dODec) ?? ""; if (message.decs) { obj.decs = message.decs.map(e => padDecimal(e)); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.dODecs) { obj.d_o_decs = message.dODecs.map(e => padDecimal(e)); } else { - obj.d_o_decs = []; + obj.d_o_decs = message.dODecs; } return obj; }, @@ -2383,10 +2383,10 @@ export const EncodingTestForOmit = { message.oWasm = fromBase64(object.o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.o_opt !== undefined && object.o_opt !== null) { - message.oOpt = voteOptionFromJSON(object.o_opt); + message.oOpt = object.o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -2416,8 +2416,8 @@ export const EncodingTestForOmit = { message.oRaws = object.o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.oWasms = object.o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.oOpts = object.o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.oOpts = object.o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.oPeriods = object.o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -2436,133 +2436,133 @@ export const EncodingTestForOmit = { }, toAmino(message: EncodingTestForOmit): EncodingTestForOmitAmino { const obj: any = {}; - obj.str = message.str; - obj.o_str = message.oStr; - obj.b = message.b; - obj.o_b = message.oB; - obj.num = message.num; - obj.o_num = message.oNum; - obj.big = message.big ? message.big.toString() : undefined; - obj.o_big = message.oBig ? message.oBig.toString() : undefined; - obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; + obj.str = message.str ?? ""; + obj.o_str = message.oStr === "" ? undefined : message.oStr; + obj.b = message.b ?? false; + obj.o_b = message.oB === false ? undefined : message.oB; + obj.num = message.num ?? 0; + obj.o_num = message.oNum === 0 ? undefined : message.oNum; + obj.big = message.big ? message.big.toString() : "0"; + obj.o_big = message.oBig !== BigInt(0) ? message.oBig.toString() : undefined; + obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.o_proto = message.oProto ? AccessConfig.toAmino(message.oProto) : undefined; - obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; + obj.auth = message.auth ? Any.toAmino(message.auth) : Any.toAmino(Any.fromPartial({})); obj.o_auth = message.oAuth ? Any.toAmino(message.oAuth) : undefined; - obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; + obj.salt = message.salt ? base64FromBytes(message.salt) : ""; obj.o_salt = message.oSalt ? base64FromBytes(message.oSalt) : undefined; - obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; + obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : {}; obj.o_raw = message.oRaw ? JSON.parse(fromUtf8(message.oRaw)) : undefined; - obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; + obj.wasm = message.wasm ? toBase64(message.wasm) : ""; obj.o_wasm = message.oWasm ? toBase64(message.oWasm) : undefined; - obj.opt = message.opt; - obj.o_opt = message.oOpt; - obj.period = message.period ? Duration.toAmino(message.period) : undefined; + obj.opt = message.opt ?? 0; + obj.o_opt = message.oOpt === 0 ? undefined : message.oOpt; + obj.period = message.period ? Duration.toAmino(message.period) : Duration.toAmino(Duration.fromPartial({})); obj.o_period = message.oPeriod ? Duration.toAmino(message.oPeriod) : undefined; - obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; + obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : null; obj.o_date = message.oDate ? Timestamp.toAmino(toTimestamp(message.oDate)) : undefined; - obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; + obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : null; obj.o_pubkey = message.oPubkey ? decodePubkey(message.oPubkey) : undefined; if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.oNums) { obj.o_nums = message.oNums.map(e => e); } else { - obj.o_nums = []; + obj.o_nums = message.oNums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.oBigs) { obj.o_bigs = message.oBigs.map(e => e.toString()); } else { - obj.o_bigs = []; + obj.o_bigs = message.oBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.oSalts) { obj.o_salts = message.oSalts.map(e => base64FromBytes(e)); } else { - obj.o_salts = []; + obj.o_salts = message.oSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.oRaws) { obj.o_raws = message.oRaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.o_raws = []; + obj.o_raws = message.oRaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.oWasms) { obj.o_wasms = message.oWasms.map(e => toBase64(e)); } else { - obj.o_wasms = []; + obj.o_wasms = message.oWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.oOpts) { obj.o_opts = message.oOpts.map(e => e); } else { - obj.o_opts = []; + obj.o_opts = message.oOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.oPeriods) { obj.o_periods = message.oPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.o_periods = []; + obj.o_periods = message.oPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.oProtos) { obj.o_protos = message.oProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.o_protos = []; + obj.o_protos = message.oProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.oAuths) { obj.o_auths = message.oAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.o_auths = []; + obj.o_auths = message.oAuths; } - obj.dec = padDecimal(message.dec); - obj.o_dec = padDecimal(message.oDec); + obj.dec = padDecimal(message.dec) ?? ""; + obj.o_dec = padDecimal(message.oDec) === "" ? undefined : padDecimal(message.oDec); if (message.decs) { obj.decs = message.decs.map(e => padDecimal(e)); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.oDecs) { obj.o_decs = message.oDecs.map(e => padDecimal(e)); } else { - obj.o_decs = []; + obj.o_decs = message.oDecs; } return obj; }, diff --git a/__fixtures__/misc/output-proto-amino/amino-legacy/misc/eval_request.ts b/__fixtures__/misc/output-proto-amino/amino-legacy/misc/eval_request.ts index 516f63ec54..e75506a8a2 100644 --- a/__fixtures__/misc/output-proto-amino/amino-legacy/misc/eval_request.ts +++ b/__fixtures__/misc/output-proto-amino/amino-legacy/misc/eval_request.ts @@ -227,7 +227,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -327,7 +327,7 @@ export const EvalRequest_RefsEntry = { }, toAmino(message: EvalRequest_RefsEntry): EvalRequest_RefsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? IdRef.toAmino(message.value) : undefined; return obj; }, @@ -644,16 +644,16 @@ export const EvalRequest = { obj.refs[k] = IdRef.toAmino(v); }); } - obj.test_num = message.testNum; - obj.test_string = message.testString; - obj.test_bool = message.testBool; + obj.test_num = message.testNum === 0 ? undefined : message.testNum; + obj.test_string = message.testString === "" ? undefined : message.testString; + obj.test_bool = message.testBool === false ? undefined : message.testBool; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; - obj.id = message.id; - obj.name = message.name; + obj.id = message.id === null ? undefined : message.id; + obj.name = message.name === null ? undefined : message.name; if (message.testArray) { obj.test_array = message.testArray.map(e => e); } else { - obj.test_array = []; + obj.test_array = message.testArray; } return obj; }, @@ -742,7 +742,7 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -830,7 +830,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/api/expr/v1alpha1/eval.ts b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/api/expr/v1alpha1/eval.ts index 45afde766e..6902943167 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/api/expr/v1alpha1/eval.ts @@ -117,7 +117,7 @@ export const ExprValue = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -206,7 +206,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/protobuf/descriptor.ts index b39e4e3219..4189965ecb 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/protobuf/descriptor.ts @@ -2275,7 +2275,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -2604,46 +2604,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2925,47 +2925,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3088,8 +3088,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -3194,8 +3194,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -3292,7 +3292,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -3500,10 +3500,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -3527,15 +3527,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -3642,7 +3642,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3815,22 +3815,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3935,8 +3935,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -4058,8 +4058,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -4188,11 +4188,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -4364,12 +4364,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -4734,7 +4734,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -4783,30 +4783,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4965,14 +4965,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5141,13 +5141,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -5163,16 +5163,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5270,7 +5270,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5397,12 +5397,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5513,11 +5513,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5628,11 +5628,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5752,19 +5752,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5962,14 +5962,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -6073,8 +6073,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -6171,7 +6171,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -6363,19 +6363,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -6473,7 +6473,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -6628,11 +6628,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/helpers.ts b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/helpers.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/misc/all_fields.ts b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/misc/all_fields.ts index 5a772ffd49..77411e862b 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/misc/all_fields.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/misc/all_fields.ts @@ -288,74 +288,74 @@ export interface EncodingTestForOmitProtoMsg { } export interface EncodingTestForOmitAmino { /** scalar */ - str?: string; + str: string; o_str?: string; - b?: boolean; + b: boolean; o_b?: boolean; - num?: number; + num: number; o_num?: number; /** bigint */ - big?: string; + big: string; o_big?: string; /** protoType */ - proto?: AccessConfigAmino; + proto: AccessConfigAmino; o_proto?: AccessConfigAmino; /** anyType */ - auth?: AnyAmino; + auth: AnyAmino; o_auth?: AnyAmino; /** bytes */ - salt?: string; + salt: string; o_salt?: string; /** raw bytes */ - raw?: any; + raw: any; o_raw?: any; /** wasm bytes */ - wasm?: string; + wasm: string; o_wasm?: string; /** enum */ - opt?: VoteOption; + opt: VoteOption; o_opt?: VoteOption; /** duration */ - period?: DurationAmino; + period: DurationAmino; o_period?: DurationAmino; /** timestamp */ - date?: string; + date: string; o_date?: string; /** pubkey */ - pubkey?: AnyAmino; + pubkey: AnyAmino; o_pubkey?: AnyAmino; /** array scalar */ - nums?: number[]; + nums: number[]; o_nums?: number[]; /** array bigint */ - bigs?: string[]; + bigs: string[]; o_bigs?: string[]; /** array bytes */ - salts?: string[]; + salts: string[]; o_salts?: string[]; /** array raw bytes */ - raws?: any[]; + raws: any[]; o_raws?: any[]; /** array wasm bytes */ - wasms?: string[]; + wasms: string[]; o_wasms?: string[]; /** array enum */ - opts?: VoteOption[]; + opts: VoteOption[]; o_opts?: VoteOption[]; /** array duration */ - periods?: DurationAmino[]; + periods: DurationAmino[]; o_periods?: DurationAmino[]; /** array protoType */ - protos?: AccessConfigAmino[]; + protos: AccessConfigAmino[]; o_protos?: AccessConfigAmino[]; /** array anyType */ - auths?: AnyAmino[]; + auths: AnyAmino[]; o_auths?: AnyAmino[]; /** dec */ - dec?: string; + dec: string; o_dec?: string; /** array dec */ - decs?: string[]; + decs: string[]; o_decs?: string[]; } export interface EncodingTestForOmitAminoMsg { @@ -1374,10 +1374,10 @@ export const EncodingTestForDontOmit = { message.dOWasm = fromBase64(object.d_o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.d_o_opt !== undefined && object.d_o_opt !== null) { - message.dOOpt = voteOptionFromJSON(object.d_o_opt); + message.dOOpt = object.d_o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -1407,8 +1407,8 @@ export const EncodingTestForDontOmit = { message.dORaws = object.d_o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.dOWasms = object.d_o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.dOOpts = object.d_o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.dOOpts = object.d_o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.dOPeriods = object.d_o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -1427,28 +1427,28 @@ export const EncodingTestForDontOmit = { }, toAmino(message: EncodingTestForDontOmit): EncodingTestForDontOmitAmino { const obj: any = {}; - obj.str = message.str; + obj.str = message.str === "" ? undefined : message.str; obj.d_o_str = message.dOStr ?? ""; - obj.b = message.b; + obj.b = message.b === false ? undefined : message.b; obj.d_o_b = message.dOB ?? false; - obj.num = message.num; + obj.num = message.num === 0 ? undefined : message.num; obj.d_o_num = message.dONum ?? 0; - obj.big = message.big ? message.big.toString() : undefined; + obj.big = message.big !== BigInt(0) ? message.big.toString() : undefined; obj.d_o_big = message.dOBig ? message.dOBig.toString() : "0"; obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; - obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.fromPartial({}); + obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; - obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.fromPartial({}); + obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.toAmino(Any.fromPartial({})); obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; obj.d_o_salt = message.dOSalt ? base64FromBytes(message.dOSalt) : ""; obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; obj.d_o_raw = message.dORaw ? JSON.parse(fromUtf8(message.dORaw)) : {}; obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; obj.d_o_wasm = message.dOWasm ? toBase64(message.dOWasm) : ""; - obj.opt = message.opt; + obj.opt = message.opt === 0 ? undefined : message.opt; obj.d_o_opt = message.dOOpt ?? 0; obj.period = message.period ? Duration.toAmino(message.period) : undefined; - obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.fromPartial({}); + obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.toAmino(Duration.fromPartial({})); obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; obj.d_o_date = message.dODate ? Timestamp.toAmino(toTimestamp(message.dODate)) : new Date(); obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; @@ -1456,104 +1456,104 @@ export const EncodingTestForDontOmit = { if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.dONums) { obj.d_o_nums = message.dONums.map(e => e); } else { - obj.d_o_nums = []; + obj.d_o_nums = message.dONums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.dOBigs) { obj.d_o_bigs = message.dOBigs.map(e => e.toString()); } else { - obj.d_o_bigs = []; + obj.d_o_bigs = message.dOBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.dOSalts) { obj.d_o_salts = message.dOSalts.map(e => base64FromBytes(e)); } else { - obj.d_o_salts = []; + obj.d_o_salts = message.dOSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.dORaws) { obj.d_o_raws = message.dORaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.d_o_raws = []; + obj.d_o_raws = message.dORaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.dOWasms) { obj.d_o_wasms = message.dOWasms.map(e => toBase64(e)); } else { - obj.d_o_wasms = []; + obj.d_o_wasms = message.dOWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.dOOpts) { obj.d_o_opts = message.dOOpts.map(e => e); } else { - obj.d_o_opts = []; + obj.d_o_opts = message.dOOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.dOPeriods) { obj.d_o_periods = message.dOPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.d_o_periods = []; + obj.d_o_periods = message.dOPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.dOProtos) { obj.d_o_protos = message.dOProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.d_o_protos = []; + obj.d_o_protos = message.dOProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.dOAuths) { obj.d_o_auths = message.dOAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.d_o_auths = []; + obj.d_o_auths = message.dOAuths; } - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; obj.d_o_dec = message.dODec ?? ""; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.dODecs) { obj.d_o_decs = message.dODecs.map(e => e); } else { - obj.d_o_decs = []; + obj.d_o_decs = message.dODecs; } return obj; }, @@ -2535,10 +2535,10 @@ export const EncodingTestForOmit = { message.oWasm = fromBase64(object.o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.o_opt !== undefined && object.o_opt !== null) { - message.oOpt = voteOptionFromJSON(object.o_opt); + message.oOpt = object.o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -2568,8 +2568,8 @@ export const EncodingTestForOmit = { message.oRaws = object.o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.oWasms = object.o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.oOpts = object.o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.oOpts = object.o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.oPeriods = object.o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -2588,133 +2588,133 @@ export const EncodingTestForOmit = { }, toAmino(message: EncodingTestForOmit): EncodingTestForOmitAmino { const obj: any = {}; - obj.str = message.str; - obj.o_str = message.oStr; - obj.b = message.b; - obj.o_b = message.oB; - obj.num = message.num; - obj.o_num = message.oNum; - obj.big = message.big ? message.big.toString() : undefined; - obj.o_big = message.oBig ? message.oBig.toString() : undefined; - obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; + obj.str = message.str ?? ""; + obj.o_str = message.oStr === "" ? undefined : message.oStr; + obj.b = message.b ?? false; + obj.o_b = message.oB === false ? undefined : message.oB; + obj.num = message.num ?? 0; + obj.o_num = message.oNum === 0 ? undefined : message.oNum; + obj.big = message.big ? message.big.toString() : "0"; + obj.o_big = message.oBig !== BigInt(0) ? message.oBig.toString() : undefined; + obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.o_proto = message.oProto ? AccessConfig.toAmino(message.oProto) : undefined; - obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; + obj.auth = message.auth ? Any.toAmino(message.auth) : Any.toAmino(Any.fromPartial({})); obj.o_auth = message.oAuth ? Any.toAmino(message.oAuth) : undefined; - obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; + obj.salt = message.salt ? base64FromBytes(message.salt) : ""; obj.o_salt = message.oSalt ? base64FromBytes(message.oSalt) : undefined; - obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; + obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : {}; obj.o_raw = message.oRaw ? JSON.parse(fromUtf8(message.oRaw)) : undefined; - obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; + obj.wasm = message.wasm ? toBase64(message.wasm) : ""; obj.o_wasm = message.oWasm ? toBase64(message.oWasm) : undefined; - obj.opt = message.opt; - obj.o_opt = message.oOpt; - obj.period = message.period ? Duration.toAmino(message.period) : undefined; + obj.opt = message.opt ?? 0; + obj.o_opt = message.oOpt === 0 ? undefined : message.oOpt; + obj.period = message.period ? Duration.toAmino(message.period) : Duration.toAmino(Duration.fromPartial({})); obj.o_period = message.oPeriod ? Duration.toAmino(message.oPeriod) : undefined; - obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; + obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : null; obj.o_date = message.oDate ? Timestamp.toAmino(toTimestamp(message.oDate)) : undefined; - obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; + obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : null; obj.o_pubkey = message.oPubkey ? decodePubkey(message.oPubkey) : undefined; if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.oNums) { obj.o_nums = message.oNums.map(e => e); } else { - obj.o_nums = []; + obj.o_nums = message.oNums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.oBigs) { obj.o_bigs = message.oBigs.map(e => e.toString()); } else { - obj.o_bigs = []; + obj.o_bigs = message.oBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.oSalts) { obj.o_salts = message.oSalts.map(e => base64FromBytes(e)); } else { - obj.o_salts = []; + obj.o_salts = message.oSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.oRaws) { obj.o_raws = message.oRaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.o_raws = []; + obj.o_raws = message.oRaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.oWasms) { obj.o_wasms = message.oWasms.map(e => toBase64(e)); } else { - obj.o_wasms = []; + obj.o_wasms = message.oWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.oOpts) { obj.o_opts = message.oOpts.map(e => e); } else { - obj.o_opts = []; + obj.o_opts = message.oOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.oPeriods) { obj.o_periods = message.oPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.o_periods = []; + obj.o_periods = message.oPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.oProtos) { obj.o_protos = message.oProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.o_protos = []; + obj.o_protos = message.oProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.oAuths) { obj.o_auths = message.oAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.o_auths = []; + obj.o_auths = message.oAuths; } - obj.dec = message.dec; - obj.o_dec = message.oDec; + obj.dec = message.dec ?? ""; + obj.o_dec = message.oDec === "" ? undefined : message.oDec; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.oDecs) { obj.o_decs = message.oDecs.map(e => e); } else { - obj.o_decs = []; + obj.o_decs = message.oDecs; } return obj; }, diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/misc/eval_request.ts b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/misc/eval_request.ts index 0d87d5168f..41599d60fc 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/misc/eval_request.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/misc/eval_request.ts @@ -283,7 +283,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -383,7 +383,7 @@ export const EvalRequest_RefsEntry = { }, toAmino(message: EvalRequest_RefsEntry): EvalRequest_RefsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? IdRef.toAmino(message.value) : undefined; return obj; }, @@ -700,16 +700,16 @@ export const EvalRequest = { obj.refs[k] = IdRef.toAmino(v); }); } - obj.test_num = message.testNum; - obj.test_string = message.testString; - obj.test_bool = message.testBool; + obj.test_num = message.testNum === 0 ? undefined : message.testNum; + obj.test_string = message.testString === "" ? undefined : message.testString; + obj.test_bool = message.testBool === false ? undefined : message.testBool; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; - obj.id = message.id; - obj.name = message.name; + obj.id = message.id === null ? undefined : message.id; + obj.name = message.name === null ? undefined : message.name; if (message.testArray) { obj.test_array = message.testArray.map(e => e); } else { - obj.test_array = []; + obj.test_array = message.testArray; } return obj; }, @@ -798,7 +798,7 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -886,7 +886,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/api/expr/v1alpha1/eval.ts b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/api/expr/v1alpha1/eval.ts index 45afde766e..6902943167 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/api/expr/v1alpha1/eval.ts @@ -117,7 +117,7 @@ export const ExprValue = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -206,7 +206,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/protobuf/descriptor.ts index b39e4e3219..4189965ecb 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/protobuf/descriptor.ts @@ -2275,7 +2275,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -2604,46 +2604,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2925,47 +2925,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3088,8 +3088,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -3194,8 +3194,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -3292,7 +3292,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -3500,10 +3500,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -3527,15 +3527,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -3642,7 +3642,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3815,22 +3815,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3935,8 +3935,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -4058,8 +4058,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -4188,11 +4188,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -4364,12 +4364,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -4734,7 +4734,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -4783,30 +4783,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4965,14 +4965,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5141,13 +5141,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -5163,16 +5163,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5270,7 +5270,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5397,12 +5397,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5513,11 +5513,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5628,11 +5628,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5752,19 +5752,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5962,14 +5962,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -6073,8 +6073,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -6171,7 +6171,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -6363,19 +6363,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -6473,7 +6473,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -6628,11 +6628,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/helpers.ts b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/helpers.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/misc/all_fields.ts b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/misc/all_fields.ts index 5a772ffd49..77411e862b 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/misc/all_fields.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/misc/all_fields.ts @@ -288,74 +288,74 @@ export interface EncodingTestForOmitProtoMsg { } export interface EncodingTestForOmitAmino { /** scalar */ - str?: string; + str: string; o_str?: string; - b?: boolean; + b: boolean; o_b?: boolean; - num?: number; + num: number; o_num?: number; /** bigint */ - big?: string; + big: string; o_big?: string; /** protoType */ - proto?: AccessConfigAmino; + proto: AccessConfigAmino; o_proto?: AccessConfigAmino; /** anyType */ - auth?: AnyAmino; + auth: AnyAmino; o_auth?: AnyAmino; /** bytes */ - salt?: string; + salt: string; o_salt?: string; /** raw bytes */ - raw?: any; + raw: any; o_raw?: any; /** wasm bytes */ - wasm?: string; + wasm: string; o_wasm?: string; /** enum */ - opt?: VoteOption; + opt: VoteOption; o_opt?: VoteOption; /** duration */ - period?: DurationAmino; + period: DurationAmino; o_period?: DurationAmino; /** timestamp */ - date?: string; + date: string; o_date?: string; /** pubkey */ - pubkey?: AnyAmino; + pubkey: AnyAmino; o_pubkey?: AnyAmino; /** array scalar */ - nums?: number[]; + nums: number[]; o_nums?: number[]; /** array bigint */ - bigs?: string[]; + bigs: string[]; o_bigs?: string[]; /** array bytes */ - salts?: string[]; + salts: string[]; o_salts?: string[]; /** array raw bytes */ - raws?: any[]; + raws: any[]; o_raws?: any[]; /** array wasm bytes */ - wasms?: string[]; + wasms: string[]; o_wasms?: string[]; /** array enum */ - opts?: VoteOption[]; + opts: VoteOption[]; o_opts?: VoteOption[]; /** array duration */ - periods?: DurationAmino[]; + periods: DurationAmino[]; o_periods?: DurationAmino[]; /** array protoType */ - protos?: AccessConfigAmino[]; + protos: AccessConfigAmino[]; o_protos?: AccessConfigAmino[]; /** array anyType */ - auths?: AnyAmino[]; + auths: AnyAmino[]; o_auths?: AnyAmino[]; /** dec */ - dec?: string; + dec: string; o_dec?: string; /** array dec */ - decs?: string[]; + decs: string[]; o_decs?: string[]; } export interface EncodingTestForOmitAminoMsg { @@ -1374,10 +1374,10 @@ export const EncodingTestForDontOmit = { message.dOWasm = fromBase64(object.d_o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.d_o_opt !== undefined && object.d_o_opt !== null) { - message.dOOpt = voteOptionFromJSON(object.d_o_opt); + message.dOOpt = object.d_o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -1407,8 +1407,8 @@ export const EncodingTestForDontOmit = { message.dORaws = object.d_o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.dOWasms = object.d_o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.dOOpts = object.d_o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.dOOpts = object.d_o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.dOPeriods = object.d_o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -1427,28 +1427,28 @@ export const EncodingTestForDontOmit = { }, toAmino(message: EncodingTestForDontOmit): EncodingTestForDontOmitAmino { const obj: any = {}; - obj.str = message.str; + obj.str = message.str === "" ? undefined : message.str; obj.d_o_str = message.dOStr ?? ""; - obj.b = message.b; + obj.b = message.b === false ? undefined : message.b; obj.d_o_b = message.dOB ?? false; - obj.num = message.num; + obj.num = message.num === 0 ? undefined : message.num; obj.d_o_num = message.dONum ?? 0; - obj.big = message.big ? message.big.toString() : undefined; + obj.big = message.big !== BigInt(0) ? message.big.toString() : undefined; obj.d_o_big = message.dOBig ? message.dOBig.toString() : "0"; obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; - obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.fromPartial({}); + obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; - obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.fromPartial({}); + obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.toAmino(Any.fromPartial({})); obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; obj.d_o_salt = message.dOSalt ? base64FromBytes(message.dOSalt) : ""; obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; obj.d_o_raw = message.dORaw ? JSON.parse(fromUtf8(message.dORaw)) : {}; obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; obj.d_o_wasm = message.dOWasm ? toBase64(message.dOWasm) : ""; - obj.opt = message.opt; + obj.opt = message.opt === 0 ? undefined : message.opt; obj.d_o_opt = message.dOOpt ?? 0; obj.period = message.period ? Duration.toAmino(message.period) : undefined; - obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.fromPartial({}); + obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.toAmino(Duration.fromPartial({})); obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; obj.d_o_date = message.dODate ? Timestamp.toAmino(toTimestamp(message.dODate)) : new Date(); obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; @@ -1456,104 +1456,104 @@ export const EncodingTestForDontOmit = { if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.dONums) { obj.d_o_nums = message.dONums.map(e => e); } else { - obj.d_o_nums = []; + obj.d_o_nums = message.dONums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.dOBigs) { obj.d_o_bigs = message.dOBigs.map(e => e.toString()); } else { - obj.d_o_bigs = []; + obj.d_o_bigs = message.dOBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.dOSalts) { obj.d_o_salts = message.dOSalts.map(e => base64FromBytes(e)); } else { - obj.d_o_salts = []; + obj.d_o_salts = message.dOSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.dORaws) { obj.d_o_raws = message.dORaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.d_o_raws = []; + obj.d_o_raws = message.dORaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.dOWasms) { obj.d_o_wasms = message.dOWasms.map(e => toBase64(e)); } else { - obj.d_o_wasms = []; + obj.d_o_wasms = message.dOWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.dOOpts) { obj.d_o_opts = message.dOOpts.map(e => e); } else { - obj.d_o_opts = []; + obj.d_o_opts = message.dOOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.dOPeriods) { obj.d_o_periods = message.dOPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.d_o_periods = []; + obj.d_o_periods = message.dOPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.dOProtos) { obj.d_o_protos = message.dOProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.d_o_protos = []; + obj.d_o_protos = message.dOProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.dOAuths) { obj.d_o_auths = message.dOAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.d_o_auths = []; + obj.d_o_auths = message.dOAuths; } - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; obj.d_o_dec = message.dODec ?? ""; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.dODecs) { obj.d_o_decs = message.dODecs.map(e => e); } else { - obj.d_o_decs = []; + obj.d_o_decs = message.dODecs; } return obj; }, @@ -2535,10 +2535,10 @@ export const EncodingTestForOmit = { message.oWasm = fromBase64(object.o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.o_opt !== undefined && object.o_opt !== null) { - message.oOpt = voteOptionFromJSON(object.o_opt); + message.oOpt = object.o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -2568,8 +2568,8 @@ export const EncodingTestForOmit = { message.oRaws = object.o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.oWasms = object.o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.oOpts = object.o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.oOpts = object.o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.oPeriods = object.o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -2588,133 +2588,133 @@ export const EncodingTestForOmit = { }, toAmino(message: EncodingTestForOmit): EncodingTestForOmitAmino { const obj: any = {}; - obj.str = message.str; - obj.o_str = message.oStr; - obj.b = message.b; - obj.o_b = message.oB; - obj.num = message.num; - obj.o_num = message.oNum; - obj.big = message.big ? message.big.toString() : undefined; - obj.o_big = message.oBig ? message.oBig.toString() : undefined; - obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; + obj.str = message.str ?? ""; + obj.o_str = message.oStr === "" ? undefined : message.oStr; + obj.b = message.b ?? false; + obj.o_b = message.oB === false ? undefined : message.oB; + obj.num = message.num ?? 0; + obj.o_num = message.oNum === 0 ? undefined : message.oNum; + obj.big = message.big ? message.big.toString() : "0"; + obj.o_big = message.oBig !== BigInt(0) ? message.oBig.toString() : undefined; + obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.o_proto = message.oProto ? AccessConfig.toAmino(message.oProto) : undefined; - obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; + obj.auth = message.auth ? Any.toAmino(message.auth) : Any.toAmino(Any.fromPartial({})); obj.o_auth = message.oAuth ? Any.toAmino(message.oAuth) : undefined; - obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; + obj.salt = message.salt ? base64FromBytes(message.salt) : ""; obj.o_salt = message.oSalt ? base64FromBytes(message.oSalt) : undefined; - obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; + obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : {}; obj.o_raw = message.oRaw ? JSON.parse(fromUtf8(message.oRaw)) : undefined; - obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; + obj.wasm = message.wasm ? toBase64(message.wasm) : ""; obj.o_wasm = message.oWasm ? toBase64(message.oWasm) : undefined; - obj.opt = message.opt; - obj.o_opt = message.oOpt; - obj.period = message.period ? Duration.toAmino(message.period) : undefined; + obj.opt = message.opt ?? 0; + obj.o_opt = message.oOpt === 0 ? undefined : message.oOpt; + obj.period = message.period ? Duration.toAmino(message.period) : Duration.toAmino(Duration.fromPartial({})); obj.o_period = message.oPeriod ? Duration.toAmino(message.oPeriod) : undefined; - obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; + obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : null; obj.o_date = message.oDate ? Timestamp.toAmino(toTimestamp(message.oDate)) : undefined; - obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; + obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : null; obj.o_pubkey = message.oPubkey ? decodePubkey(message.oPubkey) : undefined; if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.oNums) { obj.o_nums = message.oNums.map(e => e); } else { - obj.o_nums = []; + obj.o_nums = message.oNums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.oBigs) { obj.o_bigs = message.oBigs.map(e => e.toString()); } else { - obj.o_bigs = []; + obj.o_bigs = message.oBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.oSalts) { obj.o_salts = message.oSalts.map(e => base64FromBytes(e)); } else { - obj.o_salts = []; + obj.o_salts = message.oSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.oRaws) { obj.o_raws = message.oRaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.o_raws = []; + obj.o_raws = message.oRaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.oWasms) { obj.o_wasms = message.oWasms.map(e => toBase64(e)); } else { - obj.o_wasms = []; + obj.o_wasms = message.oWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.oOpts) { obj.o_opts = message.oOpts.map(e => e); } else { - obj.o_opts = []; + obj.o_opts = message.oOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.oPeriods) { obj.o_periods = message.oPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.o_periods = []; + obj.o_periods = message.oPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.oProtos) { obj.o_protos = message.oProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.o_protos = []; + obj.o_protos = message.oProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.oAuths) { obj.o_auths = message.oAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.o_auths = []; + obj.o_auths = message.oAuths; } - obj.dec = message.dec; - obj.o_dec = message.oDec; + obj.dec = message.dec ?? ""; + obj.o_dec = message.oDec === "" ? undefined : message.oDec; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.oDecs) { obj.o_decs = message.oDecs.map(e => e); } else { - obj.o_decs = []; + obj.o_decs = message.oDecs; } return obj; }, diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/misc/eval_request.ts b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/misc/eval_request.ts index 0d87d5168f..41599d60fc 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/misc/eval_request.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/misc/eval_request.ts @@ -283,7 +283,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -383,7 +383,7 @@ export const EvalRequest_RefsEntry = { }, toAmino(message: EvalRequest_RefsEntry): EvalRequest_RefsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? IdRef.toAmino(message.value) : undefined; return obj; }, @@ -700,16 +700,16 @@ export const EvalRequest = { obj.refs[k] = IdRef.toAmino(v); }); } - obj.test_num = message.testNum; - obj.test_string = message.testString; - obj.test_bool = message.testBool; + obj.test_num = message.testNum === 0 ? undefined : message.testNum; + obj.test_string = message.testString === "" ? undefined : message.testString; + obj.test_bool = message.testBool === false ? undefined : message.testBool; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; - obj.id = message.id; - obj.name = message.name; + obj.id = message.id === null ? undefined : message.id; + obj.name = message.name === null ? undefined : message.name; if (message.testArray) { obj.test_array = message.testArray.map(e => e); } else { - obj.test_array = []; + obj.test_array = message.testArray; } return obj; }, @@ -798,7 +798,7 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -886,7 +886,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { diff --git a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/api/expr/v1alpha1/eval.ts b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/api/expr/v1alpha1/eval.ts index f5355ec6be..2ac91133b4 100644 --- a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/api/expr/v1alpha1/eval.ts @@ -109,7 +109,7 @@ export const ExprValue = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -195,7 +195,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromProtoMsg(message: IdRefProtoMsg): IdRef { diff --git a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/protobuf/descriptor.ts index 812a85577a..bef5d2f48a 100644 --- a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/protobuf/descriptor.ts @@ -2167,7 +2167,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -2493,46 +2493,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromProtoMsg(message: FileDescriptorProtoProtoMsg): FileDescriptorProto { @@ -2811,47 +2811,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -2971,8 +2971,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -3074,8 +3074,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromProtoMsg(message: DescriptorProto_ReservedRangeProtoMsg): DescriptorProto_ReservedRange { @@ -3169,7 +3169,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -3374,10 +3374,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -3401,15 +3401,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -3513,7 +3513,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3683,22 +3683,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3800,8 +3800,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromProtoMsg(message: EnumDescriptorProto_EnumReservedRangeProtoMsg): EnumDescriptorProto_EnumReservedRange { @@ -3920,8 +3920,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -4047,11 +4047,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -4220,12 +4220,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromProtoMsg(message: MethodDescriptorProtoProtoMsg): MethodDescriptorProto { @@ -4587,7 +4587,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -4636,30 +4636,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4815,14 +4815,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4988,13 +4988,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -5010,16 +5010,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5114,7 +5114,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5238,12 +5238,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5351,11 +5351,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5463,11 +5463,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5584,19 +5584,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5791,14 +5791,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromProtoMsg(message: UninterpretedOptionProtoMsg): UninterpretedOption { @@ -5899,8 +5899,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromProtoMsg(message: UninterpretedOption_NamePartProtoMsg): UninterpretedOption_NamePart { @@ -5994,7 +5994,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -6183,19 +6183,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -6290,7 +6290,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -6442,11 +6442,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromProtoMsg(message: GeneratedCodeInfo_AnnotationProtoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/helpers.ts b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/helpers.ts +++ b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/misc/all_fields.ts b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/misc/all_fields.ts index da48f1913e..ea58b4b073 100644 --- a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/misc/all_fields.ts +++ b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/misc/all_fields.ts @@ -284,74 +284,74 @@ export interface EncodingTestForOmitProtoMsg { } export interface EncodingTestForOmitAmino { /** scalar */ - str?: string; + str: string; o_str?: string; - b?: boolean; + b: boolean; o_b?: boolean; - num?: number; + num: number; o_num?: number; /** bigint */ - big?: string; + big: string; o_big?: string; /** protoType */ - proto?: AccessConfigAmino; + proto: AccessConfigAmino; o_proto?: AccessConfigAmino; /** anyType */ - auth?: AnyAmino; + auth: AnyAmino; o_auth?: AnyAmino; /** bytes */ - salt?: string; + salt: string; o_salt?: string; /** raw bytes */ - raw?: any; + raw: any; o_raw?: any; /** wasm bytes */ - wasm?: string; + wasm: string; o_wasm?: string; /** enum */ - opt?: VoteOption; + opt: VoteOption; o_opt?: VoteOption; /** duration */ - period?: DurationAmino; + period: DurationAmino; o_period?: DurationAmino; /** timestamp */ - date?: string; + date: string; o_date?: string; /** pubkey */ - pubkey?: AnyAmino; + pubkey: AnyAmino; o_pubkey?: AnyAmino; /** array scalar */ - nums?: number[]; + nums: number[]; o_nums?: number[]; /** array bigint */ - bigs?: string[]; + bigs: string[]; o_bigs?: string[]; /** array bytes */ - salts?: string[]; + salts: string[]; o_salts?: string[]; /** array raw bytes */ - raws?: any[]; + raws: any[]; o_raws?: any[]; /** array wasm bytes */ - wasms?: string[]; + wasms: string[]; o_wasms?: string[]; /** array enum */ - opts?: VoteOption[]; + opts: VoteOption[]; o_opts?: VoteOption[]; /** array duration */ - periods?: DurationAmino[]; + periods: DurationAmino[]; o_periods?: DurationAmino[]; /** array protoType */ - protos?: AccessConfigAmino[]; + protos: AccessConfigAmino[]; o_protos?: AccessConfigAmino[]; /** array anyType */ - auths?: AnyAmino[]; + auths: AnyAmino[]; o_auths?: AnyAmino[]; /** dec */ - dec?: string; + dec: string; o_dec?: string; /** array dec */ - decs?: string[]; + decs: string[]; o_decs?: string[]; } export interface EncodingTestForOmitSDKType { @@ -1366,10 +1366,10 @@ export const EncodingTestForDontOmit = { message.dOWasm = fromBase64(object.d_o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.d_o_opt !== undefined && object.d_o_opt !== null) { - message.dOOpt = voteOptionFromJSON(object.d_o_opt); + message.dOOpt = object.d_o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -1399,8 +1399,8 @@ export const EncodingTestForDontOmit = { message.dORaws = object.d_o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.dOWasms = object.d_o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.dOOpts = object.d_o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.dOOpts = object.d_o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.dOPeriods = object.d_o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -1419,28 +1419,28 @@ export const EncodingTestForDontOmit = { }, toAmino(message: EncodingTestForDontOmit): EncodingTestForDontOmitAmino { const obj: any = {}; - obj.str = message.str; + obj.str = message.str === "" ? undefined : message.str; obj.d_o_str = message.dOStr ?? ""; - obj.b = message.b; + obj.b = message.b === false ? undefined : message.b; obj.d_o_b = message.dOB ?? false; - obj.num = message.num; + obj.num = message.num === 0 ? undefined : message.num; obj.d_o_num = message.dONum ?? 0; - obj.big = message.big ? message.big.toString() : undefined; + obj.big = message.big !== BigInt(0) ? message.big.toString() : undefined; obj.d_o_big = message.dOBig ? message.dOBig.toString() : "0"; obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; - obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.fromPartial({}); + obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; - obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.fromPartial({}); + obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.toAmino(Any.fromPartial({})); obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; obj.d_o_salt = message.dOSalt ? base64FromBytes(message.dOSalt) : ""; obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; obj.d_o_raw = message.dORaw ? JSON.parse(fromUtf8(message.dORaw)) : {}; obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; obj.d_o_wasm = message.dOWasm ? toBase64(message.dOWasm) : ""; - obj.opt = message.opt; + obj.opt = message.opt === 0 ? undefined : message.opt; obj.d_o_opt = message.dOOpt ?? 0; obj.period = message.period ? Duration.toAmino(message.period) : undefined; - obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.fromPartial({}); + obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.toAmino(Duration.fromPartial({})); obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; obj.d_o_date = message.dODate ? Timestamp.toAmino(toTimestamp(message.dODate)) : new Date(); obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; @@ -1448,104 +1448,104 @@ export const EncodingTestForDontOmit = { if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.dONums) { obj.d_o_nums = message.dONums.map(e => e); } else { - obj.d_o_nums = []; + obj.d_o_nums = message.dONums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.dOBigs) { obj.d_o_bigs = message.dOBigs.map(e => e.toString()); } else { - obj.d_o_bigs = []; + obj.d_o_bigs = message.dOBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.dOSalts) { obj.d_o_salts = message.dOSalts.map(e => base64FromBytes(e)); } else { - obj.d_o_salts = []; + obj.d_o_salts = message.dOSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.dORaws) { obj.d_o_raws = message.dORaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.d_o_raws = []; + obj.d_o_raws = message.dORaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.dOWasms) { obj.d_o_wasms = message.dOWasms.map(e => toBase64(e)); } else { - obj.d_o_wasms = []; + obj.d_o_wasms = message.dOWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.dOOpts) { obj.d_o_opts = message.dOOpts.map(e => e); } else { - obj.d_o_opts = []; + obj.d_o_opts = message.dOOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.dOPeriods) { obj.d_o_periods = message.dOPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.d_o_periods = []; + obj.d_o_periods = message.dOPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.dOProtos) { obj.d_o_protos = message.dOProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.d_o_protos = []; + obj.d_o_protos = message.dOProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.dOAuths) { obj.d_o_auths = message.dOAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.d_o_auths = []; + obj.d_o_auths = message.dOAuths; } - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; obj.d_o_dec = message.dODec ?? ""; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.dODecs) { obj.d_o_decs = message.dODecs.map(e => e); } else { - obj.d_o_decs = []; + obj.d_o_decs = message.dODecs; } return obj; }, @@ -2524,10 +2524,10 @@ export const EncodingTestForOmit = { message.oWasm = fromBase64(object.o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.o_opt !== undefined && object.o_opt !== null) { - message.oOpt = voteOptionFromJSON(object.o_opt); + message.oOpt = object.o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -2557,8 +2557,8 @@ export const EncodingTestForOmit = { message.oRaws = object.o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.oWasms = object.o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.oOpts = object.o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.oOpts = object.o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.oPeriods = object.o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -2577,133 +2577,133 @@ export const EncodingTestForOmit = { }, toAmino(message: EncodingTestForOmit): EncodingTestForOmitAmino { const obj: any = {}; - obj.str = message.str; - obj.o_str = message.oStr; - obj.b = message.b; - obj.o_b = message.oB; - obj.num = message.num; - obj.o_num = message.oNum; - obj.big = message.big ? message.big.toString() : undefined; - obj.o_big = message.oBig ? message.oBig.toString() : undefined; - obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; + obj.str = message.str ?? ""; + obj.o_str = message.oStr === "" ? undefined : message.oStr; + obj.b = message.b ?? false; + obj.o_b = message.oB === false ? undefined : message.oB; + obj.num = message.num ?? 0; + obj.o_num = message.oNum === 0 ? undefined : message.oNum; + obj.big = message.big ? message.big.toString() : "0"; + obj.o_big = message.oBig !== BigInt(0) ? message.oBig.toString() : undefined; + obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.o_proto = message.oProto ? AccessConfig.toAmino(message.oProto) : undefined; - obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; + obj.auth = message.auth ? Any.toAmino(message.auth) : Any.toAmino(Any.fromPartial({})); obj.o_auth = message.oAuth ? Any.toAmino(message.oAuth) : undefined; - obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; + obj.salt = message.salt ? base64FromBytes(message.salt) : ""; obj.o_salt = message.oSalt ? base64FromBytes(message.oSalt) : undefined; - obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; + obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : {}; obj.o_raw = message.oRaw ? JSON.parse(fromUtf8(message.oRaw)) : undefined; - obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; + obj.wasm = message.wasm ? toBase64(message.wasm) : ""; obj.o_wasm = message.oWasm ? toBase64(message.oWasm) : undefined; - obj.opt = message.opt; - obj.o_opt = message.oOpt; - obj.period = message.period ? Duration.toAmino(message.period) : undefined; + obj.opt = message.opt ?? 0; + obj.o_opt = message.oOpt === 0 ? undefined : message.oOpt; + obj.period = message.period ? Duration.toAmino(message.period) : Duration.toAmino(Duration.fromPartial({})); obj.o_period = message.oPeriod ? Duration.toAmino(message.oPeriod) : undefined; - obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; + obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : null; obj.o_date = message.oDate ? Timestamp.toAmino(toTimestamp(message.oDate)) : undefined; - obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; + obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : null; obj.o_pubkey = message.oPubkey ? decodePubkey(message.oPubkey) : undefined; if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.oNums) { obj.o_nums = message.oNums.map(e => e); } else { - obj.o_nums = []; + obj.o_nums = message.oNums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.oBigs) { obj.o_bigs = message.oBigs.map(e => e.toString()); } else { - obj.o_bigs = []; + obj.o_bigs = message.oBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.oSalts) { obj.o_salts = message.oSalts.map(e => base64FromBytes(e)); } else { - obj.o_salts = []; + obj.o_salts = message.oSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.oRaws) { obj.o_raws = message.oRaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.o_raws = []; + obj.o_raws = message.oRaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.oWasms) { obj.o_wasms = message.oWasms.map(e => toBase64(e)); } else { - obj.o_wasms = []; + obj.o_wasms = message.oWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.oOpts) { obj.o_opts = message.oOpts.map(e => e); } else { - obj.o_opts = []; + obj.o_opts = message.oOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.oPeriods) { obj.o_periods = message.oPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.o_periods = []; + obj.o_periods = message.oPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.oProtos) { obj.o_protos = message.oProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.o_protos = []; + obj.o_protos = message.oProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.oAuths) { obj.o_auths = message.oAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.o_auths = []; + obj.o_auths = message.oAuths; } - obj.dec = message.dec; - obj.o_dec = message.oDec; + obj.dec = message.dec ?? ""; + obj.o_dec = message.oDec === "" ? undefined : message.oDec; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.oDecs) { obj.o_decs = message.oDecs.map(e => e); } else { - obj.o_decs = []; + obj.o_decs = message.oDecs; } return obj; }, diff --git a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/misc/eval_request.ts b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/misc/eval_request.ts index 8c6917a8c6..b321f10547 100644 --- a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/misc/eval_request.ts +++ b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/misc/eval_request.ts @@ -263,7 +263,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -360,7 +360,7 @@ export const EvalRequest_RefsEntry = { }, toAmino(message: EvalRequest_RefsEntry): EvalRequest_RefsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? IdRef.toAmino(message.value) : undefined; return obj; }, @@ -674,16 +674,16 @@ export const EvalRequest = { obj.refs[k] = IdRef.toAmino(v); }); } - obj.test_num = message.testNum; - obj.test_string = message.testString; - obj.test_bool = message.testBool; + obj.test_num = message.testNum === 0 ? undefined : message.testNum; + obj.test_string = message.testString === "" ? undefined : message.testString; + obj.test_bool = message.testBool === false ? undefined : message.testBool; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; - obj.id = message.id; - obj.name = message.name; + obj.id = message.id === null ? undefined : message.id; + obj.name = message.name === null ? undefined : message.name; if (message.testArray) { obj.test_array = message.testArray.map(e => e); } else { - obj.test_array = []; + obj.test_array = message.testArray; } return obj; }, @@ -769,7 +769,7 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromProtoMsg(message: AccessConfigProtoMsg): AccessConfig { @@ -854,7 +854,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromProtoMsg(message: GenericAuthorizationProtoMsg): GenericAuthorization { diff --git a/__fixtures__/misc/output-proto-amino/no-amino-legacy-no-proto/helpers.ts b/__fixtures__/misc/output-proto-amino/no-amino-legacy-no-proto/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino-legacy-no-proto/helpers.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino-legacy-no-proto/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output-proto-amino/no-amino-legacy/google/api/expr/v1alpha1/eval.ts b/__fixtures__/misc/output-proto-amino/no-amino-legacy/google/api/expr/v1alpha1/eval.ts index 23b7e7ea73..50b92187a5 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino-legacy/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino-legacy/google/api/expr/v1alpha1/eval.ts @@ -101,7 +101,7 @@ export const ExprValue = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -190,7 +190,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { diff --git a/__fixtures__/misc/output-proto-amino/no-amino-legacy/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/no-amino-legacy/google/protobuf/descriptor.ts index 32c45bd0c3..d61dd5109c 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino-legacy/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino-legacy/google/protobuf/descriptor.ts @@ -1464,7 +1464,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -1793,46 +1793,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2114,47 +2114,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -2277,8 +2277,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -2383,8 +2383,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -2481,7 +2481,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -2689,10 +2689,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -2716,15 +2716,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -2831,7 +2831,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3004,22 +3004,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3124,8 +3124,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -3247,8 +3247,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -3377,11 +3377,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -3553,12 +3553,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -3923,7 +3923,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -3972,30 +3972,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4154,14 +4154,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4330,13 +4330,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -4352,16 +4352,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4459,7 +4459,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4586,12 +4586,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4702,11 +4702,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4817,11 +4817,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4941,19 +4941,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5151,14 +5151,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -5262,8 +5262,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -5360,7 +5360,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -5552,19 +5552,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -5662,7 +5662,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -5817,11 +5817,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/misc/output-proto-amino/no-amino-legacy/helpers.ts b/__fixtures__/misc/output-proto-amino/no-amino-legacy/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino-legacy/helpers.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino-legacy/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output-proto-amino/no-amino-legacy/misc/all_fields.ts b/__fixtures__/misc/output-proto-amino/no-amino-legacy/misc/all_fields.ts index 272296267f..7f5731ed7a 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino-legacy/misc/all_fields.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino-legacy/misc/all_fields.ts @@ -1222,10 +1222,10 @@ export const EncodingTestForDontOmit = { message.dOWasm = fromBase64(object.d_o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.d_o_opt !== undefined && object.d_o_opt !== null) { - message.dOOpt = voteOptionFromJSON(object.d_o_opt); + message.dOOpt = object.d_o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -1255,8 +1255,8 @@ export const EncodingTestForDontOmit = { message.dORaws = object.d_o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.dOWasms = object.d_o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.dOOpts = object.d_o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.dOOpts = object.d_o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.dOPeriods = object.d_o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -1275,28 +1275,28 @@ export const EncodingTestForDontOmit = { }, toAmino(message: EncodingTestForDontOmit): EncodingTestForDontOmitAmino { const obj: any = {}; - obj.str = message.str; + obj.str = message.str === "" ? undefined : message.str; obj.d_o_str = message.dOStr ?? ""; - obj.b = message.b; + obj.b = message.b === false ? undefined : message.b; obj.d_o_b = message.dOB ?? false; - obj.num = message.num; + obj.num = message.num === 0 ? undefined : message.num; obj.d_o_num = message.dONum ?? 0; - obj.big = message.big ? message.big.toString() : undefined; + obj.big = message.big !== BigInt(0) ? message.big.toString() : undefined; obj.d_o_big = message.dOBig ? message.dOBig.toString() : "0"; obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; - obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.fromPartial({}); + obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; - obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.fromPartial({}); + obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.toAmino(Any.fromPartial({})); obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; obj.d_o_salt = message.dOSalt ? base64FromBytes(message.dOSalt) : ""; obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; obj.d_o_raw = message.dORaw ? JSON.parse(fromUtf8(message.dORaw)) : {}; obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; obj.d_o_wasm = message.dOWasm ? toBase64(message.dOWasm) : ""; - obj.opt = message.opt; + obj.opt = message.opt === 0 ? undefined : message.opt; obj.d_o_opt = message.dOOpt ?? 0; obj.period = message.period ? Duration.toAmino(message.period) : undefined; - obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.fromPartial({}); + obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.toAmino(Duration.fromPartial({})); obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; obj.d_o_date = message.dODate ? Timestamp.toAmino(toTimestamp(message.dODate)) : new Date(); obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; @@ -1304,104 +1304,104 @@ export const EncodingTestForDontOmit = { if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.dONums) { obj.d_o_nums = message.dONums.map(e => e); } else { - obj.d_o_nums = []; + obj.d_o_nums = message.dONums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.dOBigs) { obj.d_o_bigs = message.dOBigs.map(e => e.toString()); } else { - obj.d_o_bigs = []; + obj.d_o_bigs = message.dOBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.dOSalts) { obj.d_o_salts = message.dOSalts.map(e => base64FromBytes(e)); } else { - obj.d_o_salts = []; + obj.d_o_salts = message.dOSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.dORaws) { obj.d_o_raws = message.dORaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.d_o_raws = []; + obj.d_o_raws = message.dORaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.dOWasms) { obj.d_o_wasms = message.dOWasms.map(e => toBase64(e)); } else { - obj.d_o_wasms = []; + obj.d_o_wasms = message.dOWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.dOOpts) { obj.d_o_opts = message.dOOpts.map(e => e); } else { - obj.d_o_opts = []; + obj.d_o_opts = message.dOOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.dOPeriods) { obj.d_o_periods = message.dOPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.d_o_periods = []; + obj.d_o_periods = message.dOPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.dOProtos) { obj.d_o_protos = message.dOProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.d_o_protos = []; + obj.d_o_protos = message.dOProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.dOAuths) { obj.d_o_auths = message.dOAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.d_o_auths = []; + obj.d_o_auths = message.dOAuths; } - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; obj.d_o_dec = message.dODec ?? ""; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.dODecs) { obj.d_o_decs = message.dODecs.map(e => e); } else { - obj.d_o_decs = []; + obj.d_o_decs = message.dODecs; } return obj; }, @@ -2383,10 +2383,10 @@ export const EncodingTestForOmit = { message.oWasm = fromBase64(object.o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.o_opt !== undefined && object.o_opt !== null) { - message.oOpt = voteOptionFromJSON(object.o_opt); + message.oOpt = object.o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -2416,8 +2416,8 @@ export const EncodingTestForOmit = { message.oRaws = object.o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.oWasms = object.o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.oOpts = object.o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.oOpts = object.o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.oPeriods = object.o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -2436,133 +2436,133 @@ export const EncodingTestForOmit = { }, toAmino(message: EncodingTestForOmit): EncodingTestForOmitAmino { const obj: any = {}; - obj.str = message.str; - obj.o_str = message.oStr; - obj.b = message.b; - obj.o_b = message.oB; - obj.num = message.num; - obj.o_num = message.oNum; - obj.big = message.big ? message.big.toString() : undefined; - obj.o_big = message.oBig ? message.oBig.toString() : undefined; - obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; + obj.str = message.str ?? ""; + obj.o_str = message.oStr === "" ? undefined : message.oStr; + obj.b = message.b ?? false; + obj.o_b = message.oB === false ? undefined : message.oB; + obj.num = message.num ?? 0; + obj.o_num = message.oNum === 0 ? undefined : message.oNum; + obj.big = message.big ? message.big.toString() : "0"; + obj.o_big = message.oBig !== BigInt(0) ? message.oBig.toString() : undefined; + obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.o_proto = message.oProto ? AccessConfig.toAmino(message.oProto) : undefined; - obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; + obj.auth = message.auth ? Any.toAmino(message.auth) : Any.toAmino(Any.fromPartial({})); obj.o_auth = message.oAuth ? Any.toAmino(message.oAuth) : undefined; - obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; + obj.salt = message.salt ? base64FromBytes(message.salt) : ""; obj.o_salt = message.oSalt ? base64FromBytes(message.oSalt) : undefined; - obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; + obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : {}; obj.o_raw = message.oRaw ? JSON.parse(fromUtf8(message.oRaw)) : undefined; - obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; + obj.wasm = message.wasm ? toBase64(message.wasm) : ""; obj.o_wasm = message.oWasm ? toBase64(message.oWasm) : undefined; - obj.opt = message.opt; - obj.o_opt = message.oOpt; - obj.period = message.period ? Duration.toAmino(message.period) : undefined; + obj.opt = message.opt ?? 0; + obj.o_opt = message.oOpt === 0 ? undefined : message.oOpt; + obj.period = message.period ? Duration.toAmino(message.period) : Duration.toAmino(Duration.fromPartial({})); obj.o_period = message.oPeriod ? Duration.toAmino(message.oPeriod) : undefined; - obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; + obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : null; obj.o_date = message.oDate ? Timestamp.toAmino(toTimestamp(message.oDate)) : undefined; - obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; + obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : null; obj.o_pubkey = message.oPubkey ? decodePubkey(message.oPubkey) : undefined; if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.oNums) { obj.o_nums = message.oNums.map(e => e); } else { - obj.o_nums = []; + obj.o_nums = message.oNums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.oBigs) { obj.o_bigs = message.oBigs.map(e => e.toString()); } else { - obj.o_bigs = []; + obj.o_bigs = message.oBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.oSalts) { obj.o_salts = message.oSalts.map(e => base64FromBytes(e)); } else { - obj.o_salts = []; + obj.o_salts = message.oSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.oRaws) { obj.o_raws = message.oRaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.o_raws = []; + obj.o_raws = message.oRaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.oWasms) { obj.o_wasms = message.oWasms.map(e => toBase64(e)); } else { - obj.o_wasms = []; + obj.o_wasms = message.oWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.oOpts) { obj.o_opts = message.oOpts.map(e => e); } else { - obj.o_opts = []; + obj.o_opts = message.oOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.oPeriods) { obj.o_periods = message.oPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.o_periods = []; + obj.o_periods = message.oPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.oProtos) { obj.o_protos = message.oProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.o_protos = []; + obj.o_protos = message.oProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.oAuths) { obj.o_auths = message.oAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.o_auths = []; + obj.o_auths = message.oAuths; } - obj.dec = message.dec; - obj.o_dec = message.oDec; + obj.dec = message.dec ?? ""; + obj.o_dec = message.oDec === "" ? undefined : message.oDec; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.oDecs) { obj.o_decs = message.oDecs.map(e => e); } else { - obj.o_decs = []; + obj.o_decs = message.oDecs; } return obj; }, diff --git a/__fixtures__/misc/output-proto-amino/no-amino-legacy/misc/eval_request.ts b/__fixtures__/misc/output-proto-amino/no-amino-legacy/misc/eval_request.ts index 516f63ec54..e75506a8a2 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino-legacy/misc/eval_request.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino-legacy/misc/eval_request.ts @@ -227,7 +227,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -327,7 +327,7 @@ export const EvalRequest_RefsEntry = { }, toAmino(message: EvalRequest_RefsEntry): EvalRequest_RefsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? IdRef.toAmino(message.value) : undefined; return obj; }, @@ -644,16 +644,16 @@ export const EvalRequest = { obj.refs[k] = IdRef.toAmino(v); }); } - obj.test_num = message.testNum; - obj.test_string = message.testString; - obj.test_bool = message.testBool; + obj.test_num = message.testNum === 0 ? undefined : message.testNum; + obj.test_string = message.testString === "" ? undefined : message.testString; + obj.test_bool = message.testBool === false ? undefined : message.testBool; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; - obj.id = message.id; - obj.name = message.name; + obj.id = message.id === null ? undefined : message.id; + obj.name = message.name === null ? undefined : message.name; if (message.testArray) { obj.test_array = message.testArray.map(e => e); } else { - obj.test_array = []; + obj.test_array = message.testArray; } return obj; }, @@ -742,7 +742,7 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -830,7 +830,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { diff --git a/__fixtures__/misc/output-proto-amino/no-amino-no-proto/helpers.ts b/__fixtures__/misc/output-proto-amino/no-amino-no-proto/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino-no-proto/helpers.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino-no-proto/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output-proto-amino/no-amino/google/api/expr/v1alpha1/eval.ts b/__fixtures__/misc/output-proto-amino/no-amino/google/api/expr/v1alpha1/eval.ts index 23b7e7ea73..50b92187a5 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino/google/api/expr/v1alpha1/eval.ts @@ -101,7 +101,7 @@ export const ExprValue = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -190,7 +190,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { diff --git a/__fixtures__/misc/output-proto-amino/no-amino/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/no-amino/google/protobuf/descriptor.ts index 32c45bd0c3..d61dd5109c 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino/google/protobuf/descriptor.ts @@ -1464,7 +1464,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -1793,46 +1793,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2114,47 +2114,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -2277,8 +2277,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -2383,8 +2383,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -2481,7 +2481,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -2689,10 +2689,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -2716,15 +2716,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -2831,7 +2831,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3004,22 +3004,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3124,8 +3124,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -3247,8 +3247,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -3377,11 +3377,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -3553,12 +3553,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -3923,7 +3923,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -3972,30 +3972,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4154,14 +4154,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4330,13 +4330,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -4352,16 +4352,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4459,7 +4459,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4586,12 +4586,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4702,11 +4702,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4817,11 +4817,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4941,19 +4941,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5151,14 +5151,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -5262,8 +5262,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -5360,7 +5360,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -5552,19 +5552,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -5662,7 +5662,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -5817,11 +5817,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/misc/output-proto-amino/no-amino/helpers.ts b/__fixtures__/misc/output-proto-amino/no-amino/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino/helpers.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output-proto-amino/no-amino/misc/all_fields.ts b/__fixtures__/misc/output-proto-amino/no-amino/misc/all_fields.ts index 272296267f..7f5731ed7a 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino/misc/all_fields.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino/misc/all_fields.ts @@ -1222,10 +1222,10 @@ export const EncodingTestForDontOmit = { message.dOWasm = fromBase64(object.d_o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.d_o_opt !== undefined && object.d_o_opt !== null) { - message.dOOpt = voteOptionFromJSON(object.d_o_opt); + message.dOOpt = object.d_o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -1255,8 +1255,8 @@ export const EncodingTestForDontOmit = { message.dORaws = object.d_o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.dOWasms = object.d_o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.dOOpts = object.d_o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.dOOpts = object.d_o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.dOPeriods = object.d_o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -1275,28 +1275,28 @@ export const EncodingTestForDontOmit = { }, toAmino(message: EncodingTestForDontOmit): EncodingTestForDontOmitAmino { const obj: any = {}; - obj.str = message.str; + obj.str = message.str === "" ? undefined : message.str; obj.d_o_str = message.dOStr ?? ""; - obj.b = message.b; + obj.b = message.b === false ? undefined : message.b; obj.d_o_b = message.dOB ?? false; - obj.num = message.num; + obj.num = message.num === 0 ? undefined : message.num; obj.d_o_num = message.dONum ?? 0; - obj.big = message.big ? message.big.toString() : undefined; + obj.big = message.big !== BigInt(0) ? message.big.toString() : undefined; obj.d_o_big = message.dOBig ? message.dOBig.toString() : "0"; obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; - obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.fromPartial({}); + obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; - obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.fromPartial({}); + obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.toAmino(Any.fromPartial({})); obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; obj.d_o_salt = message.dOSalt ? base64FromBytes(message.dOSalt) : ""; obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; obj.d_o_raw = message.dORaw ? JSON.parse(fromUtf8(message.dORaw)) : {}; obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; obj.d_o_wasm = message.dOWasm ? toBase64(message.dOWasm) : ""; - obj.opt = message.opt; + obj.opt = message.opt === 0 ? undefined : message.opt; obj.d_o_opt = message.dOOpt ?? 0; obj.period = message.period ? Duration.toAmino(message.period) : undefined; - obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.fromPartial({}); + obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.toAmino(Duration.fromPartial({})); obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; obj.d_o_date = message.dODate ? Timestamp.toAmino(toTimestamp(message.dODate)) : new Date(); obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; @@ -1304,104 +1304,104 @@ export const EncodingTestForDontOmit = { if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.dONums) { obj.d_o_nums = message.dONums.map(e => e); } else { - obj.d_o_nums = []; + obj.d_o_nums = message.dONums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.dOBigs) { obj.d_o_bigs = message.dOBigs.map(e => e.toString()); } else { - obj.d_o_bigs = []; + obj.d_o_bigs = message.dOBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.dOSalts) { obj.d_o_salts = message.dOSalts.map(e => base64FromBytes(e)); } else { - obj.d_o_salts = []; + obj.d_o_salts = message.dOSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.dORaws) { obj.d_o_raws = message.dORaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.d_o_raws = []; + obj.d_o_raws = message.dORaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.dOWasms) { obj.d_o_wasms = message.dOWasms.map(e => toBase64(e)); } else { - obj.d_o_wasms = []; + obj.d_o_wasms = message.dOWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.dOOpts) { obj.d_o_opts = message.dOOpts.map(e => e); } else { - obj.d_o_opts = []; + obj.d_o_opts = message.dOOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.dOPeriods) { obj.d_o_periods = message.dOPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.d_o_periods = []; + obj.d_o_periods = message.dOPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.dOProtos) { obj.d_o_protos = message.dOProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.d_o_protos = []; + obj.d_o_protos = message.dOProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.dOAuths) { obj.d_o_auths = message.dOAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.d_o_auths = []; + obj.d_o_auths = message.dOAuths; } - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; obj.d_o_dec = message.dODec ?? ""; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.dODecs) { obj.d_o_decs = message.dODecs.map(e => e); } else { - obj.d_o_decs = []; + obj.d_o_decs = message.dODecs; } return obj; }, @@ -2383,10 +2383,10 @@ export const EncodingTestForOmit = { message.oWasm = fromBase64(object.o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.o_opt !== undefined && object.o_opt !== null) { - message.oOpt = voteOptionFromJSON(object.o_opt); + message.oOpt = object.o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -2416,8 +2416,8 @@ export const EncodingTestForOmit = { message.oRaws = object.o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.oWasms = object.o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.oOpts = object.o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.oOpts = object.o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.oPeriods = object.o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -2436,133 +2436,133 @@ export const EncodingTestForOmit = { }, toAmino(message: EncodingTestForOmit): EncodingTestForOmitAmino { const obj: any = {}; - obj.str = message.str; - obj.o_str = message.oStr; - obj.b = message.b; - obj.o_b = message.oB; - obj.num = message.num; - obj.o_num = message.oNum; - obj.big = message.big ? message.big.toString() : undefined; - obj.o_big = message.oBig ? message.oBig.toString() : undefined; - obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; + obj.str = message.str ?? ""; + obj.o_str = message.oStr === "" ? undefined : message.oStr; + obj.b = message.b ?? false; + obj.o_b = message.oB === false ? undefined : message.oB; + obj.num = message.num ?? 0; + obj.o_num = message.oNum === 0 ? undefined : message.oNum; + obj.big = message.big ? message.big.toString() : "0"; + obj.o_big = message.oBig !== BigInt(0) ? message.oBig.toString() : undefined; + obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.o_proto = message.oProto ? AccessConfig.toAmino(message.oProto) : undefined; - obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; + obj.auth = message.auth ? Any.toAmino(message.auth) : Any.toAmino(Any.fromPartial({})); obj.o_auth = message.oAuth ? Any.toAmino(message.oAuth) : undefined; - obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; + obj.salt = message.salt ? base64FromBytes(message.salt) : ""; obj.o_salt = message.oSalt ? base64FromBytes(message.oSalt) : undefined; - obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; + obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : {}; obj.o_raw = message.oRaw ? JSON.parse(fromUtf8(message.oRaw)) : undefined; - obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; + obj.wasm = message.wasm ? toBase64(message.wasm) : ""; obj.o_wasm = message.oWasm ? toBase64(message.oWasm) : undefined; - obj.opt = message.opt; - obj.o_opt = message.oOpt; - obj.period = message.period ? Duration.toAmino(message.period) : undefined; + obj.opt = message.opt ?? 0; + obj.o_opt = message.oOpt === 0 ? undefined : message.oOpt; + obj.period = message.period ? Duration.toAmino(message.period) : Duration.toAmino(Duration.fromPartial({})); obj.o_period = message.oPeriod ? Duration.toAmino(message.oPeriod) : undefined; - obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; + obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : null; obj.o_date = message.oDate ? Timestamp.toAmino(toTimestamp(message.oDate)) : undefined; - obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; + obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : null; obj.o_pubkey = message.oPubkey ? decodePubkey(message.oPubkey) : undefined; if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.oNums) { obj.o_nums = message.oNums.map(e => e); } else { - obj.o_nums = []; + obj.o_nums = message.oNums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.oBigs) { obj.o_bigs = message.oBigs.map(e => e.toString()); } else { - obj.o_bigs = []; + obj.o_bigs = message.oBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.oSalts) { obj.o_salts = message.oSalts.map(e => base64FromBytes(e)); } else { - obj.o_salts = []; + obj.o_salts = message.oSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.oRaws) { obj.o_raws = message.oRaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.o_raws = []; + obj.o_raws = message.oRaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.oWasms) { obj.o_wasms = message.oWasms.map(e => toBase64(e)); } else { - obj.o_wasms = []; + obj.o_wasms = message.oWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.oOpts) { obj.o_opts = message.oOpts.map(e => e); } else { - obj.o_opts = []; + obj.o_opts = message.oOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.oPeriods) { obj.o_periods = message.oPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.o_periods = []; + obj.o_periods = message.oPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.oProtos) { obj.o_protos = message.oProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.o_protos = []; + obj.o_protos = message.oProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.oAuths) { obj.o_auths = message.oAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.o_auths = []; + obj.o_auths = message.oAuths; } - obj.dec = message.dec; - obj.o_dec = message.oDec; + obj.dec = message.dec ?? ""; + obj.o_dec = message.oDec === "" ? undefined : message.oDec; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.oDecs) { obj.o_decs = message.oDecs.map(e => e); } else { - obj.o_decs = []; + obj.o_decs = message.oDecs; } return obj; }, diff --git a/__fixtures__/misc/output-proto-amino/no-amino/misc/eval_request.ts b/__fixtures__/misc/output-proto-amino/no-amino/misc/eval_request.ts index 516f63ec54..e75506a8a2 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino/misc/eval_request.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino/misc/eval_request.ts @@ -227,7 +227,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -327,7 +327,7 @@ export const EvalRequest_RefsEntry = { }, toAmino(message: EvalRequest_RefsEntry): EvalRequest_RefsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? IdRef.toAmino(message.value) : undefined; return obj; }, @@ -644,16 +644,16 @@ export const EvalRequest = { obj.refs[k] = IdRef.toAmino(v); }); } - obj.test_num = message.testNum; - obj.test_string = message.testString; - obj.test_bool = message.testBool; + obj.test_num = message.testNum === 0 ? undefined : message.testNum; + obj.test_string = message.testString === "" ? undefined : message.testString; + obj.test_bool = message.testBool === false ? undefined : message.testBool; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; - obj.id = message.id; - obj.name = message.name; + obj.id = message.id === null ? undefined : message.id; + obj.name = message.name === null ? undefined : message.name; if (message.testArray) { obj.test_array = message.testArray.map(e => e); } else { - obj.test_array = []; + obj.test_array = message.testArray; } return obj; }, @@ -742,7 +742,7 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -830,7 +830,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { diff --git a/__fixtures__/misc/output-proto-amino/proto-only-legacy/helpers.ts b/__fixtures__/misc/output-proto-amino/proto-only-legacy/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output-proto-amino/proto-only-legacy/helpers.ts +++ b/__fixtures__/misc/output-proto-amino/proto-only-legacy/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output-proto-amino/proto-only/helpers.ts b/__fixtures__/misc/output-proto-amino/proto-only/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output-proto-amino/proto-only/helpers.ts +++ b/__fixtures__/misc/output-proto-amino/proto-only/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output/google/api/expr/v1alpha1/eval.ts b/__fixtures__/misc/output/google/api/expr/v1alpha1/eval.ts index 45afde766e..6902943167 100644 --- a/__fixtures__/misc/output/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/misc/output/google/api/expr/v1alpha1/eval.ts @@ -117,7 +117,7 @@ export const ExprValue = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -206,7 +206,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { diff --git a/__fixtures__/misc/output/google/protobuf/descriptor.ts b/__fixtures__/misc/output/google/protobuf/descriptor.ts index b39e4e3219..4189965ecb 100644 --- a/__fixtures__/misc/output/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output/google/protobuf/descriptor.ts @@ -2275,7 +2275,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -2604,46 +2604,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2925,47 +2925,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3088,8 +3088,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -3194,8 +3194,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -3292,7 +3292,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -3500,10 +3500,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -3527,15 +3527,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -3642,7 +3642,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3815,22 +3815,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3935,8 +3935,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -4058,8 +4058,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -4188,11 +4188,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -4364,12 +4364,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -4734,7 +4734,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -4783,30 +4783,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4965,14 +4965,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5141,13 +5141,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -5163,16 +5163,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5270,7 +5270,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5397,12 +5397,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5513,11 +5513,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5628,11 +5628,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5752,19 +5752,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5962,14 +5962,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -6073,8 +6073,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -6171,7 +6171,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -6363,19 +6363,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -6473,7 +6473,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -6628,11 +6628,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/misc/output/helpers.ts b/__fixtures__/misc/output/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/misc/output/helpers.ts +++ b/__fixtures__/misc/output/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/misc/output/misc/all_fields.ts b/__fixtures__/misc/output/misc/all_fields.ts index 5a772ffd49..77411e862b 100644 --- a/__fixtures__/misc/output/misc/all_fields.ts +++ b/__fixtures__/misc/output/misc/all_fields.ts @@ -288,74 +288,74 @@ export interface EncodingTestForOmitProtoMsg { } export interface EncodingTestForOmitAmino { /** scalar */ - str?: string; + str: string; o_str?: string; - b?: boolean; + b: boolean; o_b?: boolean; - num?: number; + num: number; o_num?: number; /** bigint */ - big?: string; + big: string; o_big?: string; /** protoType */ - proto?: AccessConfigAmino; + proto: AccessConfigAmino; o_proto?: AccessConfigAmino; /** anyType */ - auth?: AnyAmino; + auth: AnyAmino; o_auth?: AnyAmino; /** bytes */ - salt?: string; + salt: string; o_salt?: string; /** raw bytes */ - raw?: any; + raw: any; o_raw?: any; /** wasm bytes */ - wasm?: string; + wasm: string; o_wasm?: string; /** enum */ - opt?: VoteOption; + opt: VoteOption; o_opt?: VoteOption; /** duration */ - period?: DurationAmino; + period: DurationAmino; o_period?: DurationAmino; /** timestamp */ - date?: string; + date: string; o_date?: string; /** pubkey */ - pubkey?: AnyAmino; + pubkey: AnyAmino; o_pubkey?: AnyAmino; /** array scalar */ - nums?: number[]; + nums: number[]; o_nums?: number[]; /** array bigint */ - bigs?: string[]; + bigs: string[]; o_bigs?: string[]; /** array bytes */ - salts?: string[]; + salts: string[]; o_salts?: string[]; /** array raw bytes */ - raws?: any[]; + raws: any[]; o_raws?: any[]; /** array wasm bytes */ - wasms?: string[]; + wasms: string[]; o_wasms?: string[]; /** array enum */ - opts?: VoteOption[]; + opts: VoteOption[]; o_opts?: VoteOption[]; /** array duration */ - periods?: DurationAmino[]; + periods: DurationAmino[]; o_periods?: DurationAmino[]; /** array protoType */ - protos?: AccessConfigAmino[]; + protos: AccessConfigAmino[]; o_protos?: AccessConfigAmino[]; /** array anyType */ - auths?: AnyAmino[]; + auths: AnyAmino[]; o_auths?: AnyAmino[]; /** dec */ - dec?: string; + dec: string; o_dec?: string; /** array dec */ - decs?: string[]; + decs: string[]; o_decs?: string[]; } export interface EncodingTestForOmitAminoMsg { @@ -1374,10 +1374,10 @@ export const EncodingTestForDontOmit = { message.dOWasm = fromBase64(object.d_o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.d_o_opt !== undefined && object.d_o_opt !== null) { - message.dOOpt = voteOptionFromJSON(object.d_o_opt); + message.dOOpt = object.d_o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -1407,8 +1407,8 @@ export const EncodingTestForDontOmit = { message.dORaws = object.d_o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.dOWasms = object.d_o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.dOOpts = object.d_o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.dOOpts = object.d_o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.dOPeriods = object.d_o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -1427,28 +1427,28 @@ export const EncodingTestForDontOmit = { }, toAmino(message: EncodingTestForDontOmit): EncodingTestForDontOmitAmino { const obj: any = {}; - obj.str = message.str; + obj.str = message.str === "" ? undefined : message.str; obj.d_o_str = message.dOStr ?? ""; - obj.b = message.b; + obj.b = message.b === false ? undefined : message.b; obj.d_o_b = message.dOB ?? false; - obj.num = message.num; + obj.num = message.num === 0 ? undefined : message.num; obj.d_o_num = message.dONum ?? 0; - obj.big = message.big ? message.big.toString() : undefined; + obj.big = message.big !== BigInt(0) ? message.big.toString() : undefined; obj.d_o_big = message.dOBig ? message.dOBig.toString() : "0"; obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; - obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.fromPartial({}); + obj.d_o_proto = message.dOProto ? AccessConfig.toAmino(message.dOProto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; - obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.fromPartial({}); + obj.d_o_auth = message.dOAuth ? Any.toAmino(message.dOAuth) : Any.toAmino(Any.fromPartial({})); obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; obj.d_o_salt = message.dOSalt ? base64FromBytes(message.dOSalt) : ""; obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; obj.d_o_raw = message.dORaw ? JSON.parse(fromUtf8(message.dORaw)) : {}; obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; obj.d_o_wasm = message.dOWasm ? toBase64(message.dOWasm) : ""; - obj.opt = message.opt; + obj.opt = message.opt === 0 ? undefined : message.opt; obj.d_o_opt = message.dOOpt ?? 0; obj.period = message.period ? Duration.toAmino(message.period) : undefined; - obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.fromPartial({}); + obj.d_o_period = message.dOPeriod ? Duration.toAmino(message.dOPeriod) : Duration.toAmino(Duration.fromPartial({})); obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; obj.d_o_date = message.dODate ? Timestamp.toAmino(toTimestamp(message.dODate)) : new Date(); obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; @@ -1456,104 +1456,104 @@ export const EncodingTestForDontOmit = { if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.dONums) { obj.d_o_nums = message.dONums.map(e => e); } else { - obj.d_o_nums = []; + obj.d_o_nums = message.dONums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.dOBigs) { obj.d_o_bigs = message.dOBigs.map(e => e.toString()); } else { - obj.d_o_bigs = []; + obj.d_o_bigs = message.dOBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.dOSalts) { obj.d_o_salts = message.dOSalts.map(e => base64FromBytes(e)); } else { - obj.d_o_salts = []; + obj.d_o_salts = message.dOSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.dORaws) { obj.d_o_raws = message.dORaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.d_o_raws = []; + obj.d_o_raws = message.dORaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.dOWasms) { obj.d_o_wasms = message.dOWasms.map(e => toBase64(e)); } else { - obj.d_o_wasms = []; + obj.d_o_wasms = message.dOWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.dOOpts) { obj.d_o_opts = message.dOOpts.map(e => e); } else { - obj.d_o_opts = []; + obj.d_o_opts = message.dOOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.dOPeriods) { obj.d_o_periods = message.dOPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.d_o_periods = []; + obj.d_o_periods = message.dOPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.dOProtos) { obj.d_o_protos = message.dOProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.d_o_protos = []; + obj.d_o_protos = message.dOProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.dOAuths) { obj.d_o_auths = message.dOAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.d_o_auths = []; + obj.d_o_auths = message.dOAuths; } - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; obj.d_o_dec = message.dODec ?? ""; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.dODecs) { obj.d_o_decs = message.dODecs.map(e => e); } else { - obj.d_o_decs = []; + obj.d_o_decs = message.dODecs; } return obj; }, @@ -2535,10 +2535,10 @@ export const EncodingTestForOmit = { message.oWasm = fromBase64(object.o_wasm); } if (object.opt !== undefined && object.opt !== null) { - message.opt = voteOptionFromJSON(object.opt); + message.opt = object.opt; } if (object.o_opt !== undefined && object.o_opt !== null) { - message.oOpt = voteOptionFromJSON(object.o_opt); + message.oOpt = object.o_opt; } if (object.period !== undefined && object.period !== null) { message.period = Duration.fromAmino(object.period); @@ -2568,8 +2568,8 @@ export const EncodingTestForOmit = { message.oRaws = object.o_raws?.map(e => toUtf8(JSON.stringify(e))) || []; message.wasms = object.wasms?.map(e => fromBase64(e)) || []; message.oWasms = object.o_wasms?.map(e => fromBase64(e)) || []; - message.opts = object.opts?.map(e => voteOptionFromJSON(e)) || []; - message.oOpts = object.o_opts?.map(e => voteOptionFromJSON(e)) || []; + message.opts = object.opts?.map(e => e) || []; + message.oOpts = object.o_opts?.map(e => e) || []; message.periods = object.periods?.map(e => Duration.fromAmino(e)) || []; message.oPeriods = object.o_periods?.map(e => Duration.fromAmino(e)) || []; message.protos = object.protos?.map(e => AccessConfig.fromAmino(e)) || []; @@ -2588,133 +2588,133 @@ export const EncodingTestForOmit = { }, toAmino(message: EncodingTestForOmit): EncodingTestForOmitAmino { const obj: any = {}; - obj.str = message.str; - obj.o_str = message.oStr; - obj.b = message.b; - obj.o_b = message.oB; - obj.num = message.num; - obj.o_num = message.oNum; - obj.big = message.big ? message.big.toString() : undefined; - obj.o_big = message.oBig ? message.oBig.toString() : undefined; - obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : undefined; + obj.str = message.str ?? ""; + obj.o_str = message.oStr === "" ? undefined : message.oStr; + obj.b = message.b ?? false; + obj.o_b = message.oB === false ? undefined : message.oB; + obj.num = message.num ?? 0; + obj.o_num = message.oNum === 0 ? undefined : message.oNum; + obj.big = message.big ? message.big.toString() : "0"; + obj.o_big = message.oBig !== BigInt(0) ? message.oBig.toString() : undefined; + obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); obj.o_proto = message.oProto ? AccessConfig.toAmino(message.oProto) : undefined; - obj.auth = message.auth ? Any.toAmino(message.auth) : undefined; + obj.auth = message.auth ? Any.toAmino(message.auth) : Any.toAmino(Any.fromPartial({})); obj.o_auth = message.oAuth ? Any.toAmino(message.oAuth) : undefined; - obj.salt = message.salt ? base64FromBytes(message.salt) : undefined; + obj.salt = message.salt ? base64FromBytes(message.salt) : ""; obj.o_salt = message.oSalt ? base64FromBytes(message.oSalt) : undefined; - obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : undefined; + obj.raw = message.raw ? JSON.parse(fromUtf8(message.raw)) : {}; obj.o_raw = message.oRaw ? JSON.parse(fromUtf8(message.oRaw)) : undefined; - obj.wasm = message.wasm ? toBase64(message.wasm) : undefined; + obj.wasm = message.wasm ? toBase64(message.wasm) : ""; obj.o_wasm = message.oWasm ? toBase64(message.oWasm) : undefined; - obj.opt = message.opt; - obj.o_opt = message.oOpt; - obj.period = message.period ? Duration.toAmino(message.period) : undefined; + obj.opt = message.opt ?? 0; + obj.o_opt = message.oOpt === 0 ? undefined : message.oOpt; + obj.period = message.period ? Duration.toAmino(message.period) : Duration.toAmino(Duration.fromPartial({})); obj.o_period = message.oPeriod ? Duration.toAmino(message.oPeriod) : undefined; - obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : undefined; + obj.date = message.date ? Timestamp.toAmino(toTimestamp(message.date)) : null; obj.o_date = message.oDate ? Timestamp.toAmino(toTimestamp(message.oDate)) : undefined; - obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; + obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : null; obj.o_pubkey = message.oPubkey ? decodePubkey(message.oPubkey) : undefined; if (message.nums) { obj.nums = message.nums.map(e => e); } else { - obj.nums = []; + obj.nums = message.nums; } if (message.oNums) { obj.o_nums = message.oNums.map(e => e); } else { - obj.o_nums = []; + obj.o_nums = message.oNums; } if (message.bigs) { obj.bigs = message.bigs.map(e => e.toString()); } else { - obj.bigs = []; + obj.bigs = message.bigs; } if (message.oBigs) { obj.o_bigs = message.oBigs.map(e => e.toString()); } else { - obj.o_bigs = []; + obj.o_bigs = message.oBigs; } if (message.salts) { obj.salts = message.salts.map(e => base64FromBytes(e)); } else { - obj.salts = []; + obj.salts = message.salts; } if (message.oSalts) { obj.o_salts = message.oSalts.map(e => base64FromBytes(e)); } else { - obj.o_salts = []; + obj.o_salts = message.oSalts; } if (message.raws) { obj.raws = message.raws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.raws = []; + obj.raws = message.raws; } if (message.oRaws) { obj.o_raws = message.oRaws.map(e => JSON.parse(fromUtf8(e))); } else { - obj.o_raws = []; + obj.o_raws = message.oRaws; } if (message.wasms) { obj.wasms = message.wasms.map(e => toBase64(e)); } else { - obj.wasms = []; + obj.wasms = message.wasms; } if (message.oWasms) { obj.o_wasms = message.oWasms.map(e => toBase64(e)); } else { - obj.o_wasms = []; + obj.o_wasms = message.oWasms; } if (message.opts) { obj.opts = message.opts.map(e => e); } else { - obj.opts = []; + obj.opts = message.opts; } if (message.oOpts) { obj.o_opts = message.oOpts.map(e => e); } else { - obj.o_opts = []; + obj.o_opts = message.oOpts; } if (message.periods) { obj.periods = message.periods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.periods = []; + obj.periods = message.periods; } if (message.oPeriods) { obj.o_periods = message.oPeriods.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.o_periods = []; + obj.o_periods = message.oPeriods; } if (message.protos) { obj.protos = message.protos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.protos = []; + obj.protos = message.protos; } if (message.oProtos) { obj.o_protos = message.oProtos.map(e => e ? AccessConfig.toAmino(e) : undefined); } else { - obj.o_protos = []; + obj.o_protos = message.oProtos; } if (message.auths) { obj.auths = message.auths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.auths = []; + obj.auths = message.auths; } if (message.oAuths) { obj.o_auths = message.oAuths.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.o_auths = []; + obj.o_auths = message.oAuths; } - obj.dec = message.dec; - obj.o_dec = message.oDec; + obj.dec = message.dec ?? ""; + obj.o_dec = message.oDec === "" ? undefined : message.oDec; if (message.decs) { obj.decs = message.decs.map(e => e); } else { - obj.decs = []; + obj.decs = message.decs; } if (message.oDecs) { obj.o_decs = message.oDecs.map(e => e); } else { - obj.o_decs = []; + obj.o_decs = message.oDecs; } return obj; }, diff --git a/__fixtures__/misc/output/misc/eval_request.ts b/__fixtures__/misc/output/misc/eval_request.ts index 0d87d5168f..41599d60fc 100644 --- a/__fixtures__/misc/output/misc/eval_request.ts +++ b/__fixtures__/misc/output/misc/eval_request.ts @@ -283,7 +283,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -383,7 +383,7 @@ export const EvalRequest_RefsEntry = { }, toAmino(message: EvalRequest_RefsEntry): EvalRequest_RefsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? IdRef.toAmino(message.value) : undefined; return obj; }, @@ -700,16 +700,16 @@ export const EvalRequest = { obj.refs[k] = IdRef.toAmino(v); }); } - obj.test_num = message.testNum; - obj.test_string = message.testString; - obj.test_bool = message.testBool; + obj.test_num = message.testNum === 0 ? undefined : message.testNum; + obj.test_string = message.testString === "" ? undefined : message.testString; + obj.test_bool = message.testBool === false ? undefined : message.testBool; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; - obj.id = message.id; - obj.name = message.name; + obj.id = message.id === null ? undefined : message.id; + obj.name = message.name === null ? undefined : message.name; if (message.testArray) { obj.test_array = message.testArray.map(e => e); } else { - obj.test_array = []; + obj.test_array = message.testArray; } return obj; }, @@ -798,7 +798,7 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -886,7 +886,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { diff --git a/__fixtures__/misc/proto/misc/all_fields.proto b/__fixtures__/misc/proto/misc/all_fields.proto index e0db0417a4..999359ffee 100644 --- a/__fixtures__/misc/proto/misc/all_fields.proto +++ b/__fixtures__/misc/proto/misc/all_fields.proto @@ -3,8 +3,8 @@ syntax = "proto3"; package misc; import "google/protobuf/any.proto"; -import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; +import "google/protobuf/timestamp.proto"; import "misc/eval_request.proto"; message EncodingTestForDontOmit { @@ -57,9 +57,7 @@ message EncodingTestForDontOmit { ]; // raw bytes - bytes raw = 15 [ - (gogoproto.casttype) = "RawContractMessage" - ]; + bytes raw = 15 [(gogoproto.casttype) = "RawContractMessage"]; bytes d_o_raw = 16 [ (gogoproto.casttype) = "RawContractMessage", (gogoproto.nullable) = false, @@ -67,9 +65,7 @@ message EncodingTestForDontOmit { ]; // wasm bytes - bytes wasm = 17 [ - (gogoproto.customname) = "WASMByteCode" - ]; + bytes wasm = 17 [(gogoproto.customname) = "WASMByteCode"]; bytes d_o_wasm = 18 [ (gogoproto.customname) = "WASMByteCode", (gogoproto.nullable) = false, @@ -127,9 +123,7 @@ message EncodingTestForDontOmit { ]; // array raw bytes - repeated bytes raws = 33 [ - (gogoproto.casttype) = "RawContractMessage" - ]; + repeated bytes raws = 33 [(gogoproto.casttype) = "RawContractMessage"]; repeated bytes d_o_raws = 34 [ (gogoproto.casttype) = "RawContractMessage", (gogoproto.nullable) = false, @@ -137,9 +131,7 @@ message EncodingTestForDontOmit { ]; // array wasm bytes - repeated bytes wasms = 35 [ - (gogoproto.customname) = "WASMByteCode" - ]; + repeated bytes wasms = 35 [(gogoproto.customname) = "WASMByteCode"]; repeated bytes d_o_wasms = 36 [ (gogoproto.customname) = "WASMByteCode", (gogoproto.nullable) = false, @@ -202,155 +194,165 @@ message EncodingTestForDontOmit { message EncodingTestForOmit { // scalar - string str = 1; + string str = 1 [(gogoproto.jsontag) = "str"]; string o_str = 2 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_str,omitempty" + (gogoproto.jsontag) = "o_str,omitempty" ]; - bool b = 3; + bool b = 3 [(gogoproto.jsontag) = "b"]; bool o_b = 4 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_b,omitempty" + (gogoproto.jsontag) = "o_b,omitempty" ]; - int32 num = 5; + int32 num = 5 [(gogoproto.jsontag) = "num"]; int32 o_num = 6 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_num,omitempty" + (gogoproto.jsontag) = "o_num,omitempty" ]; // bigint - int64 big = 7; + int64 big = 7 [(gogoproto.jsontag) = "big"]; int64 o_big = 8 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_big,omitempty" + (gogoproto.jsontag) = "o_big,omitempty" ]; // protoType - AccessConfig proto = 9; + AccessConfig proto = 9 [(gogoproto.jsontag) = "proto"]; AccessConfig o_proto = 10 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_proto,omitempty" + (gogoproto.jsontag) = "o_proto,omitempty" ]; // anyType - google.protobuf.Any auth = 11 [(cosmos_proto.accepts_interface) = "Authorization"]; + google.protobuf.Any auth = 11 [ + (cosmos_proto.accepts_interface) = "Authorization", + (gogoproto.jsontag) = "auth" + ]; google.protobuf.Any o_auth = 12 [ (cosmos_proto.accepts_interface) = "Authorization", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_auth,omitempty" + (gogoproto.jsontag) = "o_auth,omitempty" ]; // bytes - bytes salt = 13; + bytes salt = 13 [(gogoproto.jsontag) = "salt"]; bytes o_salt = 14 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_salt,omitempty" + (gogoproto.jsontag) = "o_salt,omitempty" ]; // raw bytes bytes raw = 15 [ - (gogoproto.casttype) = "RawContractMessage" + (gogoproto.casttype) = "RawContractMessage", + (gogoproto.jsontag) = "raw" ]; bytes o_raw = 16 [ (gogoproto.casttype) = "RawContractMessage", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_raw,omitempty" + (gogoproto.jsontag) = "o_raw,omitempty" ]; // wasm bytes bytes wasm = 17 [ - (gogoproto.customname) = "WASMByteCode" + (gogoproto.customname) = "WASMByteCode", + (gogoproto.jsontag) = "wasm" ]; bytes o_wasm = 18 [ (gogoproto.customname) = "WASMByteCode", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_wasm,omitempty" + (gogoproto.jsontag) = "o_wasm,omitempty" ]; // enum - VoteOption opt = 19; + VoteOption opt = 19 [(gogoproto.jsontag) = "opt"]; VoteOption o_opt = 20 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_opt,omitempty" + (gogoproto.jsontag) = "o_opt,omitempty" ]; // duration - google.protobuf.Duration period = 21; + google.protobuf.Duration period = 21 [(gogoproto.jsontag) = "period"]; google.protobuf.Duration o_period = 22 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_period,omitempty" + (gogoproto.jsontag) = "o_period,omitempty" ]; // timestamp - google.protobuf.Timestamp date = 23; + google.protobuf.Timestamp date = 23 [(gogoproto.jsontag) = "date"]; google.protobuf.Timestamp o_date = 24 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_date,omitempty" + (gogoproto.jsontag) = "o_date,omitempty" ]; // pubkey - google.protobuf.Any pubkey = 25 [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey"]; + google.protobuf.Any pubkey = 25 [ + (cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey", + (gogoproto.jsontag) = "pubkey" + ]; google.protobuf.Any o_pubkey = 26 [ (cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_pubkey,omitempty" + (gogoproto.jsontag) = "o_pubkey,omitempty" ]; // array scalar - repeated int32 nums = 27; + repeated int32 nums = 27 [(gogoproto.jsontag) = "nums"]; repeated int32 o_nums = 28 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_nums,omitempty" + (gogoproto.jsontag) = "o_nums,omitempty" ]; // array bigint - repeated int64 bigs = 29; + repeated int64 bigs = 29 [(gogoproto.jsontag) = "bigs"]; repeated int64 o_bigs = 30 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_bigs,omitempty" + (gogoproto.jsontag) = "o_bigs,omitempty" ]; // array bytes - repeated bytes salts = 31; + repeated bytes salts = 31 [(gogoproto.jsontag) = "salts"]; repeated bytes o_salts = 32 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_salts,omitempty" + (gogoproto.jsontag) = "o_salts,omitempty" ]; // array raw bytes repeated bytes raws = 33 [ - (gogoproto.casttype) = "RawContractMessage" + (gogoproto.casttype) = "RawContractMessage", + (gogoproto.jsontag) = "raws" ]; repeated bytes o_raws = 34 [ (gogoproto.casttype) = "RawContractMessage", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_raws,omitempty" + (gogoproto.jsontag) = "o_raws,omitempty" ]; // array wasm bytes repeated bytes wasms = 35 [ - (gogoproto.customname) = "WASMByteCode" + (gogoproto.customname) = "WASMByteCode", + (gogoproto.jsontag) = "wasms" ]; repeated bytes o_wasms = 36 [ (gogoproto.customname) = "WASMByteCode", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_wasms,omitempty" + (gogoproto.jsontag) = "o_wasms,omitempty" ]; // array enum - repeated VoteOption opts = 37; + repeated VoteOption opts = 37 [(gogoproto.jsontag) = "opts"]; repeated VoteOption o_opts = 38 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_opts,omitempty" + (gogoproto.jsontag) = "o_opts,omitempty" ]; // array duration - repeated google.protobuf.Duration periods = 39; + repeated google.protobuf.Duration periods = 39 [(gogoproto.jsontag) = "periods"]; repeated google.protobuf.Duration o_periods = 40 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_periods,omitempty" + (gogoproto.jsontag) = "o_periods,omitempty" ]; // array timestamp @@ -362,33 +364,42 @@ message EncodingTestForOmit { // ]; // array protoType - repeated AccessConfig protos = 43; + repeated AccessConfig protos = 43 [(gogoproto.jsontag) = "protos"]; repeated AccessConfig o_protos = 44 [ (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_protos,omitempty" + (gogoproto.jsontag) = "o_protos,omitempty" ]; // array anyType - repeated google.protobuf.Any auths = 45 [(cosmos_proto.accepts_interface) = "Authorization"]; + repeated google.protobuf.Any auths = 45 [ + (cosmos_proto.accepts_interface) = "Authorization", + (gogoproto.jsontag) = "auths" + ]; repeated google.protobuf.Any o_auths = 46 [ (cosmos_proto.accepts_interface) = "Authorization", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_auths,omitempty" + (gogoproto.jsontag) = "o_auths,omitempty" ]; // dec - string dec = 47 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"]; + string dec = 47 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.jsontag) = "dec" + ]; string o_dec = 48 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_dec,omitempty" + (gogoproto.jsontag) = "o_dec,omitempty" ]; // array dec - repeated string decs = 49 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"]; + repeated string decs = 49 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.jsontag) = "decs" + ]; repeated string o_decs = 50 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "o_decs,omitempty" + (gogoproto.jsontag) = "o_decs,omitempty" ]; -} \ No newline at end of file +} diff --git a/__fixtures__/output1/helpers.ts b/__fixtures__/output1/helpers.ts index 204e99112e..7f3287630d 100644 --- a/__fixtures__/output1/helpers.ts +++ b/__fixtures__/output1/helpers.ts @@ -55,7 +55,7 @@ export interface AminoHeight { readonly revision_height?: string; }; -export function omitDefault(input: T): T | undefined { +export function omitDefault(input: T): T | undefined { if (typeof input === "string") { return input === "" ? undefined : input; } @@ -64,8 +64,12 @@ export function omitDefault(input: T): T | und return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (Long.isLong(input)) { - return input.isZero() ? undefined : input; + return (input as Long).isZero() ? undefined : input; } throw new Error(`Got unsupported type ${typeof input}`); diff --git a/__fixtures__/output2/helpers.ts b/__fixtures__/output2/helpers.ts index 14d65093ea..5fba7b689e 100644 --- a/__fixtures__/output2/helpers.ts +++ b/__fixtures__/output2/helpers.ts @@ -57,7 +57,7 @@ export interface AminoHeight { readonly revision_height?: string; }; -export function omitDefault(input: T): T | undefined { +export function omitDefault(input: T): T | undefined { if (typeof input === "string") { return input === "" ? undefined : input; } @@ -66,8 +66,12 @@ export function omitDefault(input: T): T | und return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (Long.isLong(input)) { - return input.isZero() ? undefined : input; + return (input as Long).isZero() ? undefined : input; } throw new Error(`Got unsupported type ${typeof input}`); diff --git a/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta1/audit.amino.ts b/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta1/audit.amino.ts index b3c5e0e145..04457f59f0 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta1/audit.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta1/audit.amino.ts @@ -46,7 +46,7 @@ export const AminoConverter = { return { owner, auditor, - attributes: attributes.map(el0 => ({ + attributes: attributes.map?.(el0 => ({ key: el0.key, value: el0.value })) diff --git a/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta1/audit.ts b/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta1/audit.ts index 1c1512c55d..a78962bcef 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta1/audit.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta1/audit.ts @@ -215,12 +215,12 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -353,12 +353,12 @@ export const AuditedAttributes = { }, toAmino(message: AuditedAttributes): AuditedAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -462,7 +462,7 @@ export const AttributesResponse = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -588,12 +588,12 @@ export const AttributesFilters = { if (message.auditors) { obj.auditors = message.auditors.map(e => e); } else { - obj.auditors = []; + obj.auditors = message.auditors; } if (message.owners) { obj.owners = message.owners.map(e => e); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, @@ -726,12 +726,12 @@ export const MsgSignProviderAttributes = { }, toAmino(message: MsgSignProviderAttributes): MsgSignProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -938,12 +938,12 @@ export const MsgDeleteProviderAttributes = { }, toAmino(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/audit.amino.ts b/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/audit.amino.ts index de83b12abd..977a75b3b7 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/audit.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/audit.amino.ts @@ -46,7 +46,7 @@ export const AminoConverter = { return { owner, auditor, - attributes: attributes.map(el0 => ({ + attributes: attributes.map?.(el0 => ({ key: el0.key, value: el0.value })) diff --git a/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/audit.ts b/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/audit.ts index a1c4702b94..e37bc5f8cd 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/audit.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/audit.ts @@ -215,12 +215,12 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -353,12 +353,12 @@ export const AuditedAttributes = { }, toAmino(message: AuditedAttributes): AuditedAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -462,7 +462,7 @@ export const AttributesResponse = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -588,12 +588,12 @@ export const AttributesFilters = { if (message.auditors) { obj.auditors = message.auditors.map(e => e); } else { - obj.auditors = []; + obj.auditors = message.auditors; } if (message.owners) { obj.owners = message.owners.map(e => e); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, @@ -726,12 +726,12 @@ export const MsgSignProviderAttributes = { }, toAmino(message: MsgSignProviderAttributes): MsgSignProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -938,12 +938,12 @@ export const MsgDeleteProviderAttributes = { }, toAmino(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/genesis.ts b/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/genesis.ts index bac1aa7625..f377052406 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/query.ts b/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/query.ts index a463b96d2d..128754e4c6 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/audit/v1beta2/query.ts @@ -181,7 +181,7 @@ export const QueryProvidersResponse = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -293,8 +293,8 @@ export const QueryProviderRequest = { }, toAmino(message: QueryProviderRequest): QueryProviderRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; - obj.owner = message.owner; + obj.auditor = message.auditor === "" ? undefined : message.auditor; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest { @@ -502,7 +502,7 @@ export const QueryProviderAttributesRequest = { }, toAmino(message: QueryProviderAttributesRequest): QueryProviderAttributesRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -613,8 +613,8 @@ export const QueryProviderAuditorRequest = { }, toAmino(message: QueryProviderAuditorRequest): QueryProviderAuditorRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; - obj.owner = message.owner; + obj.auditor = message.auditor === "" ? undefined : message.auditor; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderAuditorRequestAminoMsg): QueryProviderAuditorRequest { @@ -726,7 +726,7 @@ export const QueryAuditorAttributesRequest = { }, toAmino(message: QueryAuditorAttributesRequest): QueryAuditorAttributesRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; + obj.auditor = message.auditor === "" ? undefined : message.auditor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta1/attribute.ts b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta1/attribute.ts index deab917c14..c1e8cf5e25 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta1/attribute.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta1/attribute.ts @@ -142,8 +142,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -268,12 +268,12 @@ export const SignedBy = { if (message.allOf) { obj.all_of = message.allOf.map(e => e); } else { - obj.all_of = []; + obj.all_of = message.allOf; } if (message.anyOf) { obj.any_of = message.anyOf.map(e => e); } else { - obj.any_of = []; + obj.any_of = message.anyOf; } return obj; }, @@ -392,11 +392,11 @@ export const PlacementRequirements = { }, toAmino(message: PlacementRequirements): PlacementRequirementsAmino { const obj: any = {}; - obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : undefined; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : SignedBy.toAmino(SignedBy.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta1/endpoint.ts b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta1/endpoint.ts index 05431e4ef8..76b6f51da2 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta1/endpoint.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta1/endpoint.ts @@ -110,13 +110,13 @@ export const Endpoint = { fromAmino(object: EndpointAmino): Endpoint { const message = createBaseEndpoint(); if (object.kind !== undefined && object.kind !== null) { - message.kind = endpoint_KindFromJSON(object.kind); + message.kind = object.kind; } return message; }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.kind = message.kind; + obj.kind = message.kind === 0 ? undefined : message.kind; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta1/resource.ts b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta1/resource.ts index 555673d4b9..c640281aef 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta1/resource.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta1/resource.ts @@ -167,7 +167,7 @@ export const CPU = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -286,11 +286,11 @@ export const Memory = { }, toAmino(message: Memory): MemoryAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -409,11 +409,11 @@ export const Storage = { }, toAmino(message: Storage): StorageAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -574,7 +574,7 @@ export const ResourceUnits = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/attribute.ts b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/attribute.ts index 30e3551719..ecb63a9eb4 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/attribute.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/attribute.ts @@ -142,8 +142,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -268,12 +268,12 @@ export const SignedBy = { if (message.allOf) { obj.all_of = message.allOf.map(e => e); } else { - obj.all_of = []; + obj.all_of = message.allOf; } if (message.anyOf) { obj.any_of = message.anyOf.map(e => e); } else { - obj.any_of = []; + obj.any_of = message.anyOf; } return obj; }, @@ -392,11 +392,11 @@ export const PlacementRequirements = { }, toAmino(message: PlacementRequirements): PlacementRequirementsAmino { const obj: any = {}; - obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : undefined; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : SignedBy.toAmino(SignedBy.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/endpoint.ts b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/endpoint.ts index a0babecdf5..0df46f4e5b 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/endpoint.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/endpoint.ts @@ -132,7 +132,7 @@ export const Endpoint = { fromAmino(object: EndpointAmino): Endpoint { const message = createBaseEndpoint(); if (object.kind !== undefined && object.kind !== null) { - message.kind = endpoint_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.sequence_number !== undefined && object.sequence_number !== null) { message.sequenceNumber = object.sequence_number; @@ -141,8 +141,8 @@ export const Endpoint = { }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.kind = message.kind; - obj.sequence_number = message.sequenceNumber; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.sequence_number = message.sequenceNumber ?? 0; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/resource.ts b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/resource.ts index 09bed02fe5..89353bc2fd 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/resource.ts @@ -144,7 +144,7 @@ export const CPU = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -263,11 +263,11 @@ export const Memory = { }, toAmino(message: Memory): MemoryAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -402,12 +402,12 @@ export const Storage = { }, toAmino(message: Storage): StorageAmino { const obj: any = {}; - obj.name = message.name; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.name = message.name ?? ""; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/resourceunits.ts b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/resourceunits.ts index e36ed32bd8..0eaa02e508 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/resourceunits.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/base/v1beta2/resourceunits.ts @@ -165,12 +165,12 @@ export const ResourceUnits = { if (message.storage) { obj.storage = message.storage.map(e => e ? Storage.toAmino(e) : undefined); } else { - obj.storage = []; + obj.storage = message.storage; } if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/cert.amino.ts b/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/cert.amino.ts index 97e535cbe2..fb6eae41d9 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/cert.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/cert.amino.ts @@ -60,7 +60,7 @@ export const AminoConverter = { id }: MsgRevokeCertificateAminoType["value"]): MsgRevokeCertificate => { return { - id: { + id: id == null ? id : { owner: id.owner, serial: id.serial } diff --git a/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/cert.ts b/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/cert.ts index f6a6ffdc7b..ef849758bf 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/cert.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/cert.ts @@ -217,8 +217,8 @@ export const CertificateID = { }, toAmino(message: CertificateID): CertificateIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.serial = message.serial; + obj.owner = message.owner ?? ""; + obj.serial = message.serial ?? ""; return obj; }, fromAminoMsg(object: CertificateIDAminoMsg): CertificateID { @@ -332,7 +332,7 @@ export const Certificate = { fromAmino(object: CertificateAmino): Certificate { const message = createBaseCertificate(); if (object.state !== undefined && object.state !== null) { - message.state = certificate_StateFromJSON(object.state); + message.state = object.state; } if (object.cert !== undefined && object.cert !== null) { message.cert = bytesFromBase64(object.cert); @@ -344,9 +344,9 @@ export const Certificate = { }, toAmino(message: Certificate): CertificateAmino { const obj: any = {}; - obj.state = message.state; - obj.cert = message.cert ? base64FromBytes(message.cert) : undefined; - obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : undefined; + obj.state = message.state ?? 0; + obj.cert = message.cert ? base64FromBytes(message.cert) : ""; + obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : ""; return obj; }, fromAminoMsg(object: CertificateAminoMsg): Certificate { @@ -472,9 +472,9 @@ export const CertificateFilter = { }, toAmino(message: CertificateFilter): CertificateFilterAmino { const obj: any = {}; - obj.owner = message.owner; - obj.serial = message.serial; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.serial = message.serial ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: CertificateFilterAminoMsg): CertificateFilter { @@ -600,9 +600,9 @@ export const MsgCreateCertificate = { }, toAmino(message: MsgCreateCertificate): MsgCreateCertificateAmino { const obj: any = {}; - obj.owner = message.owner; - obj.cert = message.cert ? base64FromBytes(message.cert) : undefined; - obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : undefined; + obj.owner = message.owner ?? ""; + obj.cert = message.cert ? base64FromBytes(message.cert) : ""; + obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : ""; return obj; }, fromAminoMsg(object: MsgCreateCertificateAminoMsg): MsgCreateCertificate { @@ -772,7 +772,7 @@ export const MsgRevokeCertificate = { }, toAmino(message: MsgRevokeCertificate): MsgRevokeCertificateAmino { const obj: any = {}; - obj.id = message.id ? CertificateID.toAmino(message.id) : undefined; + obj.id = message.id ? CertificateID.toAmino(message.id) : CertificateID.toAmino(CertificateID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgRevokeCertificateAminoMsg): MsgRevokeCertificate { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/genesis.ts b/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/genesis.ts index 32eb7b74a9..5d914a929b 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/genesis.ts @@ -115,8 +115,8 @@ export const GenesisCertificate = { }, toAmino(message: GenesisCertificate): GenesisCertificateAmino { const obj: any = {}; - obj.owner = message.owner; - obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined; + obj.owner = message.owner ?? ""; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : Certificate.toAmino(Certificate.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisCertificateAminoMsg): GenesisCertificate { @@ -219,7 +219,7 @@ export const GenesisState = { if (message.certificates) { obj.certificates = message.certificates.map(e => e ? GenesisCertificate.toAmino(e) : undefined); } else { - obj.certificates = []; + obj.certificates = message.certificates; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/query.ts b/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/query.ts index 675f8ba362..17d1f5c3b1 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/cert/v1beta2/query.ts @@ -132,8 +132,8 @@ export const CertificateResponse = { }, toAmino(message: CertificateResponse): CertificateResponseAmino { const obj: any = {}; - obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined; - obj.serial = message.serial; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : Certificate.toAmino(Certificate.fromPartial({})); + obj.serial = message.serial ?? ""; return obj; }, fromAminoMsg(object: CertificateResponseAminoMsg): CertificateResponse { @@ -369,7 +369,7 @@ export const QueryCertificatesResponse = { if (message.certificates) { obj.certificates = message.certificates.map(e => e ? CertificateResponse.toAmino(e) : undefined); } else { - obj.certificates = []; + obj.certificates = message.certificates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/authz.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/authz.ts index d33d12c97e..7c7934f29f 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/authz.ts @@ -95,7 +95,7 @@ export const DepositDeploymentAuthorization = { }, toAmino(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAmino { const obj: any = {}; - obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/deployment.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/deployment.ts index 1cb3212f6a..a27fac0ffe 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/deployment.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/deployment.ts @@ -314,14 +314,14 @@ export const MsgCreateDeployment = { }, toAmino(message: MsgCreateDeployment): MsgCreateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment { @@ -509,8 +509,8 @@ export const MsgDepositDeployment = { }, 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.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.amount = message.amount ? Coin.toAmino(message.amount) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment { @@ -718,13 +718,13 @@ export const MsgUpdateDeployment = { }, toAmino(message: MsgUpdateDeployment): MsgUpdateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; + obj.version = message.version ? base64FromBytes(message.version) : ""; return obj; }, fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment { @@ -894,7 +894,7 @@ export const MsgCloseDeployment = { }, toAmino(message: MsgCloseDeployment): MsgCloseDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment { @@ -1080,8 +1080,8 @@ export const DeploymentID = { }, toAmino(message: DeploymentID): DeploymentIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; return obj; }, fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID { @@ -1215,7 +1215,7 @@ export const Deployment = { message.deploymentId = DeploymentID.fromAmino(object.deployment_id); } if (object.state !== undefined && object.state !== null) { - message.state = deployment_StateFromJSON(object.state); + message.state = object.state; } if (object.version !== undefined && object.version !== null) { message.version = bytesFromBase64(object.version); @@ -1227,10 +1227,10 @@ export const Deployment = { }, 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 ? base64FromBytes(message.version) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.state = message.state ?? 0; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: DeploymentAminoMsg): Deployment { @@ -1358,9 +1358,9 @@ export const DeploymentFilters = { }, toAmino(message: DeploymentFilters): DeploymentFiltersAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/genesis.ts index c56045ac36..e4342465b7 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/genesis.ts @@ -125,11 +125,11 @@ export const GenesisDeployment = { }, toAmino(message: GenesisDeployment): GenesisDeploymentAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } return obj; }, @@ -251,9 +251,9 @@ export const GenesisState = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/group.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/group.ts index 4718762517..77bd5bab7d 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/group.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/group.ts @@ -256,7 +256,7 @@ export const MsgCloseGroup = { }, toAmino(message: MsgCloseGroup): MsgCloseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup { @@ -426,7 +426,7 @@ export const MsgPauseGroup = { }, toAmino(message: MsgPauseGroup): MsgPauseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup { @@ -596,7 +596,7 @@ export const MsgStartGroup = { }, toAmino(message: MsgStartGroup): MsgStartGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup { @@ -798,9 +798,9 @@ export const GroupID = { }, toAmino(message: GroupID): GroupIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.gseq = message.gseq; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; return obj; }, fromAminoMsg(object: GroupIDAminoMsg): GroupID { @@ -934,12 +934,12 @@ export const GroupSpec = { }, toAmino(message: GroupSpec): GroupSpecAmino { const obj: any = {}; - obj.name = message.name; - obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : undefined; + obj.name = message.name ?? ""; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : PlacementRequirements.toAmino(PlacementRequirements.fromPartial({})); if (message.resources) { obj.resources = message.resources.map(e => e ? Resource.toAmino(e) : undefined); } else { - obj.resources = []; + obj.resources = message.resources; } return obj; }, @@ -1076,7 +1076,7 @@ export const Group = { message.groupId = GroupID.fromAmino(object.group_id); } if (object.state !== undefined && object.state !== null) { - message.state = group_StateFromJSON(object.state); + message.state = object.state; } if (object.group_spec !== undefined && object.group_spec !== null) { message.groupSpec = GroupSpec.fromAmino(object.group_spec); @@ -1088,10 +1088,10 @@ export const Group = { }, 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; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId) : GroupID.toAmino(GroupID.fromPartial({})); + obj.state = message.state ?? 0; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: GroupAminoMsg): Group { @@ -1221,9 +1221,9 @@ export const Resource = { }, 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; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources) : ResourceUnits.toAmino(ResourceUnits.fromPartial({})); + obj.count = message.count ?? 0; + obj.price = message.price ? Coin.toAmino(message.price) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ResourceAminoMsg): Resource { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/params.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/params.ts index 6d736b7daf..ce3bc32ff9 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/params.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/params.ts @@ -85,7 +85,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/query.ts index 71c1e5ca19..495784b205 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta1/query.ts @@ -297,7 +297,7 @@ export const QueryDeploymentsResponse = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -531,11 +531,11 @@ export const QueryDeploymentResponse = { }, toAmino(message: QueryDeploymentResponse): QueryDeploymentResponseAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/authz.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/authz.ts index 480cd225a2..2fa97819d2 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/authz.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/authz.ts @@ -95,7 +95,7 @@ export const DepositDeploymentAuthorization = { }, toAmino(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAmino { const obj: any = {}; - obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/deployment.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/deployment.ts index 136570db2a..2a9ba1f985 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/deployment.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/deployment.ts @@ -177,8 +177,8 @@ export const DeploymentID = { }, toAmino(message: DeploymentID): DeploymentIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; return obj; }, fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID { @@ -312,7 +312,7 @@ export const Deployment = { message.deploymentId = DeploymentID.fromAmino(object.deployment_id); } if (object.state !== undefined && object.state !== null) { - message.state = deployment_StateFromJSON(object.state); + message.state = object.state; } if (object.version !== undefined && object.version !== null) { message.version = bytesFromBase64(object.version); @@ -324,10 +324,10 @@ export const Deployment = { }, 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 ? base64FromBytes(message.version) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.state = message.state ?? 0; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: DeploymentAminoMsg): Deployment { @@ -455,9 +455,9 @@ export const DeploymentFilters = { }, toAmino(message: DeploymentFilters): DeploymentFiltersAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/deploymentmsg.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/deploymentmsg.ts index ebde71e394..c166c25279 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/deploymentmsg.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/deploymentmsg.ts @@ -243,15 +243,15 @@ export const MsgCreateDeployment = { }, toAmino(message: MsgCreateDeployment): MsgCreateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined; - obj.depositor = message.depositor; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); + obj.depositor = message.depositor ?? ""; return obj; }, fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment { @@ -455,9 +455,9 @@ export const MsgDepositDeployment = { }, 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; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.amount = message.amount ? Coin.toAmino(message.amount) : Coin.toAmino(Coin.fromPartial({})); + obj.depositor = message.depositor ?? ""; return obj; }, fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment { @@ -643,8 +643,8 @@ export const MsgUpdateDeployment = { }, toAmino(message: MsgUpdateDeployment): MsgUpdateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; - obj.version = message.version ? base64FromBytes(message.version) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.version = message.version ? base64FromBytes(message.version) : ""; return obj; }, fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment { @@ -814,7 +814,7 @@ export const MsgCloseDeployment = { }, toAmino(message: MsgCloseDeployment): MsgCloseDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/genesis.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/genesis.ts index 21be410cc5..5e8fb1bcff 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/genesis.ts @@ -125,11 +125,11 @@ export const GenesisDeployment = { }, toAmino(message: GenesisDeployment): GenesisDeploymentAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } return obj; }, @@ -251,9 +251,9 @@ export const GenesisState = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/group.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/group.ts index 206fbc7b39..062e1029ca 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/group.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/group.ts @@ -187,7 +187,7 @@ export const Group = { message.groupId = GroupID.fromAmino(object.group_id); } if (object.state !== undefined && object.state !== null) { - message.state = group_StateFromJSON(object.state); + message.state = object.state; } if (object.group_spec !== undefined && object.group_spec !== null) { message.groupSpec = GroupSpec.fromAmino(object.group_spec); @@ -199,10 +199,10 @@ export const Group = { }, 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; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId) : GroupID.toAmino(GroupID.fromPartial({})); + obj.state = message.state ?? 0; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: GroupAminoMsg): Group { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/groupid.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/groupid.ts index 2526a0f69d..56c8fe5f40 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/groupid.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/groupid.ts @@ -120,9 +120,9 @@ export const GroupID = { }, toAmino(message: GroupID): GroupIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.gseq = message.gseq; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; return obj; }, fromAminoMsg(object: GroupIDAminoMsg): GroupID { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/groupmsg.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/groupmsg.ts index 7678473a12..cdc733348e 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/groupmsg.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/groupmsg.ts @@ -133,7 +133,7 @@ export const MsgCloseGroup = { }, toAmino(message: MsgCloseGroup): MsgCloseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup { @@ -303,7 +303,7 @@ export const MsgPauseGroup = { }, toAmino(message: MsgPauseGroup): MsgPauseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup { @@ -473,7 +473,7 @@ export const MsgStartGroup = { }, toAmino(message: MsgStartGroup): MsgStartGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/groupspec.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/groupspec.ts index a01a9cf5c4..2fa61a4718 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/groupspec.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/groupspec.ts @@ -128,12 +128,12 @@ export const GroupSpec = { }, toAmino(message: GroupSpec): GroupSpecAmino { const obj: any = {}; - obj.name = message.name; - obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : undefined; + obj.name = message.name ?? ""; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : PlacementRequirements.toAmino(PlacementRequirements.fromPartial({})); if (message.resources) { obj.resources = message.resources.map(e => e ? Resource.toAmino(e) : undefined); } else { - obj.resources = []; + obj.resources = message.resources; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/params.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/params.ts index 272b065f4a..e8dc65f255 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/params.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/params.ts @@ -85,7 +85,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/query.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/query.ts index fa4b778be8..685288ea85 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/query.ts @@ -297,7 +297,7 @@ export const QueryDeploymentsResponse = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -531,11 +531,11 @@ export const QueryDeploymentResponse = { }, toAmino(message: QueryDeploymentResponse): QueryDeploymentResponseAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/resource.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/resource.ts index e56479dc78..a274baf4d2 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/resource.ts @@ -124,9 +124,9 @@ export const Resource = { }, 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; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources) : ResourceUnits.toAmino(ResourceUnits.fromPartial({})); + obj.count = message.count ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); return obj; }, fromAminoMsg(object: ResourceAminoMsg): Resource { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/service.amino.ts b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/service.amino.ts index 29301829da..12043be59d 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/service.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/deployment/v1beta2/service.amino.ts @@ -157,7 +157,7 @@ export const AminoConverter = { return { id: { owner: id.owner, - dseq: id.dseq.toString() + dseq: id.dseq?.toString?.() }, groups: groups.map(el0 => ({ name: el0.name, @@ -229,66 +229,66 @@ export const AminoConverter = { depositor }: MsgCreateDeploymentAminoType["value"]): MsgCreateDeployment => { return { - id: { + id: id == null ? id : { owner: id.owner, - dseq: BigInt(id.dseq) + dseq: id.dseq == null ? id.dseq : BigInt(id.dseq) }, - groups: groups.map(el0 => ({ + groups: groups.map?.(el0 => ({ name: el0.name, - requirements: { - signedBy: { + requirements: el0.requirements == null ? el0.requirements : { + signedBy: el0.requirements.signed_by == null ? el0.requirements.signed_by : { allOf: el0.requirements.signed_by.all_of, anyOf: el0.requirements.signed_by.any_of }, - attributes: el0.requirements.attributes.map(el2 => ({ + attributes: el0.requirements.attributes.map?.(el2 => ({ key: el2.key, value: el2.value })) }, - resources: el0.resources.map(el1 => ({ - resources: { - cpu: { - units: { + resources: el0.resources.map?.(el1 => ({ + resources: el1.resources == null ? el1.resources : { + cpu: el1.resources.cpu == null ? el1.resources.cpu : { + units: el1.resources.cpu.units == null ? el1.resources.cpu.units : { val: el1.resources.cpu.units.val }, - attributes: el1.resources.cpu.attributes.map(el4 => ({ + attributes: el1.resources.cpu.attributes.map?.(el4 => ({ key: el4.key, value: el4.value })) }, - memory: { - quantity: { + memory: el1.resources.memory == null ? el1.resources.memory : { + quantity: el1.resources.memory.quantity == null ? el1.resources.memory.quantity : { val: el1.resources.memory.quantity.val }, - attributes: el1.resources.memory.attributes.map(el4 => ({ + attributes: el1.resources.memory.attributes.map?.(el4 => ({ key: el4.key, value: el4.value })) }, - storage: el1.resources.storage.map(el3 => ({ + storage: el1.resources.storage.map?.(el3 => ({ name: el3.name, - quantity: { + quantity: el3.quantity == null ? el3.quantity : { val: el3.quantity.val }, - attributes: el3.attributes.map(el4 => ({ + attributes: el3.attributes.map?.(el4 => ({ key: el4.key, value: el4.value })) })), - endpoints: el1.resources.endpoints.map(el3 => ({ - kind: endpoint_KindFromJSON(el3.kind), + endpoints: el1.resources.endpoints.map?.(el3 => ({ + kind: el3.kind == null ? el3.kind : endpoint_KindFromJSON(el3.kind), sequenceNumber: el3.sequence_number })) }, count: el1.count, - price: { + price: el1.price == null ? el1.price : { denom: el1.price.denom, amount: el1.price.amount } })) })), version, - deposit: { + deposit: deposit == null ? deposit : { denom: deposit.denom, amount: deposit.amount }, @@ -306,7 +306,7 @@ export const AminoConverter = { return { id: { owner: id.owner, - dseq: id.dseq.toString() + dseq: id.dseq?.toString?.() }, amount: { denom: amount.denom, @@ -321,11 +321,11 @@ export const AminoConverter = { depositor }: MsgDepositDeploymentAminoType["value"]): MsgDepositDeployment => { return { - id: { + id: id == null ? id : { owner: id.owner, - dseq: BigInt(id.dseq) + dseq: id.dseq == null ? id.dseq : BigInt(id.dseq) }, - amount: { + amount: amount == null ? amount : { denom: amount.denom, amount: amount.amount }, @@ -342,7 +342,7 @@ export const AminoConverter = { return { id: { owner: id.owner, - dseq: id.dseq.toString() + dseq: id.dseq?.toString?.() }, version }; @@ -352,9 +352,9 @@ export const AminoConverter = { version }: MsgUpdateDeploymentAminoType["value"]): MsgUpdateDeployment => { return { - id: { + id: id == null ? id : { owner: id.owner, - dseq: BigInt(id.dseq) + dseq: id.dseq == null ? id.dseq : BigInt(id.dseq) }, version }; @@ -368,7 +368,7 @@ export const AminoConverter = { return { id: { owner: id.owner, - dseq: id.dseq.toString() + dseq: id.dseq?.toString?.() } }; }, @@ -376,9 +376,9 @@ export const AminoConverter = { id }: MsgCloseDeploymentAminoType["value"]): MsgCloseDeployment => { return { - id: { + id: id == null ? id : { owner: id.owner, - dseq: BigInt(id.dseq) + dseq: id.dseq == null ? id.dseq : BigInt(id.dseq) } }; } @@ -391,7 +391,7 @@ export const AminoConverter = { return { id: { owner: id.owner, - dseq: id.dseq.toString(), + dseq: id.dseq?.toString?.(), gseq: id.gseq } }; @@ -400,9 +400,9 @@ export const AminoConverter = { id }: MsgCloseGroupAminoType["value"]): MsgCloseGroup => { return { - id: { + id: id == null ? id : { owner: id.owner, - dseq: BigInt(id.dseq), + dseq: id.dseq == null ? id.dseq : BigInt(id.dseq), gseq: id.gseq } }; @@ -416,7 +416,7 @@ export const AminoConverter = { return { id: { owner: id.owner, - dseq: id.dseq.toString(), + dseq: id.dseq?.toString?.(), gseq: id.gseq } }; @@ -425,9 +425,9 @@ export const AminoConverter = { id }: MsgPauseGroupAminoType["value"]): MsgPauseGroup => { return { - id: { + id: id == null ? id : { owner: id.owner, - dseq: BigInt(id.dseq), + dseq: id.dseq == null ? id.dseq : BigInt(id.dseq), gseq: id.gseq } }; @@ -441,7 +441,7 @@ export const AminoConverter = { return { id: { owner: id.owner, - dseq: id.dseq.toString(), + dseq: id.dseq?.toString?.(), gseq: id.gseq } }; @@ -450,9 +450,9 @@ export const AminoConverter = { id }: MsgStartGroupAminoType["value"]): MsgStartGroup => { return { - id: { + id: id == null ? id : { owner: id.owner, - dseq: BigInt(id.dseq), + dseq: id.dseq == null ? id.dseq : BigInt(id.dseq), gseq: id.gseq } }; diff --git a/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta1/genesis.ts index 27ded574e3..12210d6d28 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta1/genesis.ts @@ -116,12 +116,12 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } if (message.payments) { obj.payments = message.payments.map(e => e ? Payment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta1/query.ts index ff58e714ed..e6672a7903 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta1/query.ts @@ -208,10 +208,10 @@ export const QueryAccountsRequest = { }, toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; - obj.owner = message.owner; - obj.state = message.state; + obj.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -333,7 +333,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -511,11 +511,11 @@ export const QueryPaymentsRequest = { }, 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.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -637,7 +637,7 @@ export const QueryPaymentsResponse = { if (message.payments) { obj.payments = message.payments.map(e => e ? Payment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta1/types.ts b/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta1/types.ts index f4c38d72eb..9a8c14a44f 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta1/types.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta1/types.ts @@ -249,8 +249,8 @@ export const AccountID = { }, toAmino(message: AccountID): AccountIDAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; + obj.scope = message.scope ?? ""; + obj.xid = message.xid ?? ""; return obj; }, fromAminoMsg(object: AccountIDAminoMsg): AccountID { @@ -417,7 +417,7 @@ export const Account = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = account_StateFromJSON(object.state); + message.state = object.state; } if (object.balance !== undefined && object.balance !== null) { message.balance = Coin.fromAmino(object.balance); @@ -432,12 +432,12 @@ export const Account = { }, 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; + obj.id = message.id ? AccountID.toAmino(message.id) : AccountID.toAmino(AccountID.fromPartial({})); + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.balance = message.balance ? Coin.toAmino(message.balance) : Coin.toAmino(Coin.fromPartial({})); + obj.transferred = message.transferred ? Coin.toAmino(message.transferred) : Coin.toAmino(Coin.fromPartial({})); + obj.settled_at = message.settledAt ? message.settledAt.toString() : "0"; return obj; }, fromAminoMsg(object: AccountAminoMsg): Account { @@ -620,7 +620,7 @@ export const Payment = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = payment_StateFromJSON(object.state); + message.state = object.state; } if (object.rate !== undefined && object.rate !== null) { message.rate = Coin.fromAmino(object.rate); @@ -635,13 +635,13 @@ export const Payment = { }, 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; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId) : AccountID.toAmino(AccountID.fromPartial({})); + obj.payment_id = message.paymentId ?? ""; + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.rate = message.rate ? Coin.toAmino(message.rate) : Coin.toAmino(Coin.fromPartial({})); + obj.balance = message.balance ? Coin.toAmino(message.balance) : Coin.toAmino(Coin.fromPartial({})); + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: PaymentAminoMsg): Payment { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta2/genesis.ts b/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta2/genesis.ts index 868fa25cc5..04bb97ec14 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta2/genesis.ts @@ -116,12 +116,12 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } if (message.payments) { obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta2/query.ts b/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta2/query.ts index 8df954b7c3..f70db8abc6 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta2/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta2/query.ts @@ -208,10 +208,10 @@ export const QueryAccountsRequest = { }, toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; - obj.owner = message.owner; - obj.state = message.state; + obj.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -333,7 +333,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -511,11 +511,11 @@ export const QueryPaymentsRequest = { }, 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.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -637,7 +637,7 @@ export const QueryPaymentsResponse = { if (message.payments) { obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta2/types.ts b/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta2/types.ts index 02693e067d..060c1be323 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta2/types.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/escrow/v1beta2/types.ts @@ -262,8 +262,8 @@ export const AccountID = { }, toAmino(message: AccountID): AccountIDAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; + obj.scope = message.scope ?? ""; + obj.xid = message.xid ?? ""; return obj; }, fromAminoMsg(object: AccountIDAminoMsg): AccountID { @@ -458,7 +458,7 @@ export const Account = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = account_StateFromJSON(object.state); + message.state = object.state; } if (object.balance !== undefined && object.balance !== null) { message.balance = DecCoin.fromAmino(object.balance); @@ -479,14 +479,14 @@ export const Account = { }, 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; + obj.id = message.id ? AccountID.toAmino(message.id) : AccountID.toAmino(AccountID.fromPartial({})); + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.balance = message.balance ? DecCoin.toAmino(message.balance) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.transferred = message.transferred ? DecCoin.toAmino(message.transferred) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.settled_at = message.settledAt ? message.settledAt.toString() : "0"; + obj.depositor = message.depositor ?? ""; + obj.funds = message.funds ? DecCoin.toAmino(message.funds) : DecCoin.toAmino(DecCoin.fromPartial({})); return obj; }, fromAminoMsg(object: AccountAminoMsg): Account { @@ -669,7 +669,7 @@ export const FractionalPayment = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = fractionalPayment_StateFromJSON(object.state); + message.state = object.state; } if (object.rate !== undefined && object.rate !== null) { message.rate = DecCoin.fromAmino(object.rate); @@ -684,13 +684,13 @@ export const FractionalPayment = { }, 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; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId) : AccountID.toAmino(AccountID.fromPartial({})); + obj.payment_id = message.paymentId ?? ""; + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.rate = message.rate ? DecCoin.toAmino(message.rate) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.balance = message.balance ? DecCoin.toAmino(message.balance) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: FractionalPaymentAminoMsg): FractionalPayment { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/inflation/v1beta2/genesis.ts b/__fixtures__/v-next/outputinstantrpc/akash/inflation/v1beta2/genesis.ts index 29b268e4f4..b91bdb499a 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/inflation/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/inflation/v1beta2/genesis.ts @@ -85,7 +85,7 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/inflation/v1beta2/params.ts b/__fixtures__/v-next/outputinstantrpc/akash/inflation/v1beta2/params.ts index 7ef62c405d..55c8752afe 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/inflation/v1beta2/params.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/inflation/v1beta2/params.ts @@ -128,9 +128,9 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.inflation_decay_factor = message.inflationDecayFactor; - obj.initial_inflation = message.initialInflation; - obj.variance = message.variance; + obj.inflation_decay_factor = message.inflationDecayFactor ?? ""; + obj.initial_inflation = message.initialInflation ?? ""; + obj.variance = message.variance ?? ""; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/bid.ts b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/bid.ts index db95d0f48a..167485e3e3 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/bid.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/bid.ts @@ -293,10 +293,10 @@ export const MsgCreateBid = { }, 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; + obj.order = message.order ? OrderID.toAmino(message.order) : OrderID.toAmino(OrderID.fromPartial({})); + obj.provider = message.provider ?? ""; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateBidAminoMsg): MsgCreateBid { @@ -466,7 +466,7 @@ export const MsgCloseBid = { }, toAmino(message: MsgCloseBid): MsgCloseBidAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseBidAminoMsg): MsgCloseBid { @@ -700,11 +700,11 @@ export const BidID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; return obj; }, fromAminoMsg(object: BidIDAminoMsg): BidID { @@ -840,7 +840,7 @@ export const Bid = { message.bidId = BidID.fromAmino(object.bid_id); } if (object.state !== undefined && object.state !== null) { - message.state = bid_StateFromJSON(object.state); + message.state = object.state; } if (object.price !== undefined && object.price !== null) { message.price = DecCoin.fromAmino(object.price); @@ -852,10 +852,10 @@ export const Bid = { }, 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; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); + obj.state = message.state ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: BidAminoMsg): Bid { @@ -1031,12 +1031,12 @@ export const BidFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: BidFiltersAminoMsg): BidFilters { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/genesis.ts b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/genesis.ts index 5279f1243f..8e9edf33e0 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/genesis.ts @@ -138,14 +138,14 @@ export const GenesisState = { if (message.orders) { obj.orders = message.orders.map(e => e ? Order.toAmino(e) : undefined); } else { - obj.orders = []; + obj.orders = message.orders; } if (message.leases) { obj.leases = message.leases.map(e => e ? Lease.toAmino(e) : undefined); } else { - obj.leases = []; + obj.leases = message.leases; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/lease.ts b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/lease.ts index 883350ff6a..88f34d516b 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/lease.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/lease.ts @@ -308,11 +308,11 @@ export const LeaseID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; return obj; }, fromAminoMsg(object: LeaseIDAminoMsg): LeaseID { @@ -463,7 +463,7 @@ export const Lease = { message.leaseId = LeaseID.fromAmino(object.lease_id); } if (object.state !== undefined && object.state !== null) { - message.state = lease_StateFromJSON(object.state); + message.state = object.state; } if (object.price !== undefined && object.price !== null) { message.price = DecCoin.fromAmino(object.price); @@ -478,11 +478,11 @@ export const Lease = { }, 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; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : LeaseID.toAmino(LeaseID.fromPartial({})); + obj.state = message.state ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; + obj.closed_on = message.closedOn !== BigInt(0) ? message.closedOn.toString() : undefined; return obj; }, fromAminoMsg(object: LeaseAminoMsg): Lease { @@ -658,12 +658,12 @@ export const LeaseFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: LeaseFiltersAminoMsg): LeaseFilters { @@ -759,7 +759,7 @@ export const MsgCreateLease = { }, toAmino(message: MsgCreateLease): MsgCreateLeaseAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateLeaseAminoMsg): MsgCreateLease { @@ -929,7 +929,7 @@ export const MsgWithdrawLease = { }, toAmino(message: MsgWithdrawLease): MsgWithdrawLeaseAmino { const obj: any = {}; - obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId) : LeaseID.toAmino(LeaseID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgWithdrawLeaseAminoMsg): MsgWithdrawLease { @@ -1099,7 +1099,7 @@ export const MsgCloseLease = { }, toAmino(message: MsgCloseLease): MsgCloseLeaseAmino { const obj: any = {}; - obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : undefined; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : LeaseID.toAmino(LeaseID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseLeaseAminoMsg): MsgCloseLease { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/order.ts b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/order.ts index 180643e7c2..7ed65f9cde 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/order.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/order.ts @@ -225,10 +225,10 @@ export const OrderID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; return obj; }, fromAminoMsg(object: OrderIDAminoMsg): OrderID { @@ -364,7 +364,7 @@ export const Order = { message.orderId = OrderID.fromAmino(object.order_id); } if (object.state !== undefined && object.state !== null) { - message.state = order_StateFromJSON(object.state); + message.state = object.state; } if (object.spec !== undefined && object.spec !== null) { message.spec = GroupSpec.fromAmino(object.spec); @@ -376,10 +376,10 @@ export const Order = { }, 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; + obj.order_id = message.orderId ? OrderID.toAmino(message.orderId) : OrderID.toAmino(OrderID.fromPartial({})); + obj.state = message.state ?? 0; + obj.spec = message.spec ? GroupSpec.toAmino(message.spec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: OrderAminoMsg): Order { @@ -539,11 +539,11 @@ export const OrderFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: OrderFiltersAminoMsg): OrderFilters { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/params.ts b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/params.ts index 99d881bfee..283be606bd 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/params.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/params.ts @@ -103,8 +103,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit) : undefined; - obj.order_max_bids = message.orderMaxBids; + obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit) : Coin.toAmino(Coin.fromPartial({})); + obj.order_max_bids = message.orderMaxBids ?? 0; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/query.ts b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/query.ts index 7d81ae5eb0..22ec60f703 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/query.ts @@ -377,7 +377,7 @@ export const QueryOrdersResponse = { if (message.orders) { obj.orders = message.orders.map(e => e ? Order.toAmino(e) : undefined); } else { - obj.orders = []; + obj.orders = message.orders; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -807,7 +807,7 @@ export const QueryBidsResponse = { if (message.bids) { obj.bids = message.bids.map(e => e ? QueryBidResponse.toAmino(e) : undefined); } else { - obj.bids = []; + obj.bids = message.bids; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1256,7 +1256,7 @@ export const QueryLeasesResponse = { if (message.leases) { obj.leases = message.leases.map(e => e ? QueryLeaseResponse.toAmino(e) : undefined); } else { - obj.leases = []; + obj.leases = message.leases; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/service.amino.ts b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/service.amino.ts index 0e47f2ffe8..7e1c6812ae 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/service.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/market/v1beta2/service.amino.ts @@ -84,7 +84,7 @@ export const AminoConverter = { return { order: { owner: order.owner, - dseq: order.dseq.toString(), + dseq: order.dseq?.toString?.(), gseq: order.gseq, oseq: order.oseq }, @@ -106,18 +106,18 @@ export const AminoConverter = { deposit }: MsgCreateBidAminoType["value"]): MsgCreateBid => { return { - order: { + order: order == null ? order : { owner: order.owner, - dseq: BigInt(order.dseq), + dseq: order.dseq == null ? order.dseq : BigInt(order.dseq), gseq: order.gseq, oseq: order.oseq }, provider, - price: { + price: price == null ? price : { denom: price.denom, amount: price.amount }, - deposit: { + deposit: deposit == null ? deposit : { denom: deposit.denom, amount: deposit.amount } @@ -132,7 +132,7 @@ export const AminoConverter = { return { bid_id: { owner: bidId.owner, - dseq: bidId.dseq.toString(), + dseq: bidId.dseq?.toString?.(), gseq: bidId.gseq, oseq: bidId.oseq, provider: bidId.provider @@ -143,9 +143,9 @@ export const AminoConverter = { bid_id }: MsgCloseBidAminoType["value"]): MsgCloseBid => { return { - bidId: { + bidId: bid_id == null ? bid_id : { owner: bid_id.owner, - dseq: BigInt(bid_id.dseq), + dseq: bid_id.dseq == null ? bid_id.dseq : BigInt(bid_id.dseq), gseq: bid_id.gseq, oseq: bid_id.oseq, provider: bid_id.provider @@ -161,7 +161,7 @@ export const AminoConverter = { return { bid_id: { owner: bidId.owner, - dseq: bidId.dseq.toString(), + dseq: bidId.dseq?.toString?.(), gseq: bidId.gseq, oseq: bidId.oseq, provider: bidId.provider @@ -172,9 +172,9 @@ export const AminoConverter = { bid_id }: MsgWithdrawLeaseAminoType["value"]): MsgWithdrawLease => { return { - bidId: { + bidId: bid_id == null ? bid_id : { owner: bid_id.owner, - dseq: BigInt(bid_id.dseq), + dseq: bid_id.dseq == null ? bid_id.dseq : BigInt(bid_id.dseq), gseq: bid_id.gseq, oseq: bid_id.oseq, provider: bid_id.provider @@ -190,7 +190,7 @@ export const AminoConverter = { return { bid_id: { owner: bidId.owner, - dseq: bidId.dseq.toString(), + dseq: bidId.dseq?.toString?.(), gseq: bidId.gseq, oseq: bidId.oseq, provider: bidId.provider @@ -201,9 +201,9 @@ export const AminoConverter = { bid_id }: MsgCreateLeaseAminoType["value"]): MsgCreateLease => { return { - bidId: { + bidId: bid_id == null ? bid_id : { owner: bid_id.owner, - dseq: BigInt(bid_id.dseq), + dseq: bid_id.dseq == null ? bid_id.dseq : BigInt(bid_id.dseq), gseq: bid_id.gseq, oseq: bid_id.oseq, provider: bid_id.provider @@ -219,7 +219,7 @@ export const AminoConverter = { return { lease_id: { owner: leaseId.owner, - dseq: leaseId.dseq.toString(), + dseq: leaseId.dseq?.toString?.(), gseq: leaseId.gseq, oseq: leaseId.oseq, provider: leaseId.provider @@ -230,9 +230,9 @@ export const AminoConverter = { lease_id }: MsgCloseLeaseAminoType["value"]): MsgCloseLease => { return { - leaseId: { + leaseId: lease_id == null ? lease_id : { owner: lease_id.owner, - dseq: BigInt(lease_id.dseq), + dseq: lease_id.dseq == null ? lease_id.dseq : BigInt(lease_id.dseq), gseq: lease_id.gseq, oseq: lease_id.oseq, provider: lease_id.provider diff --git a/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta1/provider.amino.ts b/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta1/provider.amino.ts index 09f69f6e0b..d4fdfe9032 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta1/provider.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta1/provider.amino.ts @@ -69,11 +69,11 @@ export const AminoConverter = { return { owner, hostUri: host_uri, - attributes: attributes.map(el0 => ({ + attributes: attributes.map?.(el0 => ({ key: el0.key, value: el0.value })), - info: { + info: info == null ? info : { email: info.email, website: info.website } @@ -110,11 +110,11 @@ export const AminoConverter = { return { owner, hostUri: host_uri, - attributes: attributes.map(el0 => ({ + attributes: attributes.map?.(el0 => ({ key: el0.key, value: el0.value })), - info: { + info: info == null ? info : { email: info.email, website: info.website } diff --git a/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta1/provider.ts b/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta1/provider.ts index 2f08ae04ab..ee65d646fa 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta1/provider.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta1/provider.ts @@ -191,8 +191,8 @@ export const ProviderInfo = { }, toAmino(message: ProviderInfo): ProviderInfoAmino { const obj: any = {}; - obj.email = message.email; - obj.website = message.website; + obj.email = message.email ?? ""; + obj.website = message.website ?? ""; return obj; }, fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo { @@ -342,14 +342,14 @@ export const MsgCreateProvider = { }, toAmino(message: MsgCreateProvider): MsgCreateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider { @@ -573,14 +573,14 @@ export const MsgUpdateProvider = { }, toAmino(message: MsgUpdateProvider): MsgUpdateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider { @@ -748,7 +748,7 @@ export const MsgDeleteProvider = { }, toAmino(message: MsgDeleteProvider): MsgDeleteProviderAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner ?? ""; return obj; }, fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider { @@ -972,14 +972,14 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: ProviderAminoMsg): Provider { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/genesis.ts b/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/genesis.ts index e106ac8e50..62e3969d1f 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/provider.amino.ts b/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/provider.amino.ts index de1a53399d..946fece8ef 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/provider.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/provider.amino.ts @@ -69,11 +69,11 @@ export const AminoConverter = { return { owner, hostUri: host_uri, - attributes: attributes.map(el0 => ({ + attributes: attributes.map?.(el0 => ({ key: el0.key, value: el0.value })), - info: { + info: info == null ? info : { email: info.email, website: info.website } @@ -110,11 +110,11 @@ export const AminoConverter = { return { owner, hostUri: host_uri, - attributes: attributes.map(el0 => ({ + attributes: attributes.map?.(el0 => ({ key: el0.key, value: el0.value })), - info: { + info: info == null ? info : { email: info.email, website: info.website } diff --git a/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/provider.ts b/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/provider.ts index 509e5db2b8..4ecc7b636f 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/provider.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/provider.ts @@ -191,8 +191,8 @@ export const ProviderInfo = { }, toAmino(message: ProviderInfo): ProviderInfoAmino { const obj: any = {}; - obj.email = message.email; - obj.website = message.website; + obj.email = message.email ?? ""; + obj.website = message.website ?? ""; return obj; }, fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo { @@ -342,14 +342,14 @@ export const MsgCreateProvider = { }, toAmino(message: MsgCreateProvider): MsgCreateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider { @@ -573,14 +573,14 @@ export const MsgUpdateProvider = { }, toAmino(message: MsgUpdateProvider): MsgUpdateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider { @@ -748,7 +748,7 @@ export const MsgDeleteProvider = { }, toAmino(message: MsgDeleteProvider): MsgDeleteProviderAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner ?? ""; return obj; }, fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider { @@ -972,14 +972,14 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: ProviderAminoMsg): Provider { diff --git a/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/query.ts b/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/query.ts index feb3db5ee9..a53f2eb074 100644 --- a/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/akash/provider/v1beta2/query.ts @@ -245,7 +245,7 @@ export const QueryProvidersResponse = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -341,7 +341,7 @@ export const QueryProviderRequest = { }, toAmino(message: QueryProviderRequest): QueryProviderRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest { diff --git a/__fixtures__/v-next/outputinstantrpc/confio/proofs.ts b/__fixtures__/v-next/outputinstantrpc/confio/proofs.ts index 7a32e5c8c6..4536cfdf0c 100644 --- a/__fixtures__/v-next/outputinstantrpc/confio/proofs.ts +++ b/__fixtures__/v-next/outputinstantrpc/confio/proofs.ts @@ -657,7 +657,7 @@ export const ExistenceProof = { if (message.path) { obj.path = message.path.map(e => e ? InnerOp.toAmino(e) : undefined); } else { - obj.path = []; + obj.path = message.path; } return obj; }, @@ -1065,16 +1065,16 @@ export const LeafOp = { fromAmino(object: LeafOpAmino): LeafOp { const message = createBaseLeafOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prehash_key !== undefined && object.prehash_key !== null) { - message.prehashKey = hashOpFromJSON(object.prehash_key); + message.prehashKey = object.prehash_key; } if (object.prehash_value !== undefined && object.prehash_value !== null) { - message.prehashValue = hashOpFromJSON(object.prehash_value); + message.prehashValue = object.prehash_value; } if (object.length !== undefined && object.length !== null) { - message.length = lengthOpFromJSON(object.length); + message.length = object.length; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1083,10 +1083,10 @@ export const LeafOp = { }, 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.hash = message.hash === 0 ? undefined : message.hash; + obj.prehash_key = message.prehashKey === 0 ? undefined : message.prehashKey; + obj.prehash_value = message.prehashValue === 0 ? undefined : message.prehashValue; + obj.length = message.length === 0 ? undefined : message.length; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; }, @@ -1195,7 +1195,7 @@ export const InnerOp = { fromAmino(object: InnerOpAmino): InnerOp { const message = createBaseInnerOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1207,7 +1207,7 @@ export const InnerOp = { }, toAmino(message: InnerOp): InnerOpAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; obj.suffix = message.suffix ? base64FromBytes(message.suffix) : undefined; return obj; @@ -1351,8 +1351,8 @@ export const ProofSpec = { 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; + obj.max_depth = message.maxDepth === 0 ? undefined : message.maxDepth; + obj.min_depth = message.minDepth === 0 ? undefined : message.minDepth; return obj; }, fromAminoMsg(object: ProofSpecAminoMsg): ProofSpec { @@ -1529,7 +1529,7 @@ export const InnerSpec = { message.emptyChild = bytesFromBase64(object.empty_child); } if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } return message; }, @@ -1538,13 +1538,13 @@ export const InnerSpec = { if (message.childOrder) { obj.child_order = message.childOrder.map(e => e); } else { - obj.child_order = []; + obj.child_order = message.childOrder; } - obj.child_size = message.childSize; - obj.min_prefix_length = message.minPrefixLength; - obj.max_prefix_length = message.maxPrefixLength; + obj.child_size = message.childSize === 0 ? undefined : message.childSize; + obj.min_prefix_length = message.minPrefixLength === 0 ? undefined : message.minPrefixLength; + obj.max_prefix_length = message.maxPrefixLength === 0 ? undefined : message.maxPrefixLength; obj.empty_child = message.emptyChild ? base64FromBytes(message.emptyChild) : undefined; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; return obj; }, fromAminoMsg(object: InnerSpecAminoMsg): InnerSpec { @@ -1641,7 +1641,7 @@ export const BatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? BatchEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1870,12 +1870,12 @@ export const CompressedBatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? CompressedBatchEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.lookupInners) { obj.lookup_inners = message.lookupInners.map(e => e ? InnerOp.toAmino(e) : undefined); } else { - obj.lookup_inners = []; + obj.lookup_inners = message.lookupInners; } return obj; }, @@ -2144,7 +2144,7 @@ export const CompressedExistenceProof = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/app/v1alpha1/config.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/app/v1alpha1/config.ts index 52767eede2..4abd348190 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/app/v1alpha1/config.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/app/v1alpha1/config.ts @@ -139,7 +139,7 @@ export const Config = { if (message.modules) { obj.modules = message.modules.map(e => e ? ModuleConfig.toAmino(e) : undefined); } else { - obj.modules = []; + obj.modules = message.modules; } return obj; }, @@ -252,7 +252,7 @@ export const ModuleConfig = { }, toAmino(message: ModuleConfig): ModuleConfigAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.config = message.config ? Any.toAmino(message.config) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/app/v1alpha1/module.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/app/v1alpha1/module.ts index 6a3fbea4b5..58090c2f19 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/app/v1alpha1/module.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/app/v1alpha1/module.ts @@ -226,16 +226,16 @@ export const ModuleDescriptor = { }, toAmino(message: ModuleDescriptor): ModuleDescriptorAmino { const obj: any = {}; - obj.go_import = message.goImport; + obj.go_import = message.goImport === "" ? undefined : message.goImport; if (message.usePackage) { obj.use_package = message.usePackage.map(e => e ? PackageReference.toAmino(e) : undefined); } else { - obj.use_package = []; + obj.use_package = message.usePackage; } if (message.canMigrateFrom) { obj.can_migrate_from = message.canMigrateFrom.map(e => e ? MigrateFromInfo.toAmino(e) : undefined); } else { - obj.can_migrate_from = []; + obj.can_migrate_from = message.canMigrateFrom; } return obj; }, @@ -346,8 +346,8 @@ export const PackageReference = { }, toAmino(message: PackageReference): PackageReferenceAmino { const obj: any = {}; - obj.name = message.name; - obj.revision = message.revision; + obj.name = message.name === "" ? undefined : message.name; + obj.revision = message.revision === 0 ? undefined : message.revision; return obj; }, fromAminoMsg(object: PackageReferenceAminoMsg): PackageReference { @@ -441,7 +441,7 @@ export const MigrateFromInfo = { }, toAmino(message: MigrateFromInfo): MigrateFromInfoAmino { const obj: any = {}; - obj.module = message.module; + obj.module = message.module === "" ? undefined : message.module; return obj; }, fromAminoMsg(object: MigrateFromInfoAminoMsg): MigrateFromInfo { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/auth/v1beta1/auth.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/auth/v1beta1/auth.ts index 60d2939ffd..0c6cdcd43d 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/auth/v1beta1/auth.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/auth/v1beta1/auth.ts @@ -187,10 +187,10 @@ export const BaseAccount = { }, toAmino(message: BaseAccount): BaseAccountAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : 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; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: BaseAccountAminoMsg): BaseAccount { @@ -325,11 +325,11 @@ export const ModuleAccount = { toAmino(message: ModuleAccount): ModuleAccountAmino { const obj: any = {}; obj.base_account = message.baseAccount ? BaseAccount.toAmino(message.baseAccount) : undefined; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.permissions) { obj.permissions = message.permissions.map(e => e); } else { - obj.permissions = []; + obj.permissions = message.permissions; } return obj; }, @@ -498,11 +498,11 @@ export const Params = { }, 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; + obj.max_memo_characters = message.maxMemoCharacters !== BigInt(0) ? message.maxMemoCharacters.toString() : undefined; + obj.tx_sig_limit = message.txSigLimit !== BigInt(0) ? message.txSigLimit.toString() : undefined; + obj.tx_size_cost_per_byte = message.txSizeCostPerByte !== BigInt(0) ? message.txSizeCostPerByte.toString() : undefined; + obj.sig_verify_cost_ed25519 = message.sigVerifyCostEd25519 !== BigInt(0) ? message.sigVerifyCostEd25519.toString() : undefined; + obj.sig_verify_cost_secp256k1 = message.sigVerifyCostSecp256k1 !== BigInt(0) ? message.sigVerifyCostSecp256k1.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/auth/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/auth/v1beta1/genesis.ts index 17b02061a7..0df5f48e20 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/auth/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/auth/v1beta1/genesis.ts @@ -116,7 +116,7 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/auth/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/auth/v1beta1/query.ts index 82cc5fe4f0..043f287cf7 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/auth/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/auth/v1beta1/query.ts @@ -376,7 +376,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -472,7 +472,7 @@ export const QueryAccountRequest = { }, toAmino(message: QueryAccountRequest): QueryAccountRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryAccountRequestAminoMsg): QueryAccountRequest { @@ -915,7 +915,7 @@ export const QueryModuleAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } return obj; }, @@ -1084,7 +1084,7 @@ export const Bech32PrefixResponse = { }, toAmino(message: Bech32PrefixResponse): Bech32PrefixResponseAmino { const obj: any = {}; - obj.bech32_prefix = message.bech32Prefix; + obj.bech32_prefix = message.bech32Prefix === "" ? undefined : message.bech32Prefix; return obj; }, fromAminoMsg(object: Bech32PrefixResponseAminoMsg): Bech32PrefixResponse { @@ -1272,7 +1272,7 @@ export const AddressBytesToStringResponse = { }, toAmino(message: AddressBytesToStringResponse): AddressBytesToStringResponseAmino { const obj: any = {}; - obj.address_string = message.addressString; + obj.address_string = message.addressString === "" ? undefined : message.addressString; return obj; }, fromAminoMsg(object: AddressBytesToStringResponseAminoMsg): AddressBytesToStringResponse { @@ -1366,7 +1366,7 @@ export const AddressStringToBytesRequest = { }, toAmino(message: AddressStringToBytesRequest): AddressStringToBytesRequestAmino { const obj: any = {}; - obj.address_string = message.addressString; + obj.address_string = message.addressString === "" ? undefined : message.addressString; return obj; }, fromAminoMsg(object: AddressStringToBytesRequestAminoMsg): AddressStringToBytesRequest { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/authz.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/authz.ts index 1b7078d9c8..6a77a18d87 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/authz.ts @@ -153,7 +153,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { @@ -410,8 +410,8 @@ export const GrantAuthorization = { }, toAmino(message: GrantAuthorization): GrantAuthorizationAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.authorization = message.authorization ? Any.toAmino(message.authorization) : undefined; obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -516,7 +516,7 @@ export const GrantQueueItem = { if (message.msgTypeUrls) { obj.msg_type_urls = message.msgTypeUrls.map(e => e); } else { - obj.msg_type_urls = []; + obj.msg_type_urls = message.msgTypeUrls; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/genesis.ts index e77fd05933..b54632ef7d 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.authorization) { obj.authorization = message.authorization.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.authorization = []; + obj.authorization = message.authorization; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/query.ts index dfdf4f6386..a270d32b76 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/query.ts @@ -220,9 +220,9 @@ export const QueryGrantsRequest = { }, toAmino(message: QueryGrantsRequest): QueryGrantsRequestAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -344,7 +344,7 @@ export const QueryGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -458,7 +458,7 @@ export const QueryGranterGrantsRequest = { }, toAmino(message: QueryGranterGrantsRequest): QueryGranterGrantsRequestAmino { const obj: any = {}; - obj.granter = message.granter; + obj.granter = message.granter === "" ? undefined : message.granter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -580,7 +580,7 @@ export const QueryGranterGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -694,7 +694,7 @@ export const QueryGranteeGrantsRequest = { }, toAmino(message: QueryGranteeGrantsRequest): QueryGranteeGrantsRequestAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -816,7 +816,7 @@ export const QueryGranteeGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/tx.amino.ts index b035d8f4ff..824747e564 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/tx.amino.ts @@ -62,8 +62,8 @@ export const AminoConverter = { return { granter, grantee, - grant: { - authorization: { + grant: grant == null ? grant : { + authorization: grant.authorization == null ? grant.authorization : { typeUrl: grant.authorization.type_url, value: grant.authorization.value }, @@ -92,7 +92,7 @@ export const AminoConverter = { }: MsgExecAminoType["value"]): MsgExec => { return { grantee, - msgs: msgs.map(el0 => ({ + msgs: msgs.map?.(el0 => ({ typeUrl: el0.type_url, value: el0.value })) diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/tx.ts index 4a4d43b34c..563831e79c 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/authz/v1beta1/tx.ts @@ -205,8 +205,8 @@ export const MsgGrant = { }, toAmino(message: MsgGrant): MsgGrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.grant = message.grant ? Grant.toAmino(message.grant) : undefined; return obj; }, @@ -310,7 +310,7 @@ export const MsgExecResponse = { if (message.results) { obj.results = message.results.map(e => base64FromBytes(e)); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -427,11 +427,11 @@ export const MsgExec = { }, toAmino(message: MsgExec): MsgExecAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -632,9 +632,9 @@ export const MsgRevoke = { }, toAmino(message: MsgRevoke): MsgRevokeAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromAminoMsg(object: MsgRevokeAminoMsg): MsgRevoke { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/authz.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/authz.ts index 1c0c2865db..e8630c19dc 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/authz.ts @@ -102,7 +102,7 @@ export const SendAuthorization = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/bank.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/bank.ts index 0d4f5b9963..f20a349c30 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/bank.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/bank.ts @@ -271,9 +271,9 @@ export const Params = { if (message.sendEnabled) { obj.send_enabled = message.sendEnabled.map(e => e ? SendEnabled.toAmino(e) : undefined); } else { - obj.send_enabled = []; + obj.send_enabled = message.sendEnabled; } - obj.default_send_enabled = message.defaultSendEnabled; + obj.default_send_enabled = message.defaultSendEnabled === false ? undefined : message.defaultSendEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -383,8 +383,8 @@ export const SendEnabled = { }, toAmino(message: SendEnabled): SendEnabledAmino { const obj: any = {}; - obj.denom = message.denom; - obj.enabled = message.enabled; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.enabled = message.enabled === false ? undefined : message.enabled; return obj; }, fromAminoMsg(object: SendEnabledAminoMsg): SendEnabled { @@ -500,11 +500,11 @@ export const Input = { }, toAmino(message: Input): InputAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -621,11 +621,11 @@ export const Output = { }, toAmino(message: Output): OutputAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -729,7 +729,7 @@ export const Supply = { if (message.total) { obj.total = message.total.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total = []; + obj.total = message.total; } return obj; }, @@ -862,12 +862,12 @@ export const DenomUnit = { }, toAmino(message: DenomUnit): DenomUnitAmino { const obj: any = {}; - obj.denom = message.denom; - obj.exponent = message.exponent; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.exponent = message.exponent === 0 ? undefined : message.exponent; if (message.aliases) { obj.aliases = message.aliases.map(e => e); } else { - obj.aliases = []; + obj.aliases = message.aliases; } return obj; }, @@ -1080,18 +1080,18 @@ export const Metadata = { }, toAmino(message: Metadata): MetadataAmino { const obj: any = {}; - obj.description = message.description; + obj.description = message.description === "" ? undefined : message.description; if (message.denomUnits) { obj.denom_units = message.denomUnits.map(e => e ? DenomUnit.toAmino(e) : undefined); } else { - obj.denom_units = []; + obj.denom_units = message.denomUnits; } - 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; + obj.base = message.base === "" ? undefined : message.base; + obj.display = message.display === "" ? undefined : message.display; + obj.name = message.name === "" ? undefined : message.name; + obj.symbol = message.symbol === "" ? undefined : message.symbol; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; return obj; }, fromAminoMsg(object: MetadataAminoMsg): Metadata { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/genesis.ts index 87161084ad..cf1165ab68 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/genesis.ts @@ -191,17 +191,17 @@ export const GenesisState = { if (message.balances) { obj.balances = message.balances.map(e => e ? Balance.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } if (message.supply) { obj.supply = message.supply.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.supply = []; + obj.supply = message.supply; } if (message.denomMetadata) { obj.denom_metadata = message.denomMetadata.map(e => e ? Metadata.toAmino(e) : undefined); } else { - obj.denom_metadata = []; + obj.denom_metadata = message.denomMetadata; } return obj; }, @@ -318,11 +318,11 @@ export const Balance = { }, toAmino(message: Balance): BalanceAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/query.ts index bed9cc5a18..e81e9b0747 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/query.ts @@ -425,8 +425,8 @@ export const QueryBalanceRequest = { }, toAmino(message: QueryBalanceRequest): QueryBalanceRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.denom = message.denom; + obj.address = message.address === "" ? undefined : message.address; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest { @@ -634,7 +634,7 @@ export const QueryAllBalancesRequest = { }, toAmino(message: QueryAllBalancesRequest): QueryAllBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -756,7 +756,7 @@ export const QueryAllBalancesResponse = { if (message.balances) { obj.balances = message.balances.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -870,7 +870,7 @@ export const QuerySpendableBalancesRequest = { }, toAmino(message: QuerySpendableBalancesRequest): QuerySpendableBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -992,7 +992,7 @@ export const QuerySpendableBalancesResponse = { if (message.balances) { obj.balances = message.balances.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1211,7 +1211,7 @@ export const QueryTotalSupplyResponse = { if (message.supply) { obj.supply = message.supply.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.supply = []; + obj.supply = message.supply; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1307,7 +1307,7 @@ export const QuerySupplyOfRequest = { }, toAmino(message: QuerySupplyOfRequest): QuerySupplyOfRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QuerySupplyOfRequestAminoMsg): QuerySupplyOfRequest { @@ -1790,7 +1790,7 @@ export const QueryDenomsMetadataResponse = { if (message.metadatas) { obj.metadatas = message.metadatas.map(e => e ? Metadata.toAmino(e) : undefined); } else { - obj.metadatas = []; + obj.metadatas = message.metadatas; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1886,7 +1886,7 @@ export const QueryDenomMetadataRequest = { }, toAmino(message: QueryDenomMetadataRequest): QueryDenomMetadataRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomMetadataRequestAminoMsg): QueryDenomMetadataRequest { @@ -2094,7 +2094,7 @@ export const QueryDenomOwnersRequest = { }, toAmino(message: QueryDenomOwnersRequest): QueryDenomOwnersRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2207,7 +2207,7 @@ export const DenomOwner = { }, toAmino(message: DenomOwner): DenomOwnerAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined; return obj; }, @@ -2329,7 +2329,7 @@ export const QueryDenomOwnersResponse = { if (message.denomOwners) { obj.denom_owners = message.denomOwners.map(e => e ? DenomOwner.toAmino(e) : undefined); } else { - obj.denom_owners = []; + obj.denom_owners = message.denomOwners; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/tx.amino.ts index 5352659e14..85122e6a31 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/tx.amino.ts @@ -57,7 +57,7 @@ export const AminoConverter = { return { fromAddress: from_address, toAddress: to_address, - amount: amount.map(el0 => ({ + amount: amount.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })) @@ -92,16 +92,16 @@ export const AminoConverter = { outputs }: MsgMultiSendAminoType["value"]): MsgMultiSend => { return { - inputs: inputs.map(el0 => ({ + inputs: inputs.map?.(el0 => ({ address: el0.address, - coins: el0.coins.map(el1 => ({ + coins: el0.coins.map?.(el1 => ({ denom: el1.denom, amount: el1.amount })) })), - outputs: outputs.map(el0 => ({ + outputs: outputs.map?.(el0 => ({ address: el0.address, - coins: el0.coins.map(el1 => ({ + coins: el0.coins.map?.(el1 => ({ denom: el1.denom, amount: el1.amount })) diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/tx.ts index c50d24abbb..72455f3624 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/bank/v1beta1/tx.ts @@ -156,12 +156,12 @@ export const MsgSend = { }, toAmino(message: MsgSend): MsgSendAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -361,12 +361,12 @@ export const MsgMultiSend = { if (message.inputs) { obj.inputs = message.inputs.map(e => e ? Input.toAmino(e) : undefined); } else { - obj.inputs = []; + obj.inputs = message.inputs; } if (message.outputs) { obj.outputs = message.outputs.map(e => e ? Output.toAmino(e) : undefined); } else { - obj.outputs = []; + obj.outputs = message.outputs; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/base/abci/v1beta1/abci.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/base/abci/v1beta1/abci.ts index 34e78a549e..c56f04653d 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/base/abci/v1beta1/abci.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/base/abci/v1beta1/abci.ts @@ -563,26 +563,26 @@ export const TxResponse = { }, 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; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.txhash = message.txhash === "" ? undefined : message.txhash; + obj.codespace = message.codespace === "" ? undefined : message.codespace; + obj.code = message.code === 0 ? undefined : message.code; + obj.data = message.data === "" ? undefined : message.data; + obj.raw_log = message.rawLog === "" ? undefined : message.rawLog; if (message.logs) { obj.logs = message.logs.map(e => e ? ABCIMessageLog.toAmino(e) : undefined); } else { - obj.logs = []; + obj.logs = message.logs; } - obj.info = message.info; - obj.gas_wanted = message.gasWanted ? message.gasWanted.toString() : undefined; - obj.gas_used = message.gasUsed ? message.gasUsed.toString() : undefined; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; obj.tx = message.tx ? Any.toAmino(message.tx) : undefined; - obj.timestamp = message.timestamp; + obj.timestamp = message.timestamp === "" ? undefined : message.timestamp; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -715,12 +715,12 @@ export const ABCIMessageLog = { }, toAmino(message: ABCIMessageLog): ABCIMessageLogAmino { const obj: any = {}; - obj.msg_index = message.msgIndex; - obj.log = message.log; + obj.msg_index = message.msgIndex ?? 0; + obj.log = message.log === "" ? undefined : message.log; if (message.events) { obj.events = message.events.map(e => e ? StringEvent.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -837,11 +837,11 @@ export const StringEvent = { }, toAmino(message: StringEvent): StringEventAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -952,8 +952,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -1067,8 +1067,8 @@ export const GasInfo = { }, 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; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; return obj; }, fromAminoMsg(object: GasInfoAminoMsg): GasInfo { @@ -1223,16 +1223,16 @@ export const Result = { toAmino(message: Result): ResultAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.log = message.log; + obj.log = message.log === "" ? undefined : message.log; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } if (message.msgResponses) { obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msg_responses = []; + obj.msg_responses = message.msgResponses; } return obj; }, @@ -1458,7 +1458,7 @@ export const MsgData = { }, toAmino(message: MsgData): MsgDataAmino { const obj: any = {}; - obj.msg_type = message.msgType; + obj.msg_type = message.msgType === "" ? undefined : message.msgType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1584,12 +1584,12 @@ export const TxMsgData = { if (message.data) { obj.data = message.data.map(e => e ? MsgData.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } if (message.msgResponses) { obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msg_responses = []; + obj.msg_responses = message.msgResponses; } return obj; }, @@ -1780,15 +1780,15 @@ export const SearchTxsResult = { }, 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; + obj.total_count = message.totalCount !== BigInt(0) ? message.totalCount.toString() : undefined; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.page_number = message.pageNumber !== BigInt(0) ? message.pageNumber.toString() : undefined; + obj.page_total = message.pageTotal !== BigInt(0) ? message.pageTotal.toString() : undefined; + obj.limit = message.limit !== BigInt(0) ? message.limit.toString() : undefined; if (message.txs) { obj.txs = message.txs.map(e => e ? TxResponse.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/base/kv/v1beta1/kv.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/base/kv/v1beta1/kv.ts index 466ecd439a..e591fb3961 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/base/kv/v1beta1/kv.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/base/kv/v1beta1/kv.ts @@ -105,7 +105,7 @@ export const Pairs = { if (message.pairs) { obj.pairs = message.pairs.map(e => e ? Pair.toAmino(e) : undefined); } else { - obj.pairs = []; + obj.pairs = message.pairs; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/base/query/v1beta1/pagination.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/base/query/v1beta1/pagination.ts index 8aa1c12d87..c8852c94c9 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/base/query/v1beta1/pagination.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/base/query/v1beta1/pagination.ts @@ -239,10 +239,10 @@ export const PageRequest = { toAmino(message: PageRequest): PageRequestAmino { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; - 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; + obj.offset = message.offset !== BigInt(0) ? message.offset.toString() : undefined; + obj.limit = message.limit !== BigInt(0) ? message.limit.toString() : undefined; + obj.count_total = message.countTotal === false ? undefined : message.countTotal; + obj.reverse = message.reverse === false ? undefined : message.reverse; return obj; }, fromAminoMsg(object: PageRequestAminoMsg): PageRequest { @@ -355,7 +355,7 @@ export const PageResponse = { toAmino(message: PageResponse): PageResponseAmino { const obj: any = {}; obj.next_key = message.nextKey ? base64FromBytes(message.nextKey) : undefined; - obj.total = message.total ? message.total.toString() : undefined; + obj.total = message.total !== BigInt(0) ? message.total.toString() : undefined; return obj; }, fromAminoMsg(object: PageResponseAminoMsg): PageResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/base/reflection/v1beta1/reflection.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/base/reflection/v1beta1/reflection.ts index de50b0a90b..baa1eb275a 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/base/reflection/v1beta1/reflection.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/base/reflection/v1beta1/reflection.ts @@ -211,7 +211,7 @@ export const ListAllInterfacesResponse = { if (message.interfaceNames) { obj.interface_names = message.interfaceNames.map(e => e); } else { - obj.interface_names = []; + obj.interface_names = message.interfaceNames; } return obj; }, @@ -306,7 +306,7 @@ export const ListImplementationsRequest = { }, toAmino(message: ListImplementationsRequest): ListImplementationsRequestAmino { const obj: any = {}; - obj.interface_name = message.interfaceName; + obj.interface_name = message.interfaceName === "" ? undefined : message.interfaceName; return obj; }, fromAminoMsg(object: ListImplementationsRequestAminoMsg): ListImplementationsRequest { @@ -409,7 +409,7 @@ export const ListImplementationsResponse = { if (message.implementationMessageNames) { obj.implementation_message_names = message.implementationMessageNames.map(e => e); } else { - obj.implementation_message_names = []; + obj.implementation_message_names = message.implementationMessageNames; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/base/reflection/v2alpha1/reflection.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/base/reflection/v2alpha1/reflection.ts index d417225690..997c34dde8 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/base/reflection/v2alpha1/reflection.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/base/reflection/v2alpha1/reflection.ts @@ -694,11 +694,11 @@ export const TxDescriptor = { }, toAmino(message: TxDescriptor): TxDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? MsgDescriptor.toAmino(e) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -802,7 +802,7 @@ export const AuthnDescriptor = { if (message.signModes) { obj.sign_modes = message.signModes.map(e => e ? SigningModeDescriptor.toAmino(e) : undefined); } else { - obj.sign_modes = []; + obj.sign_modes = message.signModes; } return obj; }, @@ -929,9 +929,9 @@ export const SigningModeDescriptor = { }, toAmino(message: SigningModeDescriptor): SigningModeDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; - obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname === "" ? undefined : message.authnInfoProviderMethodFullname; return obj; }, fromAminoMsg(object: SigningModeDescriptorAminoMsg): SigningModeDescriptor { @@ -1025,7 +1025,7 @@ export const ChainDescriptor = { }, toAmino(message: ChainDescriptor): ChainDescriptorAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: ChainDescriptorAminoMsg): ChainDescriptor { @@ -1128,7 +1128,7 @@ export const CodecDescriptor = { if (message.interfaces) { obj.interfaces = message.interfaces.map(e => e ? InterfaceDescriptor.toAmino(e) : undefined); } else { - obj.interfaces = []; + obj.interfaces = message.interfaces; } return obj; }, @@ -1267,16 +1267,16 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.interfaceAcceptingMessages) { obj.interface_accepting_messages = message.interfaceAcceptingMessages.map(e => e ? InterfaceAcceptingMessageDescriptor.toAmino(e) : undefined); } else { - obj.interface_accepting_messages = []; + obj.interface_accepting_messages = message.interfaceAcceptingMessages; } if (message.interfaceImplementers) { obj.interface_implementers = message.interfaceImplementers.map(e => e ? InterfaceImplementerDescriptor.toAmino(e) : undefined); } else { - obj.interface_implementers = []; + obj.interface_implementers = message.interfaceImplementers; } return obj; }, @@ -1387,8 +1387,8 @@ export const InterfaceImplementerDescriptor = { }, toAmino(message: InterfaceImplementerDescriptor): InterfaceImplementerDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; - obj.type_url = message.typeUrl; + obj.fullname = message.fullname === "" ? undefined : message.fullname; + obj.type_url = message.typeUrl === "" ? undefined : message.typeUrl; return obj; }, fromAminoMsg(object: InterfaceImplementerDescriptorAminoMsg): InterfaceImplementerDescriptor { @@ -1504,11 +1504,11 @@ export const InterfaceAcceptingMessageDescriptor = { }, toAmino(message: InterfaceAcceptingMessageDescriptor): InterfaceAcceptingMessageDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.fieldDescriptorNames) { obj.field_descriptor_names = message.fieldDescriptorNames.map(e => e); } else { - obj.field_descriptor_names = []; + obj.field_descriptor_names = message.fieldDescriptorNames; } return obj; }, @@ -1603,7 +1603,7 @@ export const ConfigurationDescriptor = { }, toAmino(message: ConfigurationDescriptor): ConfigurationDescriptorAmino { const obj: any = {}; - obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix; + obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix === "" ? undefined : message.bech32AccountAddressPrefix; return obj; }, fromAminoMsg(object: ConfigurationDescriptorAminoMsg): ConfigurationDescriptor { @@ -1697,7 +1697,7 @@ export const MsgDescriptor = { }, toAmino(message: MsgDescriptor): MsgDescriptorAmino { const obj: any = {}; - obj.msg_type_url = message.msgTypeUrl; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromAminoMsg(object: MsgDescriptorAminoMsg): MsgDescriptor { @@ -2820,7 +2820,7 @@ export const QueryServicesDescriptor = { if (message.queryServices) { obj.query_services = message.queryServices.map(e => e ? QueryServiceDescriptor.toAmino(e) : undefined); } else { - obj.query_services = []; + obj.query_services = message.queryServices; } return obj; }, @@ -2953,12 +2953,12 @@ export const QueryServiceDescriptor = { }, toAmino(message: QueryServiceDescriptor): QueryServiceDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; - obj.is_module = message.isModule; + obj.fullname = message.fullname === "" ? undefined : message.fullname; + obj.is_module = message.isModule === false ? undefined : message.isModule; if (message.methods) { obj.methods = message.methods.map(e => e ? QueryMethodDescriptor.toAmino(e) : undefined); } else { - obj.methods = []; + obj.methods = message.methods; } return obj; }, @@ -3069,8 +3069,8 @@ export const QueryMethodDescriptor = { }, toAmino(message: QueryMethodDescriptor): QueryMethodDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.full_query_path = message.fullQueryPath; + obj.name = message.name === "" ? undefined : message.name; + obj.full_query_path = message.fullQueryPath === "" ? undefined : message.fullQueryPath; return obj; }, fromAminoMsg(object: QueryMethodDescriptorAminoMsg): QueryMethodDescriptor { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/base/snapshots/v1beta1/snapshot.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/base/snapshots/v1beta1/snapshot.ts index fa28d3445a..cf4ec701d6 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/base/snapshots/v1beta1/snapshot.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/base/snapshots/v1beta1/snapshot.ts @@ -277,9 +277,9 @@ export const Snapshot = { }, toAmino(message: Snapshot): SnapshotAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunks = message.chunks; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunks = message.chunks === 0 ? undefined : message.chunks; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; @@ -384,7 +384,7 @@ export const Metadata = { if (message.chunkHashes) { obj.chunk_hashes = message.chunkHashes.map(e => base64FromBytes(e)); } else { - obj.chunk_hashes = []; + obj.chunk_hashes = message.chunkHashes; } return obj; }, @@ -670,7 +670,7 @@ export const SnapshotStoreItem = { }, toAmino(message: SnapshotStoreItem): SnapshotStoreItemAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: SnapshotStoreItemAminoMsg): SnapshotStoreItem { @@ -816,8 +816,8 @@ export const SnapshotIAVLItem = { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; - obj.version = message.version ? message.version.toString() : undefined; - obj.height = message.height; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; + obj.height = message.height === 0 ? undefined : message.height; return obj; }, fromAminoMsg(object: SnapshotIAVLItemAminoMsg): SnapshotIAVLItem { @@ -927,8 +927,8 @@ export const SnapshotExtensionMeta = { }, toAmino(message: SnapshotExtensionMeta): SnapshotExtensionMetaAmino { const obj: any = {}; - obj.name = message.name; - obj.format = message.format; + obj.name = message.name === "" ? undefined : message.name; + obj.format = message.format === 0 ? undefined : message.format; return obj; }, fromAminoMsg(object: SnapshotExtensionMetaAminoMsg): SnapshotExtensionMeta { @@ -1236,7 +1236,7 @@ export const SnapshotSchema = { if (message.keys) { obj.keys = message.keys.map(e => base64FromBytes(e)); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/base/store/v1beta1/commit_info.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/base/store/v1beta1/commit_info.ts index deff71edfe..41b0949aaa 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/base/store/v1beta1/commit_info.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/base/store/v1beta1/commit_info.ts @@ -154,11 +154,11 @@ export const CommitInfo = { }, toAmino(message: CommitInfo): CommitInfoAmino { const obj: any = {}; - obj.version = message.version ? message.version.toString() : undefined; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; if (message.storeInfos) { obj.store_infos = message.storeInfos.map(e => e ? StoreInfo.toAmino(e) : undefined); } else { - obj.store_infos = []; + obj.store_infos = message.storeInfos; } return obj; }, @@ -271,7 +271,7 @@ export const StoreInfo = { }, toAmino(message: StoreInfo): StoreInfoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.commit_id = message.commitId ? CommitID.toAmino(message.commitId) : undefined; return obj; }, @@ -384,7 +384,7 @@ export const CommitID = { }, toAmino(message: CommitID): CommitIDAmino { const obj: any = {}; - obj.version = message.version ? message.version.toString() : undefined; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/base/store/v1beta1/listening.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/base/store/v1beta1/listening.ts index b656b5422b..23924bf152 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/base/store/v1beta1/listening.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/base/store/v1beta1/listening.ts @@ -150,8 +150,8 @@ export const StoreKVPair = { }, toAmino(message: StoreKVPair): StoreKVPairAmino { const obj: any = {}; - obj.store_key = message.storeKey; - obj.delete = message.delete; + obj.store_key = message.storeKey === "" ? undefined : message.storeKey; + obj.delete = message.delete === false ? undefined : message.delete; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/base/tendermint/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/base/tendermint/v1beta1/query.ts index f3630c25cf..e27447c1b3 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/base/tendermint/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/base/tendermint/v1beta1/query.ts @@ -311,7 +311,7 @@ export const GetValidatorSetByHeightRequest = { }, toAmino(message: GetValidatorSetByHeightRequest): GetValidatorSetByHeightRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -448,11 +448,11 @@ export const GetValidatorSetByHeightResponse = { }, toAmino(message: GetValidatorSetByHeightResponse): GetValidatorSetByHeightResponseAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -686,11 +686,11 @@ export const GetLatestValidatorSetResponse = { }, toAmino(message: GetLatestValidatorSetResponse): GetLatestValidatorSetResponseAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -840,10 +840,10 @@ export const Validator = { }, toAmino(message: Validator): ValidatorAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority !== BigInt(0) ? message.proposerPriority.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -939,7 +939,7 @@ export const GetBlockByHeightRequest = { }, toAmino(message: GetBlockByHeightRequest): GetBlockByHeightRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: GetBlockByHeightRequestAminoMsg): GetBlockByHeightRequest { @@ -1411,7 +1411,7 @@ export const GetSyncingResponse = { }, toAmino(message: GetSyncingResponse): GetSyncingResponseAmino { const obj: any = {}; - obj.syncing = message.syncing; + obj.syncing = message.syncing === false ? undefined : message.syncing; return obj; }, fromAminoMsg(object: GetSyncingResponseAminoMsg): GetSyncingResponse { @@ -1812,18 +1812,18 @@ export const VersionInfo = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.app_name = message.appName === "" ? undefined : message.appName; + obj.version = message.version === "" ? undefined : message.version; + obj.git_commit = message.gitCommit === "" ? undefined : message.gitCommit; + obj.build_tags = message.buildTags === "" ? undefined : message.buildTags; + obj.go_version = message.goVersion === "" ? undefined : message.goVersion; if (message.buildDeps) { obj.build_deps = message.buildDeps.map(e => e ? Module.toAmino(e) : undefined); } else { - obj.build_deps = []; + obj.build_deps = message.buildDeps; } - obj.cosmos_sdk_version = message.cosmosSdkVersion; + obj.cosmos_sdk_version = message.cosmosSdkVersion === "" ? undefined : message.cosmosSdkVersion; return obj; }, fromAminoMsg(object: VersionInfoAminoMsg): VersionInfo { @@ -1949,9 +1949,9 @@ export const Module = { }, toAmino(message: Module): ModuleAmino { const obj: any = {}; - obj.path = message.path; - obj.version = message.version; - obj.sum = message.sum; + obj.path = message.path === "" ? undefined : message.path; + obj.version = message.version === "" ? undefined : message.version; + obj.sum = message.sum === "" ? undefined : message.sum; return obj; }, fromAminoMsg(object: ModuleAminoMsg): Module { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/base/v1beta1/coin.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/base/v1beta1/coin.ts index 9f3ca4c968..4ff5ee250a 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/base/v1beta1/coin.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/base/v1beta1/coin.ts @@ -158,8 +158,8 @@ export const Coin = { }, toAmino(message: Coin): CoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: CoinAminoMsg): Coin { @@ -269,8 +269,8 @@ export const DecCoin = { }, toAmino(message: DecCoin): DecCoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: DecCoinAminoMsg): DecCoin { @@ -364,7 +364,7 @@ export const IntProto = { }, toAmino(message: IntProto): IntProtoAmino { const obj: any = {}; - obj.int = message.int; + obj.int = message.int === "" ? undefined : message.int; return obj; }, fromAminoMsg(object: IntProtoAminoMsg): IntProto { @@ -458,7 +458,7 @@ export const DecProto = { }, toAmino(message: DecProto): DecProtoAmino { const obj: any = {}; - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; return obj; }, fromAminoMsg(object: DecProtoAminoMsg): DecProto { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/capability/v1beta1/capability.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/capability/v1beta1/capability.ts index 2e46e5e4a5..6b7d06d10b 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/capability/v1beta1/capability.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/capability/v1beta1/capability.ts @@ -128,7 +128,7 @@ export const Capability = { }, toAmino(message: Capability): CapabilityAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; return obj; }, fromAminoMsg(object: CapabilityAminoMsg): Capability { @@ -238,8 +238,8 @@ export const Owner = { }, toAmino(message: Owner): OwnerAmino { const obj: any = {}; - obj.module = message.module; - obj.name = message.name; + obj.module = message.module === "" ? undefined : message.module; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: OwnerAminoMsg): Owner { @@ -342,7 +342,7 @@ export const CapabilityOwners = { if (message.owners) { obj.owners = message.owners.map(e => e ? Owner.toAmino(e) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/capability/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/capability/v1beta1/genesis.ts index 0d27dc8b08..9d53937e94 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/capability/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/capability/v1beta1/genesis.ts @@ -126,7 +126,7 @@ export const GenesisOwners = { }, toAmino(message: GenesisOwners): GenesisOwnersAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.index_owners = message.indexOwners ? CapabilityOwners.toAmino(message.indexOwners) : undefined; return obj; }, @@ -245,11 +245,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; if (message.owners) { obj.owners = message.owners.map(e => e ? GenesisOwners.toAmino(e) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/crisis/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/crisis/v1beta1/tx.ts index 24773ba8c6..d7d8a0d9f6 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/crisis/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/crisis/v1beta1/tx.ts @@ -126,9 +126,9 @@ export const MsgVerifyInvariant = { }, toAmino(message: MsgVerifyInvariant): MsgVerifyInvariantAmino { const obj: any = {}; - obj.sender = message.sender; - obj.invariant_module_name = message.invariantModuleName; - obj.invariant_route = message.invariantRoute; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.invariant_module_name = message.invariantModuleName === "" ? undefined : message.invariantModuleName; + obj.invariant_route = message.invariantRoute === "" ? undefined : message.invariantRoute; return obj; }, fromAminoMsg(object: MsgVerifyInvariantAminoMsg): MsgVerifyInvariant { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/hd/v1/hd.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/hd/v1/hd.ts index cacd6c2bf9..e6b9131273 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/hd/v1/hd.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/hd/v1/hd.ts @@ -162,11 +162,11 @@ export const BIP44Params = { }, 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; + obj.purpose = message.purpose === 0 ? undefined : message.purpose; + obj.coin_type = message.coinType === 0 ? undefined : message.coinType; + obj.account = message.account === 0 ? undefined : message.account; + obj.change = message.change === false ? undefined : message.change; + obj.address_index = message.addressIndex === 0 ? undefined : message.addressIndex; return obj; }, fromAminoMsg(object: BIP44ParamsAminoMsg): BIP44Params { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/keyring/v1/record.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/keyring/v1/record.ts index fbe16f825d..0afcc743c5 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/keyring/v1/record.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/keyring/v1/record.ts @@ -238,7 +238,7 @@ export const Record = { }, toAmino(message: Record): RecordAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : 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; @@ -356,7 +356,7 @@ export const Record_Local = { 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; + obj.priv_key_type = message.privKeyType === "" ? undefined : message.privKeyType; return obj; }, fromAminoMsg(object: Record_LocalAminoMsg): Record_Local { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/multisig/keys.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/multisig/keys.ts index c44dff19a6..aabd5a7261 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/multisig/keys.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/multisig/keys.ts @@ -115,11 +115,11 @@ export const LegacyAminoPubKey = { }, toAmino(message: LegacyAminoPubKey): LegacyAminoPubKeyAmino { const obj: any = {}; - obj.threshold = message.threshold; + obj.threshold = message.threshold === 0 ? undefined : message.threshold; if (message.publicKeys) { obj.public_keys = message.publicKeys.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.public_keys = []; + obj.public_keys = message.publicKeys; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/multisig/v1beta1/multisig.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/multisig/v1beta1/multisig.ts index f14d457ff2..2066e7f759 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/multisig/v1beta1/multisig.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/crypto/multisig/v1beta1/multisig.ts @@ -123,7 +123,7 @@ export const MultiSignature = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -234,7 +234,7 @@ export const CompactBitArray = { }, toAmino(message: CompactBitArray): CompactBitArrayAmino { const obj: any = {}; - obj.extra_bits_stored = message.extraBitsStored; + obj.extra_bits_stored = message.extraBitsStored === 0 ? undefined : message.extraBitsStored; obj.elems = message.elems ? base64FromBytes(message.elems) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/distribution.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/distribution.ts index bacce079b9..5313c8c869 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/distribution.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/distribution.ts @@ -386,10 +386,10 @@ export const Params = { }, 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; + obj.community_tax = message.communityTax === "" ? undefined : message.communityTax; + obj.base_proposer_reward = message.baseProposerReward === "" ? undefined : message.baseProposerReward; + obj.bonus_proposer_reward = message.bonusProposerReward === "" ? undefined : message.bonusProposerReward; + obj.withdraw_addr_enabled = message.withdrawAddrEnabled === false ? undefined : message.withdrawAddrEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -508,9 +508,9 @@ export const ValidatorHistoricalRewards = { if (message.cumulativeRewardRatio) { obj.cumulative_reward_ratio = message.cumulativeRewardRatio.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.cumulative_reward_ratio = []; + obj.cumulative_reward_ratio = message.cumulativeRewardRatio; } - obj.reference_count = message.referenceCount; + obj.reference_count = message.referenceCount === 0 ? undefined : message.referenceCount; return obj; }, fromAminoMsg(object: ValidatorHistoricalRewardsAminoMsg): ValidatorHistoricalRewards { @@ -631,9 +631,9 @@ export const ValidatorCurrentRewards = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } - obj.period = message.period ? message.period.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorCurrentRewardsAminoMsg): ValidatorCurrentRewards { @@ -736,7 +736,7 @@ export const ValidatorAccumulatedCommission = { if (message.commission) { obj.commission = message.commission.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.commission = []; + obj.commission = message.commission; } return obj; }, @@ -840,7 +840,7 @@ export const ValidatorOutstandingRewards = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, @@ -953,8 +953,8 @@ export const ValidatorSlashEvent = { }, toAmino(message: ValidatorSlashEvent): ValidatorSlashEventAmino { const obj: any = {}; - obj.validator_period = message.validatorPeriod ? message.validatorPeriod.toString() : undefined; - obj.fraction = message.fraction; + obj.validator_period = message.validatorPeriod !== BigInt(0) ? message.validatorPeriod.toString() : undefined; + obj.fraction = message.fraction === "" ? undefined : message.fraction; return obj; }, fromAminoMsg(object: ValidatorSlashEventAminoMsg): ValidatorSlashEvent { @@ -1057,7 +1057,7 @@ export const ValidatorSlashEvents = { if (message.validatorSlashEvents) { obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEvent.toAmino(e) : undefined); } else { - obj.validator_slash_events = []; + obj.validator_slash_events = message.validatorSlashEvents; } return obj; }, @@ -1161,7 +1161,7 @@ export const FeePool = { if (message.communityPool) { obj.community_pool = message.communityPool.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.community_pool = []; + obj.community_pool = message.communityPool; } return obj; }, @@ -1310,13 +1310,13 @@ export const CommunityPoolSpendProposal = { }, toAmino(message: CommunityPoolSpendProposal): CommunityPoolSpendProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.recipient = message.recipient; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.recipient = message.recipient === "" ? undefined : message.recipient; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -1447,9 +1447,9 @@ export const DelegatorStartingInfo = { }, 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; + obj.previous_period = message.previousPeriod !== BigInt(0) ? message.previousPeriod.toString() : undefined; + obj.stake = message.stake === "" ? undefined : message.stake; + obj.height = message.height ? message.height.toString() : "0"; return obj; }, fromAminoMsg(object: DelegatorStartingInfoAminoMsg): DelegatorStartingInfo { @@ -1565,11 +1565,11 @@ export const DelegationDelegatorReward = { }, toAmino(message: DelegationDelegatorReward): DelegationDelegatorRewardAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.reward) { obj.reward = message.reward.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.reward = []; + obj.reward = message.reward; } return obj; }, @@ -1728,11 +1728,11 @@ export const CommunityPoolSpendProposalWithDeposit = { }, 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; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.recipient = message.recipient === "" ? undefined : message.recipient; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.deposit = message.deposit === "" ? undefined : message.deposit; return obj; }, fromAminoMsg(object: CommunityPoolSpendProposalWithDepositAminoMsg): CommunityPoolSpendProposalWithDeposit { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/genesis.ts index 889c9cd594..eccbb020af 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/genesis.ts @@ -272,8 +272,8 @@ export const DelegatorWithdrawInfo = { }, toAmino(message: DelegatorWithdrawInfo): DelegatorWithdrawInfoAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.withdraw_address = message.withdrawAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: DelegatorWithdrawInfoAminoMsg): DelegatorWithdrawInfo { @@ -389,11 +389,11 @@ export const ValidatorOutstandingRewardsRecord = { }, toAmino(message: ValidatorOutstandingRewardsRecord): ValidatorOutstandingRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.outstandingRewards) { obj.outstanding_rewards = message.outstandingRewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.outstanding_rewards = []; + obj.outstanding_rewards = message.outstandingRewards; } return obj; }, @@ -506,7 +506,7 @@ export const ValidatorAccumulatedCommissionRecord = { }, toAmino(message: ValidatorAccumulatedCommissionRecord): ValidatorAccumulatedCommissionRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.accumulated = message.accumulated ? ValidatorAccumulatedCommission.toAmino(message.accumulated) : undefined; return obj; }, @@ -637,8 +637,8 @@ export const ValidatorHistoricalRewardsRecord = { }, toAmino(message: ValidatorHistoricalRewardsRecord): ValidatorHistoricalRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.period = message.period ? message.period.toString() : undefined; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; obj.rewards = message.rewards ? ValidatorHistoricalRewards.toAmino(message.rewards) : undefined; return obj; }, @@ -751,7 +751,7 @@ export const ValidatorCurrentRewardsRecord = { }, toAmino(message: ValidatorCurrentRewardsRecord): ValidatorCurrentRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.rewards = message.rewards ? ValidatorCurrentRewards.toAmino(message.rewards) : undefined; return obj; }, @@ -880,8 +880,8 @@ export const DelegatorStartingInfoRecord = { }, toAmino(message: DelegatorStartingInfoRecord): DelegatorStartingInfoRecordAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.starting_info = message.startingInfo ? DelegatorStartingInfo.toAmino(message.startingInfo) : undefined; return obj; }, @@ -1030,9 +1030,9 @@ export const ValidatorSlashEventRecord = { }, 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_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; obj.validator_slash_event = message.validatorSlashEvent ? ValidatorSlashEvent.toAmino(message.validatorSlashEvent) : undefined; return obj; }, @@ -1322,38 +1322,38 @@ export const GenesisState = { if (message.delegatorWithdrawInfos) { obj.delegator_withdraw_infos = message.delegatorWithdrawInfos.map(e => e ? DelegatorWithdrawInfo.toAmino(e) : undefined); } else { - obj.delegator_withdraw_infos = []; + obj.delegator_withdraw_infos = message.delegatorWithdrawInfos; } - obj.previous_proposer = message.previousProposer; + obj.previous_proposer = message.previousProposer === "" ? undefined : message.previousProposer; if (message.outstandingRewards) { obj.outstanding_rewards = message.outstandingRewards.map(e => e ? ValidatorOutstandingRewardsRecord.toAmino(e) : undefined); } else { - obj.outstanding_rewards = []; + obj.outstanding_rewards = message.outstandingRewards; } if (message.validatorAccumulatedCommissions) { obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions.map(e => e ? ValidatorAccumulatedCommissionRecord.toAmino(e) : undefined); } else { - obj.validator_accumulated_commissions = []; + obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions; } if (message.validatorHistoricalRewards) { obj.validator_historical_rewards = message.validatorHistoricalRewards.map(e => e ? ValidatorHistoricalRewardsRecord.toAmino(e) : undefined); } else { - obj.validator_historical_rewards = []; + obj.validator_historical_rewards = message.validatorHistoricalRewards; } if (message.validatorCurrentRewards) { obj.validator_current_rewards = message.validatorCurrentRewards.map(e => e ? ValidatorCurrentRewardsRecord.toAmino(e) : undefined); } else { - obj.validator_current_rewards = []; + obj.validator_current_rewards = message.validatorCurrentRewards; } if (message.delegatorStartingInfos) { obj.delegator_starting_infos = message.delegatorStartingInfos.map(e => e ? DelegatorStartingInfoRecord.toAmino(e) : undefined); } else { - obj.delegator_starting_infos = []; + obj.delegator_starting_infos = message.delegatorStartingInfos; } if (message.validatorSlashEvents) { obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEventRecord.toAmino(e) : undefined); } else { - obj.validator_slash_events = []; + obj.validator_slash_events = message.validatorSlashEvents; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/query.ts index 8730a7d871..b86c0725a9 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/query.ts @@ -580,7 +580,7 @@ export const QueryValidatorOutstandingRewardsRequest = { }, toAmino(message: QueryValidatorOutstandingRewardsRequest): QueryValidatorOutstandingRewardsRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryValidatorOutstandingRewardsRequestAminoMsg): QueryValidatorOutstandingRewardsRequest { @@ -770,7 +770,7 @@ export const QueryValidatorCommissionRequest = { }, toAmino(message: QueryValidatorCommissionRequest): QueryValidatorCommissionRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryValidatorCommissionRequestAminoMsg): QueryValidatorCommissionRequest { @@ -1014,9 +1014,9 @@ export const QueryValidatorSlashesRequest = { }, 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.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.starting_height = message.startingHeight !== BigInt(0) ? message.startingHeight.toString() : undefined; + obj.ending_height = message.endingHeight !== BigInt(0) ? message.endingHeight.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1138,7 +1138,7 @@ export const QueryValidatorSlashesResponse = { if (message.slashes) { obj.slashes = message.slashes.map(e => e ? ValidatorSlashEvent.toAmino(e) : undefined); } else { - obj.slashes = []; + obj.slashes = message.slashes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1250,8 +1250,8 @@ export const QueryDelegationRewardsRequest = { }, toAmino(message: QueryDelegationRewardsRequest): QueryDelegationRewardsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryDelegationRewardsRequestAminoMsg): QueryDelegationRewardsRequest { @@ -1354,7 +1354,7 @@ export const QueryDelegationRewardsResponse = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, @@ -1449,7 +1449,7 @@ export const QueryDelegationTotalRewardsRequest = { }, toAmino(message: QueryDelegationTotalRewardsRequest): QueryDelegationTotalRewardsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegationTotalRewardsRequestAminoMsg): QueryDelegationTotalRewardsRequest { @@ -1574,12 +1574,12 @@ export const QueryDelegationTotalRewardsResponse = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DelegationDelegatorReward.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } if (message.total) { obj.total = message.total.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.total = []; + obj.total = message.total; } return obj; }, @@ -1674,7 +1674,7 @@ export const QueryDelegatorValidatorsRequest = { }, toAmino(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegatorValidatorsRequestAminoMsg): QueryDelegatorValidatorsRequest { @@ -1777,7 +1777,7 @@ export const QueryDelegatorValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e); } else { - obj.validators = []; + obj.validators = message.validators; } return obj; }, @@ -1872,7 +1872,7 @@ export const QueryDelegatorWithdrawAddressRequest = { }, toAmino(message: QueryDelegatorWithdrawAddressRequest): QueryDelegatorWithdrawAddressRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegatorWithdrawAddressRequestAminoMsg): QueryDelegatorWithdrawAddressRequest { @@ -1966,7 +1966,7 @@ export const QueryDelegatorWithdrawAddressResponse = { }, toAmino(message: QueryDelegatorWithdrawAddressResponse): QueryDelegatorWithdrawAddressResponseAmino { const obj: any = {}; - obj.withdraw_address = message.withdrawAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: QueryDelegatorWithdrawAddressResponseAminoMsg): QueryDelegatorWithdrawAddressResponse { @@ -2143,7 +2143,7 @@ export const QueryCommunityPoolResponse = { if (message.pool) { obj.pool = message.pool.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.pool = []; + obj.pool = message.pool; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/tx.amino.ts index c7d34e047d..a1a0dd4ca3 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/tx.amino.ts @@ -110,7 +110,7 @@ export const AminoConverter = { depositor }: MsgFundCommunityPoolAminoType["value"]): MsgFundCommunityPool => { return { - amount: amount.map(el0 => ({ + amount: amount.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })), diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/tx.ts index e65e001e9c..4c4e7aab5e 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/distribution/v1beta1/tx.ts @@ -205,8 +205,8 @@ export const MsgSetWithdrawAddress = { }, toAmino(message: MsgSetWithdrawAddress): MsgSetWithdrawAddressAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.withdraw_address = message.withdrawAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: MsgSetWithdrawAddressAminoMsg): MsgSetWithdrawAddress { @@ -390,8 +390,8 @@ export const MsgWithdrawDelegatorReward = { }, toAmino(message: MsgWithdrawDelegatorReward): MsgWithdrawDelegatorRewardAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: MsgWithdrawDelegatorRewardAminoMsg): MsgWithdrawDelegatorReward { @@ -494,7 +494,7 @@ export const MsgWithdrawDelegatorRewardResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -589,7 +589,7 @@ export const MsgWithdrawValidatorCommission = { }, toAmino(message: MsgWithdrawValidatorCommission): MsgWithdrawValidatorCommissionAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: MsgWithdrawValidatorCommissionAminoMsg): MsgWithdrawValidatorCommission { @@ -692,7 +692,7 @@ export const MsgWithdrawValidatorCommissionResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -812,9 +812,9 @@ export const MsgFundCommunityPool = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.depositor = message.depositor; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: MsgFundCommunityPoolAminoMsg): MsgFundCommunityPool { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/evidence.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/evidence.ts index 52251debe1..fd98bae28c 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/evidence.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/evidence.ts @@ -147,10 +147,10 @@ export const Equivocation = { }, toAmino(message: Equivocation): EquivocationAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.power = message.power ? message.power.toString() : undefined; - obj.consensus_address = message.consensusAddress; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; + obj.consensus_address = message.consensusAddress === "" ? undefined : message.consensusAddress; return obj; }, fromAminoMsg(object: EquivocationAminoMsg): Equivocation { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/genesis.ts index 36f4ac6267..0f9af10194 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/genesis.ts @@ -93,7 +93,7 @@ export const GenesisState = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/query.ts index 10fdce2c79..ff8e98afc0 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/query.ts @@ -452,7 +452,7 @@ export const QueryAllEvidenceResponse = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/tx.amino.ts index 8cf0ca70d6..fb52bfc0c1 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/tx.amino.ts @@ -32,7 +32,7 @@ export const AminoConverter = { }: MsgSubmitEvidenceAminoType["value"]): MsgSubmitEvidence => { return { submitter, - evidence: { + evidence: evidence == null ? evidence : { typeUrl: evidence.type_url, value: evidence.value } diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/tx.ts index 69828a460d..dad536bebf 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/evidence/v1beta1/tx.ts @@ -122,7 +122,7 @@ export const MsgSubmitEvidence = { }, toAmino(message: MsgSubmitEvidence): MsgSubmitEvidenceAmino { const obj: any = {}; - obj.submitter = message.submitter; + obj.submitter = message.submitter === "" ? undefined : message.submitter; obj.evidence = message.evidence ? Any.toAmino(message.evidence) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/feegrant.ts index 19615801a1..a6646039c5 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/feegrant.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/feegrant.ts @@ -201,7 +201,7 @@ export const BasicAllowance = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -382,12 +382,12 @@ export const PeriodicAllowance = { if (message.periodSpendLimit) { obj.period_spend_limit = message.periodSpendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.period_spend_limit = []; + obj.period_spend_limit = message.periodSpendLimit; } if (message.periodCanSpend) { obj.period_can_spend = message.periodCanSpend.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.period_can_spend = []; + obj.period_can_spend = message.periodCanSpend; } obj.period_reset = message.periodReset ? Timestamp.toAmino(toTimestamp(message.periodReset)) : undefined; return obj; @@ -511,7 +511,7 @@ export const AllowedMsgAllowance = { if (message.allowedMessages) { obj.allowed_messages = message.allowedMessages.map(e => e); } else { - obj.allowed_messages = []; + obj.allowed_messages = message.allowedMessages; } return obj; }, @@ -640,8 +640,8 @@ export const Grant = { }, toAmino(message: Grant): GrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.allowance = message.allowance ? Any.toAmino(message.allowance) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/genesis.ts index 824ca6b8c0..fcf07fd608 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/query.ts index 5358ca37bc..98978433d2 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/query.ts @@ -179,8 +179,8 @@ export const QueryAllowanceRequest = { }, toAmino(message: QueryAllowanceRequest): QueryAllowanceRequestAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; return obj; }, fromAminoMsg(object: QueryAllowanceRequestAminoMsg): QueryAllowanceRequest { @@ -388,7 +388,7 @@ export const QueryAllowancesRequest = { }, toAmino(message: QueryAllowancesRequest): QueryAllowancesRequestAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -510,7 +510,7 @@ export const QueryAllowancesResponse = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -624,7 +624,7 @@ export const QueryAllowancesByGranterRequest = { }, toAmino(message: QueryAllowancesByGranterRequest): QueryAllowancesByGranterRequestAmino { const obj: any = {}; - obj.granter = message.granter; + obj.granter = message.granter === "" ? undefined : message.granter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -746,7 +746,7 @@ export const QueryAllowancesByGranterResponse = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/tx.amino.ts index c376a3917b..0b4271eece 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/tx.amino.ts @@ -44,7 +44,7 @@ export const AminoConverter = { return { granter, grantee, - allowance: { + allowance: allowance == null ? allowance : { typeUrl: allowance.type_url, value: allowance.value } diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/tx.ts index 591229f21b..0dcc83f50e 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/feegrant/v1beta1/tx.ts @@ -162,8 +162,8 @@ export const MsgGrantAllowance = { }, toAmino(message: MsgGrantAllowance): MsgGrantAllowanceAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.allowance = message.allowance ? Any.toAmino(message.allowance) : undefined; return obj; }, @@ -348,8 +348,8 @@ export const MsgRevokeAllowance = { }, toAmino(message: MsgRevokeAllowance): MsgRevokeAllowanceAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; return obj; }, fromAminoMsg(object: MsgRevokeAllowanceAminoMsg): MsgRevokeAllowance { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/genutil/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/genutil/v1beta1/genesis.ts index 338baea52b..5bedc0a94f 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/genutil/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/genutil/v1beta1/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.genTxs) { obj.gen_txs = message.genTxs.map(e => base64FromBytes(e)); } else { - obj.gen_txs = []; + obj.gen_txs = message.genTxs; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/genesis.ts index e47bb162c4..0d917dde42 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/genesis.ts @@ -224,21 +224,21 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + obj.starting_proposal_id = message.startingProposalId !== BigInt(0) ? message.startingProposalId.toString() : undefined; if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/gov.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/gov.ts index 43e111b1b0..b308c32d54 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/gov.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/gov.ts @@ -385,7 +385,7 @@ export const WeightedVoteOption = { fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { const message = createBaseWeightedVoteOption(); if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.weight !== undefined && object.weight !== null) { message.weight = object.weight; @@ -394,8 +394,8 @@ export const WeightedVoteOption = { }, toAmino(message: WeightedVoteOption): WeightedVoteOptionAmino { const obj: any = {}; - obj.option = message.option; - obj.weight = message.weight; + obj.option = message.option === 0 ? undefined : message.option; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption { @@ -529,12 +529,12 @@ export const Deposit = { }, toAmino(message: Deposit): DepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -764,7 +764,7 @@ export const Proposal = { } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -789,24 +789,24 @@ export const Proposal = { }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.status = message.status; + obj.status = message.status === 0 ? undefined : message.status; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined; if (message.totalDeposit) { obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_deposit = []; + obj.total_deposit = message.totalDeposit; } obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined; obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined; - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: ProposalAminoMsg): Proposal { @@ -948,10 +948,10 @@ export const TallyResult = { }, 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; + obj.yes_count = message.yesCount === "" ? undefined : message.yesCount; + obj.abstain_count = message.abstainCount === "" ? undefined : message.abstainCount; + obj.no_count = message.noCount === "" ? undefined : message.noCount; + obj.no_with_veto_count = message.noWithVetoCount === "" ? undefined : message.noWithVetoCount; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -1101,14 +1101,14 @@ export const Vote = { }, toAmino(message: Vote): VoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: VoteAminoMsg): Vote { @@ -1229,7 +1229,7 @@ export const DepositParams = { if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; return obj; @@ -1453,9 +1453,9 @@ export const TallyParams = { }, toAmino(message: TallyParams): TallyParamsAmino { const obj: any = {}; - obj.quorum = message.quorum; - obj.threshold = message.threshold; - obj.veto_threshold = message.vetoThreshold; + obj.quorum = message.quorum === "" ? undefined : message.quorum; + obj.threshold = message.threshold === "" ? undefined : message.threshold; + obj.veto_threshold = message.vetoThreshold === "" ? undefined : message.vetoThreshold; return obj; }, fromAminoMsg(object: TallyParamsAminoMsg): TallyParams { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/query.ts index a27d904205..ff094623c0 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/query.ts @@ -324,7 +324,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -549,7 +549,7 @@ export const QueryProposalsRequest = { fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { const message = createBaseQueryProposalsRequest(); if (object.proposal_status !== undefined && object.proposal_status !== null) { - message.proposalStatus = proposalStatusFromJSON(object.proposal_status); + message.proposalStatus = object.proposal_status; } if (object.voter !== undefined && object.voter !== null) { message.voter = object.voter; @@ -564,9 +564,9 @@ export const QueryProposalsRequest = { }, toAmino(message: QueryProposalsRequest): QueryProposalsRequestAmino { const obj: any = {}; - obj.proposal_status = message.proposalStatus; - obj.voter = message.voter; - obj.depositor = message.depositor; + obj.proposal_status = message.proposalStatus === 0 ? undefined : message.proposalStatus; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.depositor = message.depositor === "" ? undefined : message.depositor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -688,7 +688,7 @@ export const QueryProposalsResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -802,8 +802,8 @@ export const QueryVoteRequest = { }, toAmino(message: QueryVoteRequest): QueryVoteRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest { @@ -1013,7 +1013,7 @@ export const QueryVotesRequest = { }, toAmino(message: QueryVotesRequest): QueryVotesRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1135,7 +1135,7 @@ export const QueryVotesResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1231,7 +1231,7 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.params_type = message.paramsType; + obj.params_type = message.paramsType === "" ? undefined : message.paramsType; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -1477,8 +1477,8 @@ export const QueryDepositRequest = { }, toAmino(message: QueryDepositRequest): QueryDepositRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest { @@ -1688,7 +1688,7 @@ export const QueryDepositsRequest = { }, toAmino(message: QueryDepositsRequest): QueryDepositsRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1810,7 +1810,7 @@ export const QueryDepositsResponse = { if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1908,7 +1908,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/tx.amino.ts index 7c0115740a..d58fc08fa7 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/tx.amino.ts @@ -89,11 +89,11 @@ export const AminoConverter = { metadata }: MsgSubmitProposalAminoType["value"]): MsgSubmitProposal => { return { - messages: messages.map(el0 => ({ + messages: messages.map?.(el0 => ({ typeUrl: el0.type_url, value: el0.value })), - initialDeposit: initial_deposit.map(el0 => ({ + initialDeposit: initial_deposit.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })), @@ -121,7 +121,7 @@ export const AminoConverter = { authority }: MsgExecLegacyContentAminoType["value"]): MsgExecLegacyContent => { return { - content: { + content: content == null ? content : { typeUrl: content.type_url, value: content.value }, @@ -138,7 +138,7 @@ export const AminoConverter = { metadata }: MsgVote): MsgVoteAminoType["value"] => { return { - proposal_id: proposalId.toString(), + proposal_id: proposalId?.toString?.(), voter, option, metadata @@ -151,9 +151,9 @@ export const AminoConverter = { metadata }: MsgVoteAminoType["value"]): MsgVote => { return { - proposalId: BigInt(proposal_id), + proposalId: proposal_id == null ? proposal_id : BigInt(proposal_id), voter, - option: voteOptionFromJSON(option), + option: option == null ? option : voteOptionFromJSON(option), metadata }; } @@ -167,7 +167,7 @@ export const AminoConverter = { metadata }: MsgVoteWeighted): MsgVoteWeightedAminoType["value"] => { return { - proposal_id: proposalId.toString(), + proposal_id: proposalId?.toString?.(), voter, options: options.map(el0 => ({ option: el0.option, @@ -183,10 +183,10 @@ export const AminoConverter = { metadata }: MsgVoteWeightedAminoType["value"]): MsgVoteWeighted => { return { - proposalId: BigInt(proposal_id), + proposalId: proposal_id == null ? proposal_id : BigInt(proposal_id), voter, - options: options.map(el0 => ({ - option: voteOptionFromJSON(el0.option), + options: options.map?.(el0 => ({ + option: el0.option == null ? el0.option : voteOptionFromJSON(el0.option), weight: el0.weight })), metadata @@ -201,7 +201,7 @@ export const AminoConverter = { amount }: MsgDeposit): MsgDepositAminoType["value"] => { return { - proposal_id: proposalId.toString(), + proposal_id: proposalId?.toString?.(), depositor, amount: amount.map(el0 => ({ denom: el0.denom, @@ -215,9 +215,9 @@ export const AminoConverter = { amount }: MsgDepositAminoType["value"]): MsgDeposit => { return { - proposalId: BigInt(proposal_id), + proposalId: proposal_id == null ? proposal_id : BigInt(proposal_id), depositor, - amount: amount.map(el0 => ({ + amount: amount.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })) diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/tx.ts index 5f27415353..ce4992c22c 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1/tx.ts @@ -279,15 +279,15 @@ export const MsgSubmitProposal = { if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; - obj.metadata = message.metadata; + obj.proposer = message.proposer === "" ? undefined : message.proposer; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -383,7 +383,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -496,7 +496,7 @@ export const MsgExecLegacyContent = { toAmino(message: MsgExecLegacyContent): MsgExecLegacyContentAmino { const obj: any = {}; obj.content = message.content ? Any.toAmino(message.content) : undefined; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; return obj; }, fromAminoMsg(object: MsgExecLegacyContentAminoMsg): MsgExecLegacyContent { @@ -705,7 +705,7 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; @@ -714,10 +714,10 @@ export const MsgVote = { }, 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.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -941,14 +941,14 @@ export const MsgVoteWeighted = { }, toAmino(message: MsgVoteWeighted): MsgVoteWeightedAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgVoteWeightedAminoMsg): MsgVoteWeighted { @@ -1156,12 +1156,12 @@ export const MsgDeposit = { }, toAmino(message: MsgDeposit): MsgDepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/genesis.ts index 64a7502011..b3be36ca4f 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/genesis.ts @@ -224,21 +224,21 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + obj.starting_proposal_id = message.startingProposalId !== BigInt(0) ? message.startingProposalId.toString() : undefined; if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/gov.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/gov.ts index 5238555073..8f979c59c0 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/gov.ts @@ -418,7 +418,7 @@ export const WeightedVoteOption = { fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { const message = createBaseWeightedVoteOption(); if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.weight !== undefined && object.weight !== null) { message.weight = object.weight; @@ -427,8 +427,8 @@ export const WeightedVoteOption = { }, toAmino(message: WeightedVoteOption): WeightedVoteOptionAmino { const obj: any = {}; - obj.option = message.option; - obj.weight = message.weight; + obj.option = message.option === 0 ? undefined : message.option; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption { @@ -538,8 +538,8 @@ export const TextProposal = { }, toAmino(message: TextProposal): TextProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: TextProposalAminoMsg): TextProposal { @@ -673,12 +673,12 @@ export const Deposit = { }, toAmino(message: Deposit): DepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -891,7 +891,7 @@ export const Proposal = { message.content = Any.fromAmino(object.content); } if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -913,16 +913,16 @@ export const Proposal = { }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.content = message.content ? Any.toAmino(message.content) : undefined; - obj.status = message.status; + obj.status = message.status === 0 ? undefined : message.status; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined; if (message.totalDeposit) { obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_deposit = []; + obj.total_deposit = message.totalDeposit; } obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined; obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined; @@ -1067,10 +1067,10 @@ export const TallyResult = { }, 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; + obj.yes = message.yes === "" ? undefined : message.yes; + obj.abstain = message.abstain === "" ? undefined : message.abstain; + obj.no = message.no === "" ? undefined : message.no; + obj.no_with_veto = message.noWithVeto === "" ? undefined : message.noWithVeto; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -1213,20 +1213,20 @@ export const Vote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } message.options = object.options?.map(e => WeightedVoteOption.fromAmino(e)) || []; return message; }, 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.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -1348,7 +1348,7 @@ export const DepositParams = { if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/query.ts index 88b0f28598..6d6b571cb7 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/query.ts @@ -324,7 +324,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -549,7 +549,7 @@ export const QueryProposalsRequest = { fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { const message = createBaseQueryProposalsRequest(); if (object.proposal_status !== undefined && object.proposal_status !== null) { - message.proposalStatus = proposalStatusFromJSON(object.proposal_status); + message.proposalStatus = object.proposal_status; } if (object.voter !== undefined && object.voter !== null) { message.voter = object.voter; @@ -564,9 +564,9 @@ export const QueryProposalsRequest = { }, toAmino(message: QueryProposalsRequest): QueryProposalsRequestAmino { const obj: any = {}; - obj.proposal_status = message.proposalStatus; - obj.voter = message.voter; - obj.depositor = message.depositor; + obj.proposal_status = message.proposalStatus === 0 ? undefined : message.proposalStatus; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.depositor = message.depositor === "" ? undefined : message.depositor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -688,7 +688,7 @@ export const QueryProposalsResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -802,8 +802,8 @@ export const QueryVoteRequest = { }, toAmino(message: QueryVoteRequest): QueryVoteRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest { @@ -1013,7 +1013,7 @@ export const QueryVotesRequest = { }, toAmino(message: QueryVotesRequest): QueryVotesRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1135,7 +1135,7 @@ export const QueryVotesResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1231,7 +1231,7 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.params_type = message.paramsType; + obj.params_type = message.paramsType === "" ? undefined : message.paramsType; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -1477,8 +1477,8 @@ export const QueryDepositRequest = { }, toAmino(message: QueryDepositRequest): QueryDepositRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest { @@ -1688,7 +1688,7 @@ export const QueryDepositsRequest = { }, toAmino(message: QueryDepositsRequest): QueryDepositsRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1810,7 +1810,7 @@ export const QueryDepositsResponse = { if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1908,7 +1908,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/tx.amino.ts index fad45eaf42..18cd029953 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/tx.amino.ts @@ -2,6 +2,7 @@ import { Any, AnySDKType } from "../../../google/protobuf/any"; import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionSDKType, voteOptionFromJSON } from "./gov"; import { AminoMsg } from "@cosmjs/amino"; +import { omitDefault } from "../../../helpers"; import { MsgSubmitProposal, MsgSubmitProposalSDKType, MsgVote, MsgVoteSDKType, MsgVoteWeighted, MsgVoteWeightedSDKType, MsgDeposit, MsgDepositSDKType } from "./tx"; export interface MsgSubmitProposalAminoType extends AminoMsg { type: "cosmos-sdk/MsgSubmitProposal"; @@ -73,11 +74,11 @@ export const AminoConverter = { proposer }: MsgSubmitProposalAminoType["value"]): MsgSubmitProposal => { return { - content: { + content: content == null ? content : { typeUrl: content.type_url, value: content.value }, - initialDeposit: initial_deposit.map(el0 => ({ + initialDeposit: initial_deposit.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })), @@ -93,7 +94,7 @@ export const AminoConverter = { option }: MsgVote): MsgVoteAminoType["value"] => { return { - proposal_id: proposalId.toString(), + proposal_id: omitDefault(proposalId)?.toString?.(), voter, option }; @@ -104,9 +105,9 @@ export const AminoConverter = { option }: MsgVoteAminoType["value"]): MsgVote => { return { - proposalId: BigInt(proposal_id), + proposalId: proposal_id == null ? proposal_id : BigInt(proposal_id), voter, - option: voteOptionFromJSON(option) + option: option == null ? option : voteOptionFromJSON(option) }; } }, @@ -118,7 +119,7 @@ export const AminoConverter = { options }: MsgVoteWeighted): MsgVoteWeightedAminoType["value"] => { return { - proposal_id: proposalId.toString(), + proposal_id: proposalId?.toString?.(), voter, options: options.map(el0 => ({ option: el0.option, @@ -132,10 +133,10 @@ export const AminoConverter = { options }: MsgVoteWeightedAminoType["value"]): MsgVoteWeighted => { return { - proposalId: BigInt(proposal_id), + proposalId: proposal_id == null ? proposal_id : BigInt(proposal_id), voter, - options: options.map(el0 => ({ - option: voteOptionFromJSON(el0.option), + options: options.map?.(el0 => ({ + option: el0.option == null ? el0.option : voteOptionFromJSON(el0.option), weight: el0.weight })) }; @@ -149,7 +150,7 @@ export const AminoConverter = { amount }: MsgDeposit): MsgDepositAminoType["value"] => { return { - proposal_id: proposalId.toString(), + proposal_id: proposalId?.toString?.(), depositor, amount: amount.map(el0 => ({ denom: el0.denom, @@ -163,9 +164,9 @@ export const AminoConverter = { amount }: MsgDepositAminoType["value"]): MsgDeposit => { return { - proposalId: BigInt(proposal_id), + proposalId: proposal_id == null ? proposal_id : BigInt(proposal_id), depositor, - amount: amount.map(el0 => ({ + amount: amount.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })) diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/tx.ts index 88bf677da2..9e2119fe97 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/gov/v1beta1/tx.ts @@ -239,9 +239,9 @@ export const MsgSubmitProposal = { if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; + obj.proposer = message.proposer === "" ? undefined : message.proposer; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -337,7 +337,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -459,15 +459,15 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } return message; }, 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.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -675,12 +675,12 @@ export const MsgVoteWeighted = { }, toAmino(message: MsgVoteWeighted): MsgVoteWeightedAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -889,12 +889,12 @@ export const MsgDeposit = { }, toAmino(message: MsgDeposit): MsgDepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/events.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/events.ts index 7909d56397..ebcd8c38bd 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/events.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/events.ts @@ -196,7 +196,7 @@ export const EventCreateGroup = { }, toAmino(message: EventCreateGroup): EventCreateGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: EventCreateGroupAminoMsg): EventCreateGroup { @@ -292,7 +292,7 @@ export const EventUpdateGroup = { }, toAmino(message: EventUpdateGroup): EventUpdateGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: EventUpdateGroupAminoMsg): EventUpdateGroup { @@ -386,7 +386,7 @@ export const EventCreateGroupPolicy = { }, toAmino(message: EventCreateGroupPolicy): EventCreateGroupPolicyAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventCreateGroupPolicyAminoMsg): EventCreateGroupPolicy { @@ -480,7 +480,7 @@ export const EventUpdateGroupPolicy = { }, toAmino(message: EventUpdateGroupPolicy): EventUpdateGroupPolicyAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventUpdateGroupPolicyAminoMsg): EventUpdateGroupPolicy { @@ -576,7 +576,7 @@ export const EventSubmitProposal = { }, toAmino(message: EventSubmitProposal): EventSubmitProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventSubmitProposalAminoMsg): EventSubmitProposal { @@ -672,7 +672,7 @@ export const EventWithdrawProposal = { }, toAmino(message: EventWithdrawProposal): EventWithdrawProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventWithdrawProposalAminoMsg): EventWithdrawProposal { @@ -768,7 +768,7 @@ export const EventVote = { }, toAmino(message: EventVote): EventVoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventVoteAminoMsg): EventVote { @@ -874,14 +874,14 @@ export const EventExec = { message.proposalId = BigInt(object.proposal_id); } if (object.result !== undefined && object.result !== null) { - message.result = proposalExecutorResultFromJSON(object.result); + message.result = object.result; } return message; }, toAmino(message: EventExec): EventExecAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.result = message.result; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.result = message.result === 0 ? undefined : message.result; return obj; }, fromAminoMsg(object: EventExecAminoMsg): EventExec { @@ -993,8 +993,8 @@ export const EventLeaveGroup = { }, toAmino(message: EventLeaveGroup): EventLeaveGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.address = message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventLeaveGroupAminoMsg): EventLeaveGroup { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/genesis.ts index 19b463797a..c6880bfa8a 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/genesis.ts @@ -262,33 +262,33 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.group_seq = message.groupSeq ? message.groupSeq.toString() : undefined; + obj.group_seq = message.groupSeq !== BigInt(0) ? message.groupSeq.toString() : undefined; if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } if (message.groupMembers) { obj.group_members = message.groupMembers.map(e => e ? GroupMember.toAmino(e) : undefined); } else { - obj.group_members = []; + obj.group_members = message.groupMembers; } - obj.group_policy_seq = message.groupPolicySeq ? message.groupPolicySeq.toString() : undefined; + obj.group_policy_seq = message.groupPolicySeq !== BigInt(0) ? message.groupPolicySeq.toString() : undefined; if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } - obj.proposal_seq = message.proposalSeq ? message.proposalSeq.toString() : undefined; + obj.proposal_seq = message.proposalSeq !== BigInt(0) ? message.proposalSeq.toString() : undefined; if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/query.ts index 25052fa7db..7b2e5f6f33 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/query.ts @@ -463,7 +463,7 @@ export const QueryGroupInfoRequest = { }, toAmino(message: QueryGroupInfoRequest): QueryGroupInfoRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGroupInfoRequestAminoMsg): QueryGroupInfoRequest { @@ -653,7 +653,7 @@ export const QueryGroupPolicyInfoRequest = { }, toAmino(message: QueryGroupPolicyInfoRequest): QueryGroupPolicyInfoRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryGroupPolicyInfoRequestAminoMsg): QueryGroupPolicyInfoRequest { @@ -863,7 +863,7 @@ export const QueryGroupMembersRequest = { }, toAmino(message: QueryGroupMembersRequest): QueryGroupMembersRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -985,7 +985,7 @@ export const QueryGroupMembersResponse = { if (message.members) { obj.members = message.members.map(e => e ? GroupMember.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1099,7 +1099,7 @@ export const QueryGroupsByAdminRequest = { }, toAmino(message: QueryGroupsByAdminRequest): QueryGroupsByAdminRequestAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1221,7 +1221,7 @@ export const QueryGroupsByAdminResponse = { if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1337,7 +1337,7 @@ export const QueryGroupPoliciesByGroupRequest = { }, toAmino(message: QueryGroupPoliciesByGroupRequest): QueryGroupPoliciesByGroupRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1459,7 +1459,7 @@ export const QueryGroupPoliciesByGroupResponse = { if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1573,7 +1573,7 @@ export const QueryGroupPoliciesByAdminRequest = { }, toAmino(message: QueryGroupPoliciesByAdminRequest): QueryGroupPoliciesByAdminRequestAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1695,7 +1695,7 @@ export const QueryGroupPoliciesByAdminResponse = { if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1793,7 +1793,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -2001,7 +2001,7 @@ export const QueryProposalsByGroupPolicyRequest = { }, toAmino(message: QueryProposalsByGroupPolicyRequest): QueryProposalsByGroupPolicyRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2123,7 +2123,7 @@ export const QueryProposalsByGroupPolicyResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2237,8 +2237,8 @@ export const QueryVoteByProposalVoterRequest = { }, toAmino(message: QueryVoteByProposalVoterRequest): QueryVoteByProposalVoterRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteByProposalVoterRequestAminoMsg): QueryVoteByProposalVoterRequest { @@ -2448,7 +2448,7 @@ export const QueryVotesByProposalRequest = { }, toAmino(message: QueryVotesByProposalRequest): QueryVotesByProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2570,7 +2570,7 @@ export const QueryVotesByProposalResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2684,7 +2684,7 @@ export const QueryVotesByVoterRequest = { }, toAmino(message: QueryVotesByVoterRequest): QueryVotesByVoterRequestAmino { const obj: any = {}; - obj.voter = message.voter; + obj.voter = message.voter === "" ? undefined : message.voter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2806,7 +2806,7 @@ export const QueryVotesByVoterResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2920,7 +2920,7 @@ export const QueryGroupsByMemberRequest = { }, toAmino(message: QueryGroupsByMemberRequest): QueryGroupsByMemberRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -3042,7 +3042,7 @@ export const QueryGroupsByMemberResponse = { if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -3140,7 +3140,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/tx.amino.ts index e44a0f0c10..d7b6ae4079 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/tx.amino.ts @@ -1,6 +1,7 @@ import { Member, MemberSDKType, VoteOption, VoteOptionSDKType, voteOptionFromJSON } from "./types"; import { Any, AnySDKType } from "../../../google/protobuf/any"; import { AminoMsg } from "@cosmjs/amino"; +import { omitDefault } from "../../../helpers"; import { execFromJSON, MsgCreateGroup, MsgCreateGroupSDKType, MsgUpdateGroupMembers, MsgUpdateGroupMembersSDKType, MsgUpdateGroupAdmin, MsgUpdateGroupAdminSDKType, MsgUpdateGroupMetadata, MsgUpdateGroupMetadataSDKType, MsgCreateGroupPolicy, MsgCreateGroupPolicySDKType, MsgCreateGroupWithPolicy, MsgCreateGroupWithPolicySDKType, MsgUpdateGroupPolicyAdmin, MsgUpdateGroupPolicyAdminSDKType, MsgUpdateGroupPolicyDecisionPolicy, MsgUpdateGroupPolicyDecisionPolicySDKType, MsgUpdateGroupPolicyMetadata, MsgUpdateGroupPolicyMetadataSDKType, MsgSubmitProposal, MsgSubmitProposalSDKType, MsgWithdrawProposal, MsgWithdrawProposalSDKType, MsgVote, MsgVoteSDKType, MsgExec, MsgExecSDKType, MsgLeaveGroup, MsgLeaveGroupSDKType } from "./tx"; export interface MsgCreateGroupAminoType extends AminoMsg { type: "cosmos-sdk/MsgCreateGroup"; @@ -172,7 +173,7 @@ export const AminoConverter = { }: MsgCreateGroupAminoType["value"]): MsgCreateGroup => { return { admin, - members: members.map(el0 => ({ + members: members.map?.(el0 => ({ address: el0.address, weight: el0.weight, metadata: el0.metadata, @@ -191,7 +192,7 @@ export const AminoConverter = { }: MsgUpdateGroupMembers): MsgUpdateGroupMembersAminoType["value"] => { return { admin, - group_id: groupId.toString(), + group_id: omitDefault(groupId)?.toString?.(), member_updates: memberUpdates.map(el0 => ({ address: el0.address, weight: el0.weight, @@ -207,8 +208,8 @@ export const AminoConverter = { }: MsgUpdateGroupMembersAminoType["value"]): MsgUpdateGroupMembers => { return { admin, - groupId: BigInt(group_id), - memberUpdates: member_updates.map(el0 => ({ + groupId: group_id == null ? group_id : BigInt(group_id), + memberUpdates: member_updates.map?.(el0 => ({ address: el0.address, weight: el0.weight, metadata: el0.metadata, @@ -226,7 +227,7 @@ export const AminoConverter = { }: MsgUpdateGroupAdmin): MsgUpdateGroupAdminAminoType["value"] => { return { admin, - group_id: groupId.toString(), + group_id: omitDefault(groupId)?.toString?.(), new_admin: newAdmin }; }, @@ -237,7 +238,7 @@ export const AminoConverter = { }: MsgUpdateGroupAdminAminoType["value"]): MsgUpdateGroupAdmin => { return { admin, - groupId: BigInt(group_id), + groupId: group_id == null ? group_id : BigInt(group_id), newAdmin: new_admin }; } @@ -251,7 +252,7 @@ export const AminoConverter = { }: MsgUpdateGroupMetadata): MsgUpdateGroupMetadataAminoType["value"] => { return { admin, - group_id: groupId.toString(), + group_id: omitDefault(groupId)?.toString?.(), metadata }; }, @@ -262,7 +263,7 @@ export const AminoConverter = { }: MsgUpdateGroupMetadataAminoType["value"]): MsgUpdateGroupMetadata => { return { admin, - groupId: BigInt(group_id), + groupId: group_id == null ? group_id : BigInt(group_id), metadata }; } @@ -277,7 +278,7 @@ export const AminoConverter = { }: MsgCreateGroupPolicy): MsgCreateGroupPolicyAminoType["value"] => { return { admin, - group_id: groupId.toString(), + group_id: omitDefault(groupId)?.toString?.(), metadata, decision_policy: { type_url: decisionPolicy.typeUrl, @@ -293,9 +294,9 @@ export const AminoConverter = { }: MsgCreateGroupPolicyAminoType["value"]): MsgCreateGroupPolicy => { return { admin, - groupId: BigInt(group_id), + groupId: group_id == null ? group_id : BigInt(group_id), metadata, - decisionPolicy: { + decisionPolicy: decision_policy == null ? decision_policy : { typeUrl: decision_policy.type_url, value: decision_policy.value } @@ -322,7 +323,7 @@ export const AminoConverter = { })), group_metadata: groupMetadata, group_policy_metadata: groupPolicyMetadata, - group_policy_as_admin: groupPolicyAsAdmin, + group_policy_as_admin: omitDefault(groupPolicyAsAdmin), decision_policy: { type_url: decisionPolicy.typeUrl, value: decisionPolicy.value @@ -339,7 +340,7 @@ export const AminoConverter = { }: MsgCreateGroupWithPolicyAminoType["value"]): MsgCreateGroupWithPolicy => { return { admin, - members: members.map(el0 => ({ + members: members.map?.(el0 => ({ address: el0.address, weight: el0.weight, metadata: el0.metadata, @@ -348,7 +349,7 @@ export const AminoConverter = { groupMetadata: group_metadata, groupPolicyMetadata: group_policy_metadata, groupPolicyAsAdmin: group_policy_as_admin, - decisionPolicy: { + decisionPolicy: decision_policy == null ? decision_policy : { typeUrl: decision_policy.type_url, value: decision_policy.value } @@ -404,7 +405,7 @@ export const AminoConverter = { return { admin, address, - decisionPolicy: { + decisionPolicy: decision_policy == null ? decision_policy : { typeUrl: decision_policy.type_url, value: decision_policy.value } @@ -467,11 +468,11 @@ export const AminoConverter = { address, proposers, metadata, - messages: messages.map(el0 => ({ + messages: messages.map?.(el0 => ({ typeUrl: el0.type_url, value: el0.value })), - exec: execFromJSON(exec) + exec: exec == null ? exec : execFromJSON(exec) }; } }, @@ -482,7 +483,7 @@ export const AminoConverter = { address }: MsgWithdrawProposal): MsgWithdrawProposalAminoType["value"] => { return { - proposal_id: proposalId.toString(), + proposal_id: omitDefault(proposalId)?.toString?.(), address }; }, @@ -491,7 +492,7 @@ export const AminoConverter = { address }: MsgWithdrawProposalAminoType["value"]): MsgWithdrawProposal => { return { - proposalId: BigInt(proposal_id), + proposalId: proposal_id == null ? proposal_id : BigInt(proposal_id), address }; } @@ -506,7 +507,7 @@ export const AminoConverter = { exec }: MsgVote): MsgVoteAminoType["value"] => { return { - proposal_id: proposalId.toString(), + proposal_id: omitDefault(proposalId)?.toString?.(), voter, option, metadata, @@ -521,11 +522,11 @@ export const AminoConverter = { exec }: MsgVoteAminoType["value"]): MsgVote => { return { - proposalId: BigInt(proposal_id), + proposalId: proposal_id == null ? proposal_id : BigInt(proposal_id), voter, - option: voteOptionFromJSON(option), + option: option == null ? option : voteOptionFromJSON(option), metadata, - exec: execFromJSON(exec) + exec: exec == null ? exec : execFromJSON(exec) }; } }, @@ -536,7 +537,7 @@ export const AminoConverter = { signer }: MsgExec): MsgExecAminoType["value"] => { return { - proposal_id: proposalId.toString(), + proposal_id: omitDefault(proposalId)?.toString?.(), signer }; }, @@ -545,7 +546,7 @@ export const AminoConverter = { signer }: MsgExecAminoType["value"]): MsgExec => { return { - proposalId: BigInt(proposal_id), + proposalId: proposal_id == null ? proposal_id : BigInt(proposal_id), signer }; } @@ -558,7 +559,7 @@ export const AminoConverter = { }: MsgLeaveGroup): MsgLeaveGroupAminoType["value"] => { return { address, - group_id: groupId.toString() + group_id: omitDefault(groupId)?.toString?.() }; }, fromAmino: ({ @@ -567,7 +568,7 @@ export const AminoConverter = { }: MsgLeaveGroupAminoType["value"]): MsgLeaveGroup => { return { address, - groupId: BigInt(group_id) + groupId: group_id == null ? group_id : BigInt(group_id) }; } } diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/tx.ts index 0b8c64eeed..50c88e1588 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/tx.ts @@ -581,13 +581,13 @@ export const MsgCreateGroup = { }, toAmino(message: MsgCreateGroup): MsgCreateGroupAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgCreateGroupAminoMsg): MsgCreateGroup { @@ -683,7 +683,7 @@ export const MsgCreateGroupResponse = { }, toAmino(message: MsgCreateGroupResponse): MsgCreateGroupResponseAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateGroupResponseAminoMsg): MsgCreateGroupResponse { @@ -817,12 +817,12 @@ export const MsgUpdateGroupMembers = { }, toAmino(message: MsgUpdateGroupMembers): MsgUpdateGroupMembersAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; if (message.memberUpdates) { obj.member_updates = message.memberUpdates.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.member_updates = []; + obj.member_updates = message.memberUpdates; } return obj; }, @@ -1025,9 +1025,9 @@ export const MsgUpdateGroupAdmin = { }, 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; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgUpdateGroupAdminAminoMsg): MsgUpdateGroupAdmin { @@ -1229,9 +1229,9 @@ export const MsgUpdateGroupMetadata = { }, toAmino(message: MsgUpdateGroupMetadata): MsgUpdateGroupMetadataAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgUpdateGroupMetadataAminoMsg): MsgUpdateGroupMetadata { @@ -1451,9 +1451,9 @@ export const MsgCreateGroupPolicy = { }, 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.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; return obj; }, @@ -1548,7 +1548,7 @@ export const MsgCreateGroupPolicyResponse = { }, toAmino(message: MsgCreateGroupPolicyResponse): MsgCreateGroupPolicyResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: MsgCreateGroupPolicyResponseAminoMsg): MsgCreateGroupPolicyResponse { @@ -1674,9 +1674,9 @@ export const MsgUpdateGroupPolicyAdmin = { }, toAmino(message: MsgUpdateGroupPolicyAdmin): MsgUpdateGroupPolicyAdminAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; - obj.new_admin = message.newAdmin; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgUpdateGroupPolicyAdminAminoMsg): MsgUpdateGroupPolicyAdmin { @@ -1858,15 +1858,15 @@ export const MsgCreateGroupWithPolicy = { }, toAmino(message: MsgCreateGroupWithPolicy): MsgCreateGroupWithPolicyAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } - obj.group_metadata = message.groupMetadata; - obj.group_policy_metadata = message.groupPolicyMetadata; - obj.group_policy_as_admin = message.groupPolicyAsAdmin; + obj.group_metadata = message.groupMetadata === "" ? undefined : message.groupMetadata; + obj.group_policy_metadata = message.groupPolicyMetadata === "" ? undefined : message.groupPolicyMetadata; + obj.group_policy_as_admin = message.groupPolicyAsAdmin === false ? undefined : message.groupPolicyAsAdmin; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; return obj; }, @@ -1979,8 +1979,8 @@ export const MsgCreateGroupWithPolicyResponse = { }, toAmino(message: MsgCreateGroupWithPolicyResponse): MsgCreateGroupWithPolicyResponseAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.group_policy_address = message.groupPolicyAddress; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.group_policy_address = message.groupPolicyAddress === "" ? undefined : message.groupPolicyAddress; return obj; }, fromAminoMsg(object: MsgCreateGroupWithPolicyResponseAminoMsg): MsgCreateGroupWithPolicyResponse { @@ -2182,8 +2182,8 @@ export const MsgUpdateGroupPolicyDecisionPolicy = { }, toAmino(message: MsgUpdateGroupPolicyDecisionPolicy): MsgUpdateGroupPolicyDecisionPolicyAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; return obj; }, @@ -2384,9 +2384,9 @@ export const MsgUpdateGroupPolicyMetadata = { }, toAmino(message: MsgUpdateGroupPolicyMetadata): MsgUpdateGroupPolicyMetadataAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgUpdateGroupPolicyMetadataAminoMsg): MsgUpdateGroupPolicyMetadata { @@ -2624,25 +2624,25 @@ export const MsgSubmitProposal = { } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; if (object.exec !== undefined && object.exec !== null) { - message.exec = execFromJSON(object.exec); + message.exec = object.exec; } return message; }, toAmino(message: MsgSubmitProposal): MsgSubmitProposalAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.proposers) { obj.proposers = message.proposers.map(e => e); } else { - obj.proposers = []; + obj.proposers = message.proposers; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.exec = message.exec; + obj.exec = message.exec === 0 ? undefined : message.exec; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -2738,7 +2738,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -2850,8 +2850,8 @@ export const MsgWithdrawProposal = { }, toAmino(message: MsgWithdrawProposal): MsgWithdrawProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.address = message.address; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: MsgWithdrawProposalAminoMsg): MsgWithdrawProposal { @@ -3073,23 +3073,23 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; } if (object.exec !== undefined && object.exec !== null) { - message.exec = execFromJSON(object.exec); + message.exec = object.exec; } return message; }, 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; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.exec = message.exec === 0 ? undefined : message.exec; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -3275,8 +3275,8 @@ export const MsgExec = { }, toAmino(message: MsgExec): MsgExecAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.signer = message.signer; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgExecAminoMsg): MsgExec { @@ -3462,8 +3462,8 @@ export const MsgLeaveGroup = { }, toAmino(message: MsgLeaveGroup): MsgLeaveGroupAmino { const obj: any = {}; - obj.address = message.address; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLeaveGroupAminoMsg): MsgLeaveGroup { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/types.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/types.ts index d1105e2a16..276eed1f6f 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/types.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/group/v1/types.ts @@ -643,9 +643,9 @@ export const Member = { }, toAmino(message: Member): MemberAmino { const obj: any = {}; - obj.address = message.address; - obj.weight = message.weight; - obj.metadata = message.metadata; + obj.address = message.address === "" ? undefined : message.address; + obj.weight = message.weight === "" ? undefined : message.weight; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.added_at = message.addedAt ? Timestamp.toAmino(toTimestamp(message.addedAt)) : undefined; return obj; }, @@ -749,7 +749,7 @@ export const Members = { if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } return obj; }, @@ -862,7 +862,7 @@ export const ThresholdDecisionPolicy = { }, toAmino(message: ThresholdDecisionPolicy): ThresholdDecisionPolicyAmino { const obj: any = {}; - obj.threshold = message.threshold; + obj.threshold = message.threshold === "" ? undefined : message.threshold; obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined; return obj; }, @@ -975,7 +975,7 @@ export const PercentageDecisionPolicy = { }, toAmino(message: PercentageDecisionPolicy): PercentageDecisionPolicyAmino { const obj: any = {}; - obj.percentage = message.percentage; + obj.percentage = message.percentage === "" ? undefined : message.percentage; obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined; return obj; }, @@ -1269,11 +1269,11 @@ export const GroupInfo = { }, 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.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; obj.created_at = message.createdAt ? Timestamp.toAmino(toTimestamp(message.createdAt)) : undefined; return obj; }, @@ -1388,7 +1388,7 @@ export const GroupMember = { }, toAmino(message: GroupMember): GroupMemberAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.member = message.member ? Member.toAmino(message.member) : undefined; return obj; }, @@ -1585,11 +1585,11 @@ export const GroupPolicyInfo = { }, 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.address = message.address === "" ? undefined : message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; obj.created_at = message.createdAt ? Timestamp.toAmino(toTimestamp(message.createdAt)) : undefined; return obj; @@ -1878,10 +1878,10 @@ export const Proposal = { message.groupPolicyVersion = BigInt(object.group_policy_version); } if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.result !== undefined && object.result !== null) { - message.result = proposalResultFromJSON(object.result); + message.result = object.result; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -1890,33 +1890,33 @@ export const Proposal = { message.votingPeriodEnd = fromTimestamp(Timestamp.fromAmino(object.voting_period_end)); } if (object.executor_result !== undefined && object.executor_result !== null) { - message.executorResult = proposalExecutorResultFromJSON(object.executor_result); + message.executorResult = object.executor_result; } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; return message; }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.address = message.address; - obj.metadata = message.metadata; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.metadata = message.metadata === "" ? undefined : message.metadata; if (message.proposers) { obj.proposers = message.proposers.map(e => e); } else { - obj.proposers = []; + obj.proposers = message.proposers; } obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; - 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.group_version = message.groupVersion !== BigInt(0) ? message.groupVersion.toString() : undefined; + obj.group_policy_version = message.groupPolicyVersion !== BigInt(0) ? message.groupPolicyVersion.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.result = message.result === 0 ? undefined : message.result; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.voting_period_end = message.votingPeriodEnd ? Timestamp.toAmino(toTimestamp(message.votingPeriodEnd)) : undefined; - obj.executor_result = message.executorResult; + obj.executor_result = message.executorResult === 0 ? undefined : message.executorResult; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } return obj; }, @@ -2059,10 +2059,10 @@ export const TallyResult = { }, 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; + obj.yes_count = message.yesCount === "" ? undefined : message.yesCount; + obj.abstain_count = message.abstainCount === "" ? undefined : message.abstainCount; + obj.no_count = message.noCount === "" ? undefined : message.noCount; + obj.no_with_veto_count = message.noWithVetoCount === "" ? undefined : message.noWithVetoCount; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -2210,7 +2210,7 @@ export const Vote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; @@ -2222,10 +2222,10 @@ export const Vote = { }, 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.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/mint/v1beta1/mint.ts index 5527a7d541..369098833b 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/mint/v1beta1/mint.ts @@ -131,8 +131,8 @@ export const Minter = { }, toAmino(message: Minter): MinterAmino { const obj: any = {}; - obj.inflation = message.inflation; - obj.annual_provisions = message.annualProvisions; + obj.inflation = message.inflation === "" ? undefined : message.inflation; + obj.annual_provisions = message.annualProvisions === "" ? undefined : message.annualProvisions; return obj; }, fromAminoMsg(object: MinterAminoMsg): Minter { @@ -308,12 +308,12 @@ export const Params = { }, 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; + obj.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; + obj.inflation_rate_change = message.inflationRateChange === "" ? undefined : message.inflationRateChange; + obj.inflation_max = message.inflationMax === "" ? undefined : message.inflationMax; + obj.inflation_min = message.inflationMin === "" ? undefined : message.inflationMin; + obj.goal_bonded = message.goalBonded === "" ? undefined : message.goalBonded; + obj.blocks_per_year = message.blocksPerYear !== BigInt(0) ? message.blocksPerYear.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/event.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/event.ts index b267dbd9ae..87da093e56 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/event.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/event.ts @@ -168,10 +168,10 @@ export const EventSend = { }, toAmino(message: EventSend): EventSendAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: EventSendAminoMsg): EventSend { @@ -297,9 +297,9 @@ export const EventMint = { }, toAmino(message: EventMint): EventMintAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: EventMintAminoMsg): EventMint { @@ -425,9 +425,9 @@ export const EventBurn = { }, toAmino(message: EventBurn): EventBurnAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: EventBurnAminoMsg): EventBurn { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/genesis.ts index 7c2d6e70bc..b29ffad4c9 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/genesis.ts @@ -133,12 +133,12 @@ export const GenesisState = { if (message.classes) { obj.classes = message.classes.map(e => e ? Class.toAmino(e) : undefined); } else { - obj.classes = []; + obj.classes = message.classes; } if (message.entries) { obj.entries = message.entries.map(e => e ? Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -255,11 +255,11 @@ export const Entry = { }, toAmino(message: Entry): EntryAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; if (message.nfts) { obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e) : undefined); } else { - obj.nfts = []; + obj.nfts = message.nfts; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/nft.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/nft.ts index e02d6d51a0..5dd51cf4aa 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/nft.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/nft.ts @@ -225,12 +225,12 @@ export const Class = { }, 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.id = message.id === "" ? undefined : message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.symbol = message.symbol === "" ? undefined : message.symbol; + obj.description = message.description === "" ? undefined : message.description; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; obj.data = message.data ? Any.toAmino(message.data) : undefined; return obj; }, @@ -391,10 +391,10 @@ export const NFT = { }, 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.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; obj.data = message.data ? Any.toAmino(message.data) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/query.ts index 6ea94ad1d9..f871471cd2 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/query.ts @@ -271,8 +271,8 @@ export const QueryBalanceRequest = { }, toAmino(message: QueryBalanceRequest): QueryBalanceRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest { @@ -368,7 +368,7 @@ export const QueryBalanceResponse = { }, toAmino(message: QueryBalanceResponse): QueryBalanceResponseAmino { const obj: any = {}; - obj.amount = message.amount ? message.amount.toString() : undefined; + obj.amount = message.amount !== BigInt(0) ? message.amount.toString() : undefined; return obj; }, fromAminoMsg(object: QueryBalanceResponseAminoMsg): QueryBalanceResponse { @@ -478,8 +478,8 @@ export const QueryOwnerRequest = { }, toAmino(message: QueryOwnerRequest): QueryOwnerRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: QueryOwnerRequestAminoMsg): QueryOwnerRequest { @@ -573,7 +573,7 @@ export const QueryOwnerResponse = { }, toAmino(message: QueryOwnerResponse): QueryOwnerResponseAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryOwnerResponseAminoMsg): QueryOwnerResponse { @@ -667,7 +667,7 @@ export const QuerySupplyRequest = { }, toAmino(message: QuerySupplyRequest): QuerySupplyRequestAmino { const obj: any = {}; - obj.class_id = message.classId; + obj.class_id = message.classId === "" ? undefined : message.classId; return obj; }, fromAminoMsg(object: QuerySupplyRequestAminoMsg): QuerySupplyRequest { @@ -763,7 +763,7 @@ export const QuerySupplyResponse = { }, toAmino(message: QuerySupplyResponse): QuerySupplyResponseAmino { const obj: any = {}; - obj.amount = message.amount ? message.amount.toString() : undefined; + obj.amount = message.amount !== BigInt(0) ? message.amount.toString() : undefined; return obj; }, fromAminoMsg(object: QuerySupplyResponseAminoMsg): QuerySupplyResponse { @@ -891,8 +891,8 @@ export const QueryNFTsRequest = { }, toAmino(message: QueryNFTsRequest): QueryNFTsRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.owner = message.owner === "" ? undefined : message.owner; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1014,7 +1014,7 @@ export const QueryNFTsResponse = { if (message.nfts) { obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e) : undefined); } else { - obj.nfts = []; + obj.nfts = message.nfts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1126,8 +1126,8 @@ export const QueryNFTRequest = { }, toAmino(message: QueryNFTRequest): QueryNFTRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: QueryNFTRequestAminoMsg): QueryNFTRequest { @@ -1317,7 +1317,7 @@ export const QueryClassRequest = { }, toAmino(message: QueryClassRequest): QueryClassRequestAmino { const obj: any = {}; - obj.class_id = message.classId; + obj.class_id = message.classId === "" ? undefined : message.classId; return obj; }, fromAminoMsg(object: QueryClassRequestAminoMsg): QueryClassRequest { @@ -1630,7 +1630,7 @@ export const QueryClassesResponse = { if (message.classes) { obj.classes = message.classes.map(e => e ? Class.toAmino(e) : undefined); } else { - obj.classes = []; + obj.classes = message.classes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/tx.ts index 186e9a0201..ab63449137 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/nft/v1beta1/tx.ts @@ -148,10 +148,10 @@ export const MsgSend = { }, toAmino(message: MsgSend): MsgSendAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: MsgSendAminoMsg): MsgSend { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/orm/v1/orm.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/orm/v1/orm.ts index 2d809b43d0..eb484d838c 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/orm/v1/orm.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/orm/v1/orm.ts @@ -238,9 +238,9 @@ export const TableDescriptor = { if (message.index) { obj.index = message.index.map(e => e ? SecondaryIndexDescriptor.toAmino(e) : undefined); } else { - obj.index = []; + obj.index = message.index; } - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: TableDescriptorAminoMsg): TableDescriptor { @@ -350,8 +350,8 @@ export const PrimaryKeyDescriptor = { }, toAmino(message: PrimaryKeyDescriptor): PrimaryKeyDescriptorAmino { const obj: any = {}; - obj.fields = message.fields; - obj.auto_increment = message.autoIncrement; + obj.fields = message.fields === "" ? undefined : message.fields; + obj.auto_increment = message.autoIncrement === false ? undefined : message.autoIncrement; return obj; }, fromAminoMsg(object: PrimaryKeyDescriptorAminoMsg): PrimaryKeyDescriptor { @@ -477,9 +477,9 @@ export const SecondaryIndexDescriptor = { }, toAmino(message: SecondaryIndexDescriptor): SecondaryIndexDescriptorAmino { const obj: any = {}; - obj.fields = message.fields; - obj.id = message.id; - obj.unique = message.unique; + obj.fields = message.fields === "" ? undefined : message.fields; + obj.id = message.id === 0 ? undefined : message.id; + obj.unique = message.unique === false ? undefined : message.unique; return obj; }, fromAminoMsg(object: SecondaryIndexDescriptorAminoMsg): SecondaryIndexDescriptor { @@ -573,7 +573,7 @@ export const SingletonDescriptor = { }, toAmino(message: SingletonDescriptor): SingletonDescriptorAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: SingletonDescriptorAminoMsg): SingletonDescriptor { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/orm/v1alpha1/schema.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/orm/v1alpha1/schema.ts index 614fecb785..d84ff52617 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/orm/v1alpha1/schema.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/orm/v1alpha1/schema.ts @@ -227,7 +227,7 @@ export const ModuleSchemaDescriptor = { if (message.schemaFile) { obj.schema_file = message.schemaFile.map(e => e ? ModuleSchemaDescriptor_FileEntry.toAmino(e) : undefined); } else { - obj.schema_file = []; + obj.schema_file = message.schemaFile; } obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; @@ -349,15 +349,15 @@ export const ModuleSchemaDescriptor_FileEntry = { message.protoFileName = object.proto_file_name; } if (object.storage_type !== undefined && object.storage_type !== null) { - message.storageType = storageTypeFromJSON(object.storage_type); + message.storageType = object.storage_type; } return message; }, toAmino(message: ModuleSchemaDescriptor_FileEntry): ModuleSchemaDescriptor_FileEntryAmino { const obj: any = {}; - obj.id = message.id; - obj.proto_file_name = message.protoFileName; - obj.storage_type = message.storageType; + obj.id = message.id === 0 ? undefined : message.id; + obj.proto_file_name = message.protoFileName === "" ? undefined : message.protoFileName; + obj.storage_type = message.storageType === 0 ? undefined : message.storageType; return obj; }, fromAminoMsg(object: ModuleSchemaDescriptor_FileEntryAminoMsg): ModuleSchemaDescriptor_FileEntry { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/params/v1beta1/params.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/params/v1beta1/params.ts index c9f0c8cefc..031eba73c0 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/params/v1beta1/params.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/params/v1beta1/params.ts @@ -146,12 +146,12 @@ export const ParameterChangeProposal = { }, toAmino(message: ParameterChangeProposal): ParameterChangeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.changes) { obj.changes = message.changes.map(e => e ? ParamChange.toAmino(e) : undefined); } else { - obj.changes = []; + obj.changes = message.changes; } return obj; }, @@ -278,9 +278,9 @@ export const ParamChange = { }, toAmino(message: ParamChange): ParamChangeAmino { const obj: any = {}; - obj.subspace = message.subspace; - obj.key = message.key; - obj.value = message.value; + obj.subspace = message.subspace === "" ? undefined : message.subspace; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: ParamChangeAminoMsg): ParamChange { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/params/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/params/v1beta1/query.ts index 7da530343e..84d9c1302f 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/params/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/params/v1beta1/query.ts @@ -168,8 +168,8 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.subspace = message.subspace; - obj.key = message.key; + obj.subspace = message.subspace === "" ? undefined : message.subspace; + obj.key = message.key === "" ? undefined : message.key; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -442,7 +442,7 @@ export const QuerySubspacesResponse = { if (message.subspaces) { obj.subspaces = message.subspaces.map(e => e ? Subspace.toAmino(e) : undefined); } else { - obj.subspaces = []; + obj.subspaces = message.subspaces; } return obj; }, @@ -559,11 +559,11 @@ export const Subspace = { }, toAmino(message: Subspace): SubspaceAmino { const obj: any = {}; - obj.subspace = message.subspace; + obj.subspace = message.subspace === "" ? undefined : message.subspace; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/genesis.ts index 224bcbaf3b..c5a03f1532 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/genesis.ts @@ -200,12 +200,12 @@ export const GenesisState = { if (message.signingInfos) { obj.signing_infos = message.signingInfos.map(e => e ? SigningInfo.toAmino(e) : undefined); } else { - obj.signing_infos = []; + obj.signing_infos = message.signingInfos; } if (message.missedBlocks) { obj.missed_blocks = message.missedBlocks.map(e => e ? ValidatorMissedBlocks.toAmino(e) : undefined); } else { - obj.missed_blocks = []; + obj.missed_blocks = message.missedBlocks; } return obj; }, @@ -318,7 +318,7 @@ export const SigningInfo = { }, toAmino(message: SigningInfo): SigningInfoAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.validator_signing_info = message.validatorSigningInfo ? ValidatorSigningInfo.toAmino(message.validatorSigningInfo) : undefined; return obj; }, @@ -435,11 +435,11 @@ export const ValidatorMissedBlocks = { }, toAmino(message: ValidatorMissedBlocks): ValidatorMissedBlocksAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.missedBlocks) { obj.missed_blocks = message.missedBlocks.map(e => e ? MissedBlock.toAmino(e) : undefined); } else { - obj.missed_blocks = []; + obj.missed_blocks = message.missedBlocks; } return obj; }, @@ -552,8 +552,8 @@ export const MissedBlock = { }, toAmino(message: MissedBlock): MissedBlockAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; - obj.missed = message.missed; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; + obj.missed = message.missed === false ? undefined : message.missed; return obj; }, fromAminoMsg(object: MissedBlockAminoMsg): MissedBlock { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/query.ts index 9ef7b4337a..45dac2b073 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/query.ts @@ -339,7 +339,7 @@ export const QuerySigningInfoRequest = { }, toAmino(message: QuerySigningInfoRequest): QuerySigningInfoRequestAmino { const obj: any = {}; - obj.cons_address = message.consAddress; + obj.cons_address = message.consAddress === "" ? undefined : message.consAddress; return obj; }, fromAminoMsg(object: QuerySigningInfoRequestAminoMsg): QuerySigningInfoRequest { @@ -652,7 +652,7 @@ export const QuerySigningInfosResponse = { if (message.info) { obj.info = message.info.map(e => e ? ValidatorSigningInfo.toAmino(e) : undefined); } else { - obj.info = []; + obj.info = message.info; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/slashing.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/slashing.ts index cf19b468a1..e1f9756e10 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/slashing.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/slashing.ts @@ -221,12 +221,12 @@ export const ValidatorSigningInfo = { }, 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.address = message.address === "" ? undefined : message.address; + obj.start_height = message.startHeight !== BigInt(0) ? message.startHeight.toString() : undefined; + obj.index_offset = message.indexOffset !== BigInt(0) ? message.indexOffset.toString() : undefined; obj.jailed_until = message.jailedUntil ? Timestamp.toAmino(toTimestamp(message.jailedUntil)) : undefined; - obj.tombstoned = message.tombstoned; - obj.missed_blocks_counter = message.missedBlocksCounter ? message.missedBlocksCounter.toString() : undefined; + obj.tombstoned = message.tombstoned === false ? undefined : message.tombstoned; + obj.missed_blocks_counter = message.missedBlocksCounter !== BigInt(0) ? message.missedBlocksCounter.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorSigningInfoAminoMsg): ValidatorSigningInfo { @@ -388,7 +388,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.signed_blocks_window = message.signedBlocksWindow ? message.signedBlocksWindow.toString() : undefined; + obj.signed_blocks_window = message.signedBlocksWindow !== BigInt(0) ? message.signedBlocksWindow.toString() : undefined; obj.min_signed_per_window = message.minSignedPerWindow ? base64FromBytes(message.minSignedPerWindow) : undefined; obj.downtime_jail_duration = message.downtimeJailDuration ? Duration.toAmino(message.downtimeJailDuration) : undefined; obj.slash_fraction_double_sign = message.slashFractionDoubleSign ? base64FromBytes(message.slashFractionDoubleSign) : undefined; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/tx.ts index 9a9294f90e..95d3b99a07 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/slashing/v1beta1/tx.ts @@ -90,7 +90,7 @@ export const MsgUnjail = { }, toAmino(message: MsgUnjail): MsgUnjailAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr ?? ""; return obj; }, fromAminoMsg(object: MsgUnjailAminoMsg): MsgUnjail { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/authz.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/authz.ts index 621f68c7b0..c068fd6167 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/authz.ts @@ -219,7 +219,7 @@ export const StakeAuthorization = { message.denyList = StakeAuthorization_Validators.fromAmino(object.deny_list); } if (object.authorization_type !== undefined && object.authorization_type !== null) { - message.authorizationType = authorizationTypeFromJSON(object.authorization_type); + message.authorizationType = object.authorization_type; } return message; }, @@ -228,7 +228,7 @@ export const StakeAuthorization = { 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; + obj.authorization_type = message.authorizationType === 0 ? undefined : message.authorizationType; return obj; }, fromAminoMsg(object: StakeAuthorizationAminoMsg): StakeAuthorization { @@ -331,7 +331,7 @@ export const StakeAuthorization_Validators = { if (message.address) { obj.address = message.address.map(e => e); } else { - obj.address = []; + obj.address = message.address; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/genesis.ts index 0fad7d8290..0c34e2d307 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/genesis.ts @@ -275,29 +275,29 @@ export const GenesisState = { if (message.lastValidatorPowers) { obj.last_validator_powers = message.lastValidatorPowers.map(e => e ? LastValidatorPower.toAmino(e) : undefined); } else { - obj.last_validator_powers = []; + obj.last_validator_powers = message.lastValidatorPowers; } if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } if (message.delegations) { obj.delegations = message.delegations.map(e => e ? Delegation.toAmino(e) : undefined); } else { - obj.delegations = []; + obj.delegations = message.delegations; } if (message.unbondingDelegations) { obj.unbonding_delegations = message.unbondingDelegations.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_delegations = []; + obj.unbonding_delegations = message.unbondingDelegations; } if (message.redelegations) { obj.redelegations = message.redelegations.map(e => e ? Redelegation.toAmino(e) : undefined); } else { - obj.redelegations = []; + obj.redelegations = message.redelegations; } - obj.exported = message.exported; + obj.exported = message.exported === false ? undefined : message.exported; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -409,8 +409,8 @@ export const LastValidatorPower = { }, toAmino(message: LastValidatorPower): LastValidatorPowerAmino { const obj: any = {}; - obj.address = message.address; - obj.power = message.power ? message.power.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: LastValidatorPowerAminoMsg): LastValidatorPower { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/query.ts index ad35bdb607..8949ac7d7c 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/query.ts @@ -605,7 +605,7 @@ export const QueryValidatorsRequest = { }, toAmino(message: QueryValidatorsRequest): QueryValidatorsRequestAmino { const obj: any = {}; - obj.status = message.status; + obj.status = message.status === "" ? undefined : message.status; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -727,7 +727,7 @@ export const QueryValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -823,7 +823,7 @@ export const QueryValidatorRequest = { }, toAmino(message: QueryValidatorRequest): QueryValidatorRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryValidatorRequestAminoMsg): QueryValidatorRequest { @@ -1031,7 +1031,7 @@ export const QueryValidatorDelegationsRequest = { }, toAmino(message: QueryValidatorDelegationsRequest): QueryValidatorDelegationsRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1153,7 +1153,7 @@ export const QueryValidatorDelegationsResponse = { if (message.delegationResponses) { obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_responses = []; + obj.delegation_responses = message.delegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1267,7 +1267,7 @@ export const QueryValidatorUnbondingDelegationsRequest = { }, toAmino(message: QueryValidatorUnbondingDelegationsRequest): QueryValidatorUnbondingDelegationsRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1389,7 +1389,7 @@ export const QueryValidatorUnbondingDelegationsResponse = { if (message.unbondingResponses) { obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_responses = []; + obj.unbonding_responses = message.unbondingResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1501,8 +1501,8 @@ export const QueryDelegationRequest = { }, toAmino(message: QueryDelegationRequest): QueryDelegationRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryDelegationRequestAminoMsg): QueryDelegationRequest { @@ -1708,8 +1708,8 @@ export const QueryUnbondingDelegationRequest = { }, toAmino(message: QueryUnbondingDelegationRequest): QueryUnbondingDelegationRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryUnbondingDelegationRequestAminoMsg): QueryUnbondingDelegationRequest { @@ -1917,7 +1917,7 @@ export const QueryDelegatorDelegationsRequest = { }, toAmino(message: QueryDelegatorDelegationsRequest): QueryDelegatorDelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2039,7 +2039,7 @@ export const QueryDelegatorDelegationsResponse = { if (message.delegationResponses) { obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_responses = []; + obj.delegation_responses = message.delegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2153,7 +2153,7 @@ export const QueryDelegatorUnbondingDelegationsRequest = { }, toAmino(message: QueryDelegatorUnbondingDelegationsRequest): QueryDelegatorUnbondingDelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2275,7 +2275,7 @@ export const QueryDelegatorUnbondingDelegationsResponse = { if (message.unbondingResponses) { obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_responses = []; + obj.unbonding_responses = message.unbondingResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2421,9 +2421,9 @@ export const QueryRedelegationsRequest = { }, 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.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.src_validator_addr = message.srcValidatorAddr === "" ? undefined : message.srcValidatorAddr; + obj.dst_validator_addr = message.dstValidatorAddr === "" ? undefined : message.dstValidatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2545,7 +2545,7 @@ export const QueryRedelegationsResponse = { if (message.redelegationResponses) { obj.redelegation_responses = message.redelegationResponses.map(e => e ? RedelegationResponse.toAmino(e) : undefined); } else { - obj.redelegation_responses = []; + obj.redelegation_responses = message.redelegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2659,7 +2659,7 @@ export const QueryDelegatorValidatorsRequest = { }, toAmino(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2781,7 +2781,7 @@ export const QueryDelegatorValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2893,8 +2893,8 @@ export const QueryDelegatorValidatorRequest = { }, toAmino(message: QueryDelegatorValidatorRequest): QueryDelegatorValidatorRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryDelegatorValidatorRequestAminoMsg): QueryDelegatorValidatorRequest { @@ -3086,7 +3086,7 @@ export const QueryHistoricalInfoRequest = { }, toAmino(message: QueryHistoricalInfoRequest): QueryHistoricalInfoRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: QueryHistoricalInfoRequestAminoMsg): QueryHistoricalInfoRequest { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/staking.ts index a503a1be54..a9f39d7534 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/staking.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/staking.ts @@ -624,7 +624,7 @@ export const HistoricalInfo = { if (message.valset) { obj.valset = message.valset.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.valset = []; + obj.valset = message.valset; } return obj; }, @@ -751,9 +751,9 @@ export const CommissionRates = { }, toAmino(message: CommissionRates): CommissionRatesAmino { const obj: any = {}; - obj.rate = message.rate; - obj.max_rate = message.maxRate; - obj.max_change_rate = message.maxChangeRate; + obj.rate = message.rate === "" ? undefined : message.rate; + obj.max_rate = message.maxRate === "" ? undefined : message.maxRate; + obj.max_change_rate = message.maxChangeRate === "" ? undefined : message.maxChangeRate; return obj; }, fromAminoMsg(object: CommissionRatesAminoMsg): CommissionRates { @@ -1024,11 +1024,11 @@ export const Description = { }, 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; + obj.moniker = message.moniker === "" ? undefined : message.moniker; + obj.identity = message.identity === "" ? undefined : message.identity; + obj.website = message.website === "" ? undefined : message.website; + obj.security_contact = message.securityContact === "" ? undefined : message.securityContact; + obj.details = message.details === "" ? undefined : message.details; return obj; }, fromAminoMsg(object: DescriptionAminoMsg): Description { @@ -1263,7 +1263,7 @@ export const Validator = { message.jailed = object.jailed; } if (object.status !== undefined && object.status !== null) { - message.status = bondStatusFromJSON(object.status); + message.status = object.status; } if (object.tokens !== undefined && object.tokens !== null) { message.tokens = object.tokens; @@ -1290,17 +1290,17 @@ export const Validator = { }, toAmino(message: Validator): ValidatorAmino { const obj: any = {}; - obj.operator_address = message.operatorAddress; + obj.operator_address = message.operatorAddress === "" ? undefined : 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.jailed = message.jailed === false ? undefined : message.jailed; + obj.status = message.status === 0 ? undefined : message.status; + obj.tokens = message.tokens === "" ? undefined : message.tokens; + obj.delegator_shares = message.delegatorShares === "" ? undefined : message.delegatorShares; obj.description = message.description ? Description.toAmino(message.description) : undefined; - obj.unbonding_height = message.unbondingHeight ? message.unbondingHeight.toString() : undefined; + obj.unbonding_height = message.unbondingHeight !== BigInt(0) ? message.unbondingHeight.toString() : undefined; obj.unbonding_time = message.unbondingTime ? Timestamp.toAmino(toTimestamp(message.unbondingTime)) : undefined; obj.commission = message.commission ? Commission.toAmino(message.commission) : undefined; - obj.min_self_delegation = message.minSelfDelegation; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -1403,7 +1403,7 @@ export const ValAddresses = { if (message.addresses) { obj.addresses = message.addresses.map(e => e); } else { - obj.addresses = []; + obj.addresses = message.addresses; } return obj; }, @@ -1514,8 +1514,8 @@ export const DVPair = { }, toAmino(message: DVPair): DVPairAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: DVPairAminoMsg): DVPair { @@ -1618,7 +1618,7 @@ export const DVPairs = { if (message.pairs) { obj.pairs = message.pairs.map(e => e ? DVPair.toAmino(e) : undefined); } else { - obj.pairs = []; + obj.pairs = message.pairs; } return obj; }, @@ -1745,9 +1745,9 @@ export const DVVTriplet = { }, toAmino(message: DVVTriplet): DVVTripletAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; return obj; }, fromAminoMsg(object: DVVTripletAminoMsg): DVVTriplet { @@ -1850,7 +1850,7 @@ export const DVVTriplets = { if (message.triplets) { obj.triplets = message.triplets.map(e => e ? DVVTriplet.toAmino(e) : undefined); } else { - obj.triplets = []; + obj.triplets = message.triplets; } return obj; }, @@ -1977,9 +1977,9 @@ export const Delegation = { }, toAmino(message: Delegation): DelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.shares = message.shares; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.shares = message.shares === "" ? undefined : message.shares; return obj; }, fromAminoMsg(object: DelegationAminoMsg): Delegation { @@ -2111,12 +2111,12 @@ export const UnbondingDelegation = { }, toAmino(message: UnbondingDelegation): UnbondingDelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.entries) { obj.entries = message.entries.map(e => e ? UnbondingDelegationEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2261,10 +2261,10 @@ export const UnbondingDelegationEntry = { }, toAmino(message: UnbondingDelegationEntry): UnbondingDelegationEntryAmino { const obj: any = {}; - obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.creation_height = message.creationHeight !== BigInt(0) ? message.creationHeight.toString() : undefined; obj.completion_time = message.completionTime ? Timestamp.toAmino(toTimestamp(message.completionTime)) : undefined; - obj.initial_balance = message.initialBalance; - obj.balance = message.balance; + obj.initial_balance = message.initialBalance === "" ? undefined : message.initialBalance; + obj.balance = message.balance === "" ? undefined : message.balance; return obj; }, fromAminoMsg(object: UnbondingDelegationEntryAminoMsg): UnbondingDelegationEntry { @@ -2408,10 +2408,10 @@ export const RedelegationEntry = { }, toAmino(message: RedelegationEntry): RedelegationEntryAmino { const obj: any = {}; - obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.creation_height = message.creationHeight !== BigInt(0) ? message.creationHeight.toString() : undefined; obj.completion_time = message.completionTime ? Timestamp.toAmino(toTimestamp(message.completionTime)) : undefined; - obj.initial_balance = message.initialBalance; - obj.shares_dst = message.sharesDst; + obj.initial_balance = message.initialBalance === "" ? undefined : message.initialBalance; + obj.shares_dst = message.sharesDst === "" ? undefined : message.sharesDst; return obj; }, fromAminoMsg(object: RedelegationEntryAminoMsg): RedelegationEntry { @@ -2559,13 +2559,13 @@ export const Redelegation = { }, toAmino(message: Redelegation): RedelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; if (message.entries) { obj.entries = message.entries.map(e => e ? RedelegationEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2743,11 +2743,11 @@ export const Params = { 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; + obj.max_validators = message.maxValidators === 0 ? undefined : message.maxValidators; + obj.max_entries = message.maxEntries === 0 ? undefined : message.maxEntries; + obj.historical_entries = message.historicalEntries === 0 ? undefined : message.historicalEntries; + obj.bond_denom = message.bondDenom === "" ? undefined : message.bondDenom; + obj.min_commission_rate = message.minCommissionRate === "" ? undefined : message.minCommissionRate; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -2975,7 +2975,7 @@ export const RedelegationEntryResponse = { toAmino(message: RedelegationEntryResponse): RedelegationEntryResponseAmino { const obj: any = {}; obj.redelegation_entry = message.redelegationEntry ? RedelegationEntry.toAmino(message.redelegationEntry) : undefined; - obj.balance = message.balance; + obj.balance = message.balance === "" ? undefined : message.balance; return obj; }, fromAminoMsg(object: RedelegationEntryResponseAminoMsg): RedelegationEntryResponse { @@ -3097,7 +3097,7 @@ export const RedelegationResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? RedelegationEntryResponse.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -3208,8 +3208,8 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.not_bonded_tokens = message.notBondedTokens; - obj.bonded_tokens = message.bondedTokens; + obj.not_bonded_tokens = message.notBondedTokens ?? ""; + obj.bonded_tokens = message.bondedTokens ?? ""; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/tx.amino.ts index 86e67cabcd..ba1c07aecb 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/tx.amino.ts @@ -124,14 +124,14 @@ export const AminoConverter = { value }: MsgCreateValidatorAminoType["value"]): MsgCreateValidator => { return { - description: { + description: description == null ? description : { moniker: description.moniker, identity: description.identity, website: description.website, securityContact: description.security_contact, details: description.details }, - commission: { + commission: commission == null ? commission : { rate: commission.rate, maxRate: commission.max_rate, maxChangeRate: commission.max_change_rate @@ -140,7 +140,7 @@ export const AminoConverter = { delegatorAddress: delegator_address, validatorAddress: validator_address, pubkey: encodePubkey(pubkey), - value: { + value: value == null ? value : { denom: value.denom, amount: value.amount } @@ -175,7 +175,7 @@ export const AminoConverter = { min_self_delegation }: MsgEditValidatorAminoType["value"]): MsgEditValidator => { return { - description: { + description: description == null ? description : { moniker: description.moniker, identity: description.identity, website: description.website, @@ -212,7 +212,7 @@ export const AminoConverter = { return { delegatorAddress: delegator_address, validatorAddress: validator_address, - amount: { + amount: amount == null ? amount : { denom: amount.denom, amount: amount.amount } @@ -247,7 +247,7 @@ export const AminoConverter = { delegatorAddress: delegator_address, validatorSrcAddress: validator_src_address, validatorDstAddress: validator_dst_address, - amount: { + amount: amount == null ? amount : { denom: amount.denom, amount: amount.amount } @@ -278,7 +278,7 @@ export const AminoConverter = { return { delegatorAddress: delegator_address, validatorAddress: validator_address, - amount: { + amount: amount == null ? amount : { denom: amount.denom, amount: amount.amount } diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/tx.ts index ba705910f9..d600227701 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/staking/v1beta1/tx.ts @@ -346,9 +346,9 @@ export const MsgCreateValidator = { 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.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; obj.value = message.value ? Coin.toAmino(message.value) : undefined; return obj; @@ -569,9 +569,9 @@ export const MsgEditValidator = { 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; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.commission_rate = message.commissionRate === "" ? undefined : message.commissionRate; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; return obj; }, fromAminoMsg(object: MsgEditValidatorAminoMsg): MsgEditValidator { @@ -773,8 +773,8 @@ export const MsgDelegate = { }, toAmino(message: MsgDelegate): MsgDelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -993,9 +993,9 @@ export const MsgBeginRedelegate = { }, 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.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -1218,8 +1218,8 @@ export const MsgUndelegate = { }, toAmino(message: MsgUndelegate): MsgUndelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/tx/signing/v1beta1/signing.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/tx/signing/v1beta1/signing.ts index 49239110d6..d6f2bf58bb 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/tx/signing/v1beta1/signing.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/tx/signing/v1beta1/signing.ts @@ -258,7 +258,7 @@ export const SignatureDescriptors = { if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor.toAmino(e) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -393,7 +393,7 @@ export const SignatureDescriptor = { 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; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureDescriptorAminoMsg): SignatureDescriptor { @@ -609,7 +609,7 @@ export const SignatureDescriptor_Data_Single = { fromAmino(object: SignatureDescriptor_Data_SingleAmino): SignatureDescriptor_Data_Single { const message = createBaseSignatureDescriptor_Data_Single(); if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.signature !== undefined && object.signature !== null) { message.signature = bytesFromBase64(object.signature); @@ -618,7 +618,7 @@ export const SignatureDescriptor_Data_Single = { }, toAmino(message: SignatureDescriptor_Data_Single): SignatureDescriptor_Data_SingleAmino { const obj: any = {}; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; return obj; }, @@ -741,7 +741,7 @@ export const SignatureDescriptor_Data_Multi = { if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor_Data.toAmino(e) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/tx/v1beta1/service.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/tx/v1beta1/service.ts index 377a4cde9f..4c39105a05 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/tx/v1beta1/service.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/tx/v1beta1/service.ts @@ -438,7 +438,7 @@ export const GetTxsEventRequest = { message.pagination = PageRequest.fromAmino(object.pagination); } if (object.order_by !== undefined && object.order_by !== null) { - message.orderBy = orderByFromJSON(object.order_by); + message.orderBy = object.order_by; } return message; }, @@ -447,10 +447,10 @@ export const GetTxsEventRequest = { if (message.events) { obj.events = message.events.map(e => e); } else { - obj.events = []; + obj.events = message.events; } obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; - obj.order_by = message.orderBy; + obj.order_by = message.orderBy === 0 ? undefined : message.orderBy; return obj; }, fromAminoMsg(object: GetTxsEventRequestAminoMsg): GetTxsEventRequest { @@ -593,12 +593,12 @@ export const GetTxsEventResponse = { if (message.txs) { obj.txs = message.txs.map(e => e ? Tx.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } if (message.txResponses) { obj.tx_responses = message.txResponses.map(e => e ? TxResponse.toAmino(e) : undefined); } else { - obj.tx_responses = []; + obj.tx_responses = message.txResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -704,14 +704,14 @@ export const BroadcastTxRequest = { message.txBytes = bytesFromBase64(object.tx_bytes); } if (object.mode !== undefined && object.mode !== null) { - message.mode = broadcastModeFromJSON(object.mode); + message.mode = object.mode; } return message; }, toAmino(message: BroadcastTxRequest): BroadcastTxRequestAmino { const obj: any = {}; obj.tx_bytes = message.txBytes ? base64FromBytes(message.txBytes) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; return obj; }, fromAminoMsg(object: BroadcastTxRequestAminoMsg): BroadcastTxRequest { @@ -1129,7 +1129,7 @@ export const GetTxRequest = { }, toAmino(message: GetTxRequest): GetTxRequestAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === "" ? undefined : message.hash; return obj; }, fromAminoMsg(object: GetTxRequestAminoMsg): GetTxRequest { @@ -1358,7 +1358,7 @@ export const GetBlockWithTxsRequest = { }, toAmino(message: GetBlockWithTxsRequest): GetBlockWithTxsRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1516,7 +1516,7 @@ export const GetBlockWithTxsResponse = { if (message.txs) { obj.txs = message.txs.map(e => e ? Tx.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.block = message.block ? Block.toAmino(message.block) : undefined; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/tx/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/tx/v1beta1/tx.ts index a169f0e0f9..94569400d1 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/tx/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/tx/v1beta1/tx.ts @@ -556,7 +556,7 @@ export const Tx = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -694,7 +694,7 @@ export const TxRaw = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -841,8 +841,8 @@ export const SignDoc = { const obj: any = {}; obj.body_bytes = message.bodyBytes ? base64FromBytes(message.bodyBytes) : undefined; obj.auth_info_bytes = message.authInfoBytes ? base64FromBytes(message.authInfoBytes) : undefined; - obj.chain_id = message.chainId; - obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; return obj; }, fromAminoMsg(object: SignDocAminoMsg): SignDoc { @@ -1026,9 +1026,9 @@ export const SignDocDirectAux = { const obj: any = {}; obj.body_bytes = message.bodyBytes ? base64FromBytes(message.bodyBytes) : undefined; 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.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined; return obj; }, @@ -1210,19 +1210,19 @@ export const TxBody = { if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.memo = message.memo; - obj.timeout_height = message.timeoutHeight ? message.timeoutHeight.toString() : undefined; + obj.memo = message.memo === "" ? undefined : message.memo; + obj.timeout_height = message.timeoutHeight !== BigInt(0) ? message.timeoutHeight.toString() : undefined; if (message.extensionOptions) { obj.extension_options = message.extensionOptions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extension_options = []; + obj.extension_options = message.extensionOptions; } if (message.nonCriticalExtensionOptions) { obj.non_critical_extension_options = message.nonCriticalExtensionOptions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.non_critical_extension_options = []; + obj.non_critical_extension_options = message.nonCriticalExtensionOptions; } return obj; }, @@ -1362,7 +1362,7 @@ export const AuthInfo = { if (message.signerInfos) { obj.signer_infos = message.signerInfos.map(e => e ? SignerInfo.toAmino(e) : undefined); } else { - obj.signer_infos = []; + obj.signer_infos = message.signerInfos; } obj.fee = message.fee ? Fee.toAmino(message.fee) : undefined; obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined; @@ -1499,7 +1499,7 @@ export const SignerInfo = { 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; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: SignerInfoAminoMsg): SignerInfo { @@ -1702,13 +1702,13 @@ export const ModeInfo_Single = { fromAmino(object: ModeInfo_SingleAmino): ModeInfo_Single { const message = createBaseModeInfo_Single(); if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } return message; }, toAmino(message: ModeInfo_Single): ModeInfo_SingleAmino { const obj: any = {}; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; return obj; }, fromAminoMsg(object: ModeInfo_SingleAminoMsg): ModeInfo_Single { @@ -1830,7 +1830,7 @@ export const ModeInfo_Multi = { if (message.modeInfos) { obj.mode_infos = message.modeInfos.map(e => e ? ModeInfo.toAmino(e) : undefined); } else { - obj.mode_infos = []; + obj.mode_infos = message.modeInfos; } return obj; }, @@ -1984,11 +1984,11 @@ export const Fee = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.gas_limit = message.gasLimit ? message.gasLimit.toString() : undefined; - obj.payer = message.payer; - obj.granter = message.granter; + obj.gas_limit = message.gasLimit !== BigInt(0) ? message.gasLimit.toString() : undefined; + obj.payer = message.payer === "" ? undefined : message.payer; + obj.granter = message.granter === "" ? undefined : message.granter; return obj; }, fromAminoMsg(object: FeeAminoMsg): Fee { @@ -2107,9 +2107,9 @@ export const Tip = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.tipper = message.tipper; + obj.tipper = message.tipper === "" ? undefined : message.tipper; return obj; }, fromAminoMsg(object: TipAminoMsg): Tip { @@ -2244,7 +2244,7 @@ export const AuxSignerData = { message.signDoc = SignDocDirectAux.fromAmino(object.sign_doc); } if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.sig !== undefined && object.sig !== null) { message.sig = bytesFromBase64(object.sig); @@ -2253,9 +2253,9 @@ export const AuxSignerData = { }, toAmino(message: AuxSignerData): AuxSignerDataAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.sign_doc = message.signDoc ? SignDocDirectAux.toAmino(message.signDoc) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.sig = message.sig ? base64FromBytes(message.sig) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/query.ts index 496351bab8..3802cccd71 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/query.ts @@ -443,7 +443,7 @@ export const QueryAppliedPlanRequest = { }, toAmino(message: QueryAppliedPlanRequest): QueryAppliedPlanRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: QueryAppliedPlanRequestAminoMsg): QueryAppliedPlanRequest { @@ -539,7 +539,7 @@ export const QueryAppliedPlanResponse = { }, toAmino(message: QueryAppliedPlanResponse): QueryAppliedPlanResponseAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: QueryAppliedPlanResponseAminoMsg): QueryAppliedPlanResponse { @@ -635,7 +635,7 @@ export const QueryUpgradedConsensusStateRequest = { }, toAmino(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAmino { const obj: any = {}; - obj.last_height = message.lastHeight ? message.lastHeight.toString() : undefined; + obj.last_height = message.lastHeight !== BigInt(0) ? message.lastHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryUpgradedConsensusStateRequestAminoMsg): QueryUpgradedConsensusStateRequest { @@ -823,7 +823,7 @@ export const QueryModuleVersionsRequest = { }, toAmino(message: QueryModuleVersionsRequest): QueryModuleVersionsRequestAmino { const obj: any = {}; - obj.module_name = message.moduleName; + obj.module_name = message.moduleName === "" ? undefined : message.moduleName; return obj; }, fromAminoMsg(object: QueryModuleVersionsRequestAminoMsg): QueryModuleVersionsRequest { @@ -926,7 +926,7 @@ export const QueryModuleVersionsResponse = { if (message.moduleVersions) { obj.module_versions = message.moduleVersions.map(e => e ? ModuleVersion.toAmino(e) : undefined); } else { - obj.module_versions = []; + obj.module_versions = message.moduleVersions; } return obj; }, @@ -1095,7 +1095,7 @@ export const QueryAuthorityResponse = { }, toAmino(message: QueryAuthorityResponse): QueryAuthorityResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryAuthorityResponseAminoMsg): QueryAuthorityResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/tx.amino.ts index 92673592c2..1207564430 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/tx.amino.ts @@ -1,5 +1,6 @@ import { Plan, PlanSDKType } from "./upgrade"; import { AminoMsg } from "@cosmjs/amino"; +import { omitDefault } from "../../../helpers"; import { Any, AnySDKType } from "../../../google/protobuf/any"; import { MsgSoftwareUpgrade, MsgSoftwareUpgradeSDKType, MsgCancelUpgrade, MsgCancelUpgradeSDKType } from "./tx"; export interface MsgSoftwareUpgradeAminoType extends AminoMsg { @@ -36,7 +37,7 @@ export const AminoConverter = { plan: { name: plan.name, time: plan.time, - height: plan.height.toString(), + height: omitDefault(plan.height)?.toString?.(), info: plan.info, upgraded_client_state: { type_url: plan.upgradedClientState.typeUrl, @@ -51,12 +52,12 @@ export const AminoConverter = { }: MsgSoftwareUpgradeAminoType["value"]): MsgSoftwareUpgrade => { return { authority, - plan: { + plan: plan == null ? plan : { name: plan.name, time: plan.time, - height: BigInt(plan.height), + height: plan.height == null ? plan.height : BigInt(plan.height), info: plan.info, - upgradedClientState: { + upgradedClientState: plan.upgraded_client_state == null ? plan.upgraded_client_state : { typeUrl: plan.upgraded_client_state.type_url, value: plan.upgraded_client_state.value } diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/tx.ts index 8b91d13afb..e1dd8a5a0a 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/tx.ts @@ -166,7 +166,7 @@ export const MsgSoftwareUpgrade = { }, toAmino(message: MsgSoftwareUpgrade): MsgSoftwareUpgradeAmino { const obj: any = {}; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; return obj; }, @@ -335,7 +335,7 @@ export const MsgCancelUpgrade = { }, toAmino(message: MsgCancelUpgrade): MsgCancelUpgradeAmino { const obj: any = {}; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; return obj; }, fromAminoMsg(object: MsgCancelUpgradeAminoMsg): MsgCancelUpgrade { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/upgrade.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/upgrade.ts index 53a8f02865..c77b4f802f 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/upgrade.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/upgrade/v1beta1/upgrade.ts @@ -269,10 +269,10 @@ export const Plan = { }, toAmino(message: Plan): PlanAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.height = message.height ? message.height.toString() : undefined; - obj.info = message.info; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.info = message.info === "" ? undefined : message.info; obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; return obj; }, @@ -401,8 +401,8 @@ export const SoftwareUpgradeProposal = { }, toAmino(message: SoftwareUpgradeProposal): SoftwareUpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; return obj; }, @@ -513,8 +513,8 @@ export const CancelSoftwareUpgradeProposal = { }, toAmino(message: CancelSoftwareUpgradeProposal): CancelSoftwareUpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: CancelSoftwareUpgradeProposalAminoMsg): CancelSoftwareUpgradeProposal { @@ -626,8 +626,8 @@ export const ModuleVersion = { }, toAmino(message: ModuleVersion): ModuleVersionAmino { const obj: any = {}; - obj.name = message.name; - obj.version = message.version ? message.version.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; return obj; }, fromAminoMsg(object: ModuleVersionAminoMsg): ModuleVersion { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/vesting/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/vesting/v1beta1/tx.amino.ts index b1829bb2bc..b6c3997b9b 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/vesting/v1beta1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/vesting/v1beta1/tx.amino.ts @@ -1,6 +1,7 @@ import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; import { Period, PeriodSDKType } from "./vesting"; import { AminoMsg } from "@cosmjs/amino"; +import { omitDefault } from "../../../helpers"; import { MsgCreateVestingAccount, MsgCreateVestingAccountSDKType, MsgCreatePermanentLockedAccount, MsgCreatePermanentLockedAccountSDKType, MsgCreatePeriodicVestingAccount, MsgCreatePeriodicVestingAccountSDKType } from "./tx"; export interface MsgCreateVestingAccountAminoType extends AminoMsg { type: "cosmos-sdk/MsgCreateVestingAccount"; @@ -58,8 +59,8 @@ export const AminoConverter = { denom: el0.denom, amount: el0.amount })), - end_time: endTime.toString(), - delayed + end_time: omitDefault(endTime)?.toString?.(), + delayed: omitDefault(delayed) }; }, fromAmino: ({ @@ -72,11 +73,11 @@ export const AminoConverter = { return { fromAddress: from_address, toAddress: to_address, - amount: amount.map(el0 => ({ + amount: amount.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })), - endTime: BigInt(end_time), + endTime: end_time == null ? end_time : BigInt(end_time), delayed }; } @@ -105,7 +106,7 @@ export const AminoConverter = { return { fromAddress: from_address, toAddress: to_address, - amount: amount.map(el0 => ({ + amount: amount.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })) @@ -123,9 +124,9 @@ export const AminoConverter = { return { from_address: fromAddress, to_address: toAddress, - start_time: startTime.toString(), + start_time: omitDefault(startTime)?.toString?.(), vesting_periods: vestingPeriods.map(el0 => ({ - length: el0.length.toString(), + length: omitDefault(el0.length)?.toString?.(), amount: el0.amount.map(el1 => ({ denom: el1.denom, amount: el1.amount @@ -142,10 +143,10 @@ export const AminoConverter = { return { fromAddress: from_address, toAddress: to_address, - startTime: BigInt(start_time), - vestingPeriods: vesting_periods.map(el0 => ({ - length: BigInt(el0.length), - amount: el0.amount.map(el1 => ({ + startTime: start_time == null ? start_time : BigInt(start_time), + vestingPeriods: vesting_periods.map?.(el0 => ({ + length: el0.length == null ? el0.length : BigInt(el0.length), + amount: el0.amount.map?.(el1 => ({ denom: el1.denom, amount: el1.amount })) diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/vesting/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/vesting/v1beta1/tx.ts index 2b6911c967..5d51a93a48 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/vesting/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/vesting/v1beta1/tx.ts @@ -246,15 +246,15 @@ export const MsgCreateVestingAccount = { }, toAmino(message: MsgCreateVestingAccount): MsgCreateVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.end_time = message.endTime ? message.endTime.toString() : undefined; - obj.delayed = message.delayed; + obj.end_time = message.endTime !== BigInt(0) ? message.endTime.toString() : undefined; + obj.delayed = message.delayed === false ? undefined : message.delayed; return obj; }, fromAminoMsg(object: MsgCreateVestingAccountAminoMsg): MsgCreateVestingAccount { @@ -460,12 +460,12 @@ export const MsgCreatePermanentLockedAccount = { }, toAmino(message: MsgCreatePermanentLockedAccount): MsgCreatePermanentLockedAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -690,13 +690,13 @@ export const MsgCreatePeriodicVestingAccount = { }, 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; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos/vesting/v1beta1/vesting.ts b/__fixtures__/v-next/outputinstantrpc/cosmos/vesting/v1beta1/vesting.ts index ce283a3b2e..a08a48b3fd 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos/vesting/v1beta1/vesting.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos/vesting/v1beta1/vesting.ts @@ -288,19 +288,19 @@ export const BaseVestingAccount = { if (message.originalVesting) { obj.original_vesting = message.originalVesting.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.original_vesting = []; + obj.original_vesting = message.originalVesting; } if (message.delegatedFree) { obj.delegated_free = message.delegatedFree.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.delegated_free = []; + obj.delegated_free = message.delegatedFree; } if (message.delegatedVesting) { obj.delegated_vesting = message.delegatedVesting.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.delegated_vesting = []; + obj.delegated_vesting = message.delegatedVesting; } - obj.end_time = message.endTime ? message.endTime.toString() : undefined; + obj.end_time = message.endTime !== BigInt(0) ? message.endTime.toString() : undefined; return obj; }, fromAminoMsg(object: BaseVestingAccountAminoMsg): BaseVestingAccount { @@ -415,7 +415,7 @@ export const ContinuousVestingAccount = { 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; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; return obj; }, fromAminoMsg(object: ContinuousVestingAccountAminoMsg): ContinuousVestingAccount { @@ -629,11 +629,11 @@ export const Period = { }, toAmino(message: Period): PeriodAmino { const obj: any = {}; - obj.length = message.length ? message.length.toString() : undefined; + obj.length = message.length !== BigInt(0) ? message.length.toString() : undefined; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -771,11 +771,11 @@ export const PeriodicVestingAccount = { 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; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmos_proto/cosmos.ts b/__fixtures__/v-next/outputinstantrpc/cosmos_proto/cosmos.ts index 03ed813507..323c2ddf40 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmos_proto/cosmos.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmos_proto/cosmos.ts @@ -202,8 +202,8 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: InterfaceDescriptorAminoMsg): InterfaceDescriptor { @@ -333,17 +333,17 @@ export const ScalarDescriptor = { if (object.description !== undefined && object.description !== null) { message.description = object.description; } - message.fieldType = object.field_type?.map(e => scalarTypeFromJSON(e)) || []; + message.fieldType = object.field_type?.map(e => e) || []; return message; }, toAmino(message: ScalarDescriptor): ScalarDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; if (message.fieldType) { obj.field_type = message.fieldType.map(e => e); } else { - obj.field_type = []; + obj.field_type = message.fieldType; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/genesis.ts index 53c8bf0dde..81f21b3f15 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/genesis.ts @@ -257,22 +257,22 @@ export const GenesisState = { if (message.codes) { obj.codes = message.codes.map(e => e ? Code.toAmino(e) : undefined); } else { - obj.codes = []; + obj.codes = message.codes; } if (message.contracts) { obj.contracts = message.contracts.map(e => e ? Contract.toAmino(e) : undefined); } else { - obj.contracts = []; + obj.contracts = message.contracts; } if (message.sequences) { obj.sequences = message.sequences.map(e => e ? Sequence.toAmino(e) : undefined); } else { - obj.sequences = []; + obj.sequences = message.sequences; } if (message.genMsgs) { obj.gen_msgs = message.genMsgs.map(e => e ? GenesisState_GenMsgs.toAmino(e) : undefined); } else { - obj.gen_msgs = []; + obj.gen_msgs = message.genMsgs; } return obj; }, @@ -553,10 +553,10 @@ export const Code = { }, toAmino(message: Code): CodeAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.code_info = message.codeInfo ? CodeInfo.toAmino(message.codeInfo) : undefined; obj.code_bytes = message.codeBytes ? base64FromBytes(message.codeBytes) : undefined; - obj.pinned = message.pinned; + obj.pinned = message.pinned === false ? undefined : message.pinned; return obj; }, fromAminoMsg(object: CodeAminoMsg): Code { @@ -690,12 +690,12 @@ export const Contract = { }, toAmino(message: Contract): ContractAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : 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 = []; + obj.contract_state = message.contractState; } return obj; }, @@ -809,7 +809,7 @@ export const Sequence = { toAmino(message: Sequence): SequenceAmino { const obj: any = {}; obj.id_key = message.idKey ? base64FromBytes(message.idKey) : undefined; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: SequenceAminoMsg): Sequence { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/ibc.ts b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/ibc.ts index 83feddf0a2..e9ac988fc2 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/ibc.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/ibc.ts @@ -165,9 +165,9 @@ export const MsgIBCSend = { }, 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.channel = message.channel === "" ? undefined : message.channel; + obj.timeout_height = message.timeoutHeight !== BigInt(0) ? message.timeoutHeight.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -262,7 +262,7 @@ export const MsgIBCCloseChannel = { }, toAmino(message: MsgIBCCloseChannel): MsgIBCCloseChannelAmino { const obj: any = {}; - obj.channel = message.channel; + obj.channel = message.channel === "" ? undefined : message.channel; return obj; }, fromAminoMsg(object: MsgIBCCloseChannelAminoMsg): MsgIBCCloseChannel { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/proposal.ts b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/proposal.ts index ca49c00721..f3f216feba 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/proposal.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/proposal.ts @@ -382,9 +382,9 @@ export const StoreCodeProposal = { }, toAmino(message: StoreCodeProposal): StoreCodeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.run_as = message.runAs; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; return obj; @@ -600,17 +600,17 @@ export const InstantiateContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -771,10 +771,10 @@ export const MigrateContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -917,9 +917,9 @@ export const SudoContractProposal = { }, toAmino(message: SudoContractProposal): SudoContractProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1100,15 +1100,15 @@ export const ExecuteContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; + obj.contract = message.contract === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -1251,10 +1251,10 @@ export const UpdateAdminProposal = { }, toAmino(message: UpdateAdminProposal): UpdateAdminProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.new_admin = message.newAdmin; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: UpdateAdminProposalAminoMsg): UpdateAdminProposal { @@ -1380,9 +1380,9 @@ export const ClearAdminProposal = { }, toAmino(message: ClearAdminProposal): ClearAdminProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: ClearAdminProposalAminoMsg): ClearAdminProposal { @@ -1523,12 +1523,12 @@ export const PinCodesProposal = { }, toAmino(message: PinCodesProposal): PinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, @@ -1670,12 +1670,12 @@ export const UnpinCodesProposal = { }, toAmino(message: UnpinCodesProposal): UnpinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/query.ts index bb2d5d1cce..922d121679 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/query.ts @@ -437,7 +437,7 @@ export const QueryContractInfoRequest = { }, toAmino(message: QueryContractInfoRequest): QueryContractInfoRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryContractInfoRequestAminoMsg): QueryContractInfoRequest { @@ -549,7 +549,7 @@ export const QueryContractInfoResponse = { }, toAmino(message: QueryContractInfoResponse): QueryContractInfoResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.contract_info = message.contractInfo ? ContractInfo.toAmino(message.contractInfo) : undefined; return obj; }, @@ -662,7 +662,7 @@ export const QueryContractHistoryRequest = { }, toAmino(message: QueryContractHistoryRequest): QueryContractHistoryRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -784,7 +784,7 @@ export const QueryContractHistoryResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? ContractCodeHistoryEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -900,7 +900,7 @@ export const QueryContractsByCodeRequest = { }, toAmino(message: QueryContractsByCodeRequest): QueryContractsByCodeRequestAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1022,7 +1022,7 @@ export const QueryContractsByCodeResponse = { if (message.contracts) { obj.contracts = message.contracts.map(e => e); } else { - obj.contracts = []; + obj.contracts = message.contracts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1136,7 +1136,7 @@ export const QueryAllContractStateRequest = { }, toAmino(message: QueryAllContractStateRequest): QueryAllContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1258,7 +1258,7 @@ export const QueryAllContractStateResponse = { if (message.models) { obj.models = message.models.map(e => e ? Model.toAmino(e) : undefined); } else { - obj.models = []; + obj.models = message.models; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1370,7 +1370,7 @@ export const QueryRawContractStateRequest = { }, toAmino(message: QueryRawContractStateRequest): QueryRawContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? base64FromBytes(message.queryData) : undefined; return obj; }, @@ -1575,7 +1575,7 @@ export const QuerySmartContractStateRequest = { }, toAmino(message: QuerySmartContractStateRequest): QuerySmartContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? JSON.parse(fromUtf8(message.queryData)) : undefined; return obj; }, @@ -1766,7 +1766,7 @@ export const QueryCodeRequest = { }, toAmino(message: QueryCodeRequest): QueryCodeRequestAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCodeRequestAminoMsg): QueryCodeRequest { @@ -1894,8 +1894,8 @@ export const CodeInfoResponse = { }, toAmino(message: CodeInfoResponse): CodeInfoResponseAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; - obj.creator = message.creator; + obj.code_id = message.codeId ? message.codeId.toString() : "0"; + obj.creator = message.creator === "" ? undefined : message.creator; obj.data_hash = message.dataHash ? base64FromBytes(message.dataHash) : undefined; return obj; }, @@ -2009,7 +2009,7 @@ export const QueryCodeResponse = { toAmino(message: QueryCodeResponse): QueryCodeResponseAmino { const obj: any = {}; obj.code_info = message.codeInfo ? CodeInfoResponse.toAmino(message.codeInfo) : undefined; - obj.data = message.data ? base64FromBytes(message.data) : undefined; + obj.data = message.data ? base64FromBytes(message.data) : ""; return obj; }, fromAminoMsg(object: QueryCodeResponseAminoMsg): QueryCodeResponse { @@ -2226,7 +2226,7 @@ export const QueryCodesResponse = { if (message.codeInfos) { obj.code_infos = message.codeInfos.map(e => e ? CodeInfoResponse.toAmino(e) : undefined); } else { - obj.code_infos = []; + obj.code_infos = message.codeInfos; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2454,7 +2454,7 @@ export const QueryPinnedCodesResponse = { if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/tx.amino.ts index db3abbec45..c466d644d8 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/tx.amino.ts @@ -2,6 +2,7 @@ import { AccessConfig, AccessConfigSDKType, accessTypeFromJSON } from "./types"; import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { AminoMsg } from "@cosmjs/amino"; import { toBase64, fromBase64, fromUtf8, toUtf8 } from "@cosmjs/encoding"; +import { omitDefault } from "../../../helpers"; import { MsgStoreCode, MsgStoreCodeSDKType, MsgInstantiateContract, MsgInstantiateContractSDKType, MsgExecuteContract, MsgExecuteContractSDKType, MsgMigrateContract, MsgMigrateContractSDKType, MsgUpdateAdmin, MsgUpdateAdminSDKType, MsgClearAdmin, MsgClearAdminSDKType } from "./tx"; export interface MsgStoreCodeAminoType extends AminoMsg { type: "wasm/MsgStoreCode"; @@ -88,9 +89,9 @@ export const AminoConverter = { }: MsgStoreCodeAminoType["value"]): MsgStoreCode => { return { sender, - wasmByteCode: fromBase64(wasm_byte_code), - instantiatePermission: { - permission: accessTypeFromJSON(instantiate_permission.permission), + wasmByteCode: wasm_byte_code == null ? wasm_byte_code : fromBase64(wasm_byte_code), + instantiatePermission: instantiate_permission == null ? instantiate_permission : { + permission: instantiate_permission.permission == null ? instantiate_permission.permission : accessTypeFromJSON(instantiate_permission.permission), address: instantiate_permission.address } }; @@ -109,7 +110,7 @@ export const AminoConverter = { return { sender, admin, - code_id: codeId.toString(), + code_id: omitDefault(codeId)?.toString?.(), label, msg: JSON.parse(fromUtf8(msg)), funds: funds.map(el0 => ({ @@ -129,10 +130,10 @@ export const AminoConverter = { return { sender, admin, - codeId: BigInt(code_id), + codeId: code_id == null ? code_id : BigInt(code_id), label, - msg: toUtf8(JSON.stringify(msg)), - funds: funds.map(el0 => ({ + msg: msg == null ? msg : toUtf8(JSON.stringify(msg)), + funds: funds.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })) @@ -166,8 +167,8 @@ export const AminoConverter = { return { sender, contract, - msg: toUtf8(JSON.stringify(msg)), - funds: funds.map(el0 => ({ + msg: msg == null ? msg : toUtf8(JSON.stringify(msg)), + funds: funds.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })) @@ -185,7 +186,7 @@ export const AminoConverter = { return { sender, contract, - code_id: codeId.toString(), + code_id: omitDefault(codeId)?.toString?.(), msg: JSON.parse(fromUtf8(msg)) }; }, @@ -198,8 +199,8 @@ export const AminoConverter = { return { sender, contract, - codeId: BigInt(code_id), - msg: toUtf8(JSON.stringify(msg)) + codeId: code_id == null ? code_id : BigInt(code_id), + msg: msg == null ? msg : toUtf8(JSON.stringify(msg)) }; } }, diff --git a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/tx.ts b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/tx.ts index b020cc0738..a4fcbdb309 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/tx.ts @@ -316,7 +316,7 @@ export const MsgStoreCode = { }, toAmino(message: MsgStoreCode): MsgStoreCodeAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; return obj; @@ -414,7 +414,7 @@ export const MsgStoreCodeResponse = { }, toAmino(message: MsgStoreCodeResponse): MsgStoreCodeResponseAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgStoreCodeResponseAminoMsg): MsgStoreCodeResponse { @@ -596,15 +596,15 @@ export const MsgInstantiateContract = { }, 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.sender = message.sender === "" ? undefined : message.sender; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -715,7 +715,7 @@ export const MsgInstantiateContractResponse = { }, toAmino(message: MsgInstantiateContractResponse): MsgInstantiateContractResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -864,13 +864,13 @@ export const MsgExecuteContract = { }, toAmino(message: MsgExecuteContract): MsgExecuteContractAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -1109,9 +1109,9 @@ export const MsgMigrateContract = { }, 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.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1332,9 +1332,9 @@ export const MsgUpdateAdmin = { }, toAmino(message: MsgUpdateAdmin): MsgUpdateAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.new_admin = message.newAdmin; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: MsgUpdateAdminAminoMsg): MsgUpdateAdmin { @@ -1518,8 +1518,8 @@ export const MsgClearAdmin = { }, toAmino(message: MsgClearAdmin): MsgClearAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: MsgClearAdminAminoMsg): MsgClearAdmin { diff --git a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/types.ts b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/types.ts index 99e37beb6e..04502688af 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/types.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/types.ts @@ -321,13 +321,13 @@ export const AccessTypeParam = { fromAmino(object: AccessTypeParamAmino): AccessTypeParam { const message = createBaseAccessTypeParam(); if (object.value !== undefined && object.value !== null) { - message.value = accessTypeFromJSON(object.value); + message.value = object.value; } return message; }, toAmino(message: AccessTypeParam): AccessTypeParamAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: AccessTypeParamAminoMsg): AccessTypeParam { @@ -428,7 +428,7 @@ export const AccessConfig = { fromAmino(object: AccessConfigAmino): AccessConfig { const message = createBaseAccessConfig(); if (object.permission !== undefined && object.permission !== null) { - message.permission = accessTypeFromJSON(object.permission); + message.permission = object.permission; } if (object.address !== undefined && object.address !== null) { message.address = object.address; @@ -437,8 +437,8 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.permission = message.permission; - obj.address = message.address; + obj.permission = message.permission === 0 ? undefined : message.permission; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -559,7 +559,7 @@ export const Params = { message.codeUploadAccess = AccessConfig.fromAmino(object.code_upload_access); } if (object.instantiate_default_permission !== undefined && object.instantiate_default_permission !== null) { - message.instantiateDefaultPermission = accessTypeFromJSON(object.instantiate_default_permission); + message.instantiateDefaultPermission = object.instantiate_default_permission; } if (object.max_wasm_code_size !== undefined && object.max_wasm_code_size !== null) { message.maxWasmCodeSize = BigInt(object.max_wasm_code_size); @@ -569,8 +569,8 @@ export const Params = { 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; + obj.instantiate_default_permission = message.instantiateDefaultPermission === 0 ? undefined : message.instantiateDefaultPermission; + obj.max_wasm_code_size = message.maxWasmCodeSize !== BigInt(0) ? message.maxWasmCodeSize.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -699,7 +699,7 @@ export const CodeInfo = { toAmino(message: CodeInfo): CodeInfoAmino { const obj: any = {}; obj.code_hash = message.codeHash ? base64FromBytes(message.codeHash) : undefined; - obj.creator = message.creator; + obj.creator = message.creator === "" ? undefined : message.creator; obj.instantiate_config = message.instantiateConfig ? AccessConfig.toAmino(message.instantiateConfig) : undefined; return obj; }, @@ -896,12 +896,12 @@ export const ContractInfo = { }, 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.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.creator = message.creator === "" ? undefined : message.creator; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.label = message.label === "" ? undefined : message.label; obj.created = message.created ? AbsoluteTxPosition.toAmino(message.created) : undefined; - obj.ibc_port_id = message.ibcPortId; + obj.ibc_port_id = message.ibcPortId === "" ? undefined : message.ibcPortId; obj.extension = message.extension ? Any.toAmino(message.extension) : undefined; return obj; }, @@ -1033,7 +1033,7 @@ export const ContractCodeHistoryEntry = { fromAmino(object: ContractCodeHistoryEntryAmino): ContractCodeHistoryEntry { const message = createBaseContractCodeHistoryEntry(); if (object.operation !== undefined && object.operation !== null) { - message.operation = contractCodeHistoryOperationTypeFromJSON(object.operation); + message.operation = object.operation; } if (object.code_id !== undefined && object.code_id !== null) { message.codeId = BigInt(object.code_id); @@ -1048,8 +1048,8 @@ export const ContractCodeHistoryEntry = { }, toAmino(message: ContractCodeHistoryEntry): ContractCodeHistoryEntryAmino { const obj: any = {}; - obj.operation = message.operation; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.operation = message.operation === 0 ? undefined : message.operation; + obj.code_id = message.codeId !== BigInt(0) ? 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; @@ -1165,8 +1165,8 @@ export const AbsoluteTxPosition = { }, 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; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; + obj.tx_index = message.txIndex !== BigInt(0) ? message.txIndex.toString() : undefined; return obj; }, fromAminoMsg(object: AbsoluteTxPositionAminoMsg): AbsoluteTxPosition { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/claims/v1/claims.ts b/__fixtures__/v-next/outputinstantrpc/evmos/claims/v1/claims.ts index dccbc86aaa..7e6c20d76b 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/claims/v1/claims.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/claims/v1/claims.ts @@ -211,7 +211,7 @@ export const Claim = { fromAmino(object: ClaimAmino): Claim { const message = createBaseClaim(); if (object.action !== undefined && object.action !== null) { - message.action = actionFromJSON(object.action); + message.action = object.action; } if (object.completed !== undefined && object.completed !== null) { message.completed = object.completed; @@ -223,9 +223,9 @@ export const Claim = { }, toAmino(message: Claim): ClaimAmino { const obj: any = {}; - obj.action = message.action; - obj.completed = message.completed; - obj.claimable_amount = message.claimableAmount; + obj.action = message.action === 0 ? undefined : message.action; + obj.completed = message.completed === false ? undefined : message.completed; + obj.claimable_amount = message.claimableAmount === "" ? undefined : message.claimableAmount; return obj; }, fromAminoMsg(object: ClaimAminoMsg): Claim { @@ -360,12 +360,12 @@ export const ClaimsRecordAddress = { }, toAmino(message: ClaimsRecordAddress): ClaimsRecordAddressAmino { const obj: any = {}; - obj.address = message.address; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.address = message.address === "" ? undefined : message.address; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.actionsCompleted) { obj.actions_completed = message.actionsCompleted.map(e => e); } else { - obj.actions_completed = []; + obj.actions_completed = message.actionsCompleted; } return obj; }, @@ -485,11 +485,11 @@ export const ClaimsRecord = { }, toAmino(message: ClaimsRecord): ClaimsRecordAmino { const obj: any = {}; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.actionsCompleted) { obj.actions_completed = message.actionsCompleted.map(e => e); } else { - obj.actions_completed = []; + obj.actions_completed = message.actionsCompleted; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/claims/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/evmos/claims/v1/genesis.ts index 3e78603a28..f6ed9ff78d 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/claims/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/claims/v1/genesis.ts @@ -151,7 +151,7 @@ export const GenesisState = { if (message.claimsRecords) { obj.claims_records = message.claimsRecords.map(e => e ? ClaimsRecordAddress.toAmino(e) : undefined); } else { - obj.claims_records = []; + obj.claims_records = message.claimsRecords; } return obj; }, @@ -352,20 +352,20 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_claims = message.enableClaims; + obj.enable_claims = message.enableClaims === false ? undefined : message.enableClaims; obj.airdrop_start_time = message.airdropStartTime ? Timestamp.toAmino(toTimestamp(message.airdropStartTime)) : undefined; 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; + obj.claims_denom = message.claimsDenom === "" ? undefined : message.claimsDenom; if (message.authorizedChannels) { obj.authorized_channels = message.authorizedChannels.map(e => e); } else { - obj.authorized_channels = []; + obj.authorized_channels = message.authorizedChannels; } if (message.evmChannels) { obj.evm_channels = message.evmChannels.map(e => e); } else { - obj.evm_channels = []; + obj.evm_channels = message.evmChannels; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/claims/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/evmos/claims/v1/query.ts index ddd75cbaec..2018f52b10 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/claims/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/claims/v1/query.ts @@ -287,7 +287,7 @@ export const QueryTotalUnclaimedResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -651,7 +651,7 @@ export const QueryClaimsRecordsResponse = { if (message.claims) { obj.claims = message.claims.map(e => e ? ClaimsRecordAddress.toAmino(e) : undefined); } else { - obj.claims = []; + obj.claims = message.claims; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -741,7 +741,7 @@ export const QueryClaimsRecordRequest = { }, toAmino(message: QueryClaimsRecordRequest): QueryClaimsRecordRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryClaimsRecordRequestAminoMsg): QueryClaimsRecordRequest { @@ -851,11 +851,11 @@ export const QueryClaimsRecordResponse = { }, toAmino(message: QueryClaimsRecordResponse): QueryClaimsRecordResponseAmino { const obj: any = {}; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.claims) { obj.claims = message.claims.map(e => e ? Claim.toAmino(e) : undefined); } else { - obj.claims = []; + obj.claims = message.claims; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/epochs/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/evmos/epochs/v1/genesis.ts index 20b8fc6d75..7266b7325e 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/epochs/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/epochs/v1/genesis.ts @@ -208,13 +208,13 @@ export const EpochInfo = { }, toAmino(message: EpochInfo): EpochInfoAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; obj.current_epoch_start_time = message.currentEpochStartTime ? Timestamp.toAmino(toTimestamp(message.currentEpochStartTime)) : undefined; - obj.epoch_counting_started = message.epochCountingStarted; - obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + obj.epoch_counting_started = message.epochCountingStarted === false ? undefined : message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight !== BigInt(0) ? message.currentEpochStartHeight.toString() : undefined; return obj; }, fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo { @@ -311,7 +311,7 @@ export const GenesisState = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/epochs/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/evmos/epochs/v1/query.ts index 23e066f1a4..259c230ef8 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/epochs/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/epochs/v1/query.ts @@ -231,7 +231,7 @@ export const QueryEpochsInfoResponse = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -321,7 +321,7 @@ export const QueryCurrentEpochRequest = { }, toAmino(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; return obj; }, fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest { @@ -411,7 +411,7 @@ export const QueryCurrentEpochResponse = { }, toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { const obj: any = {}; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/erc20.ts b/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/erc20.ts index 7c4e8c4df8..c0181a0f74 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/erc20.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/erc20.ts @@ -260,16 +260,16 @@ export const TokenPair = { message.enabled = object.enabled; } if (object.contract_owner !== undefined && object.contract_owner !== null) { - message.contractOwner = ownerFromJSON(object.contract_owner); + message.contractOwner = object.contract_owner; } return message; }, 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; + obj.erc20_address = message.erc20Address === "" ? undefined : message.erc20Address; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.enabled = message.enabled === false ? undefined : message.enabled; + obj.contract_owner = message.contractOwner === 0 ? undefined : message.contractOwner; return obj; }, fromAminoMsg(object: TokenPairAminoMsg): TokenPair { @@ -391,8 +391,8 @@ export const RegisterCoinProposal = { }, toAmino(message: RegisterCoinProposal): RegisterCoinProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; }, @@ -513,9 +513,9 @@ export const RegisterERC20Proposal = { }, toAmino(message: RegisterERC20Proposal): RegisterERC20ProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.erc20address = message.erc20address; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.erc20address = message.erc20address === "" ? undefined : message.erc20address; return obj; }, fromAminoMsg(object: RegisterERC20ProposalAminoMsg): RegisterERC20Proposal { @@ -635,9 +635,9 @@ export const ToggleTokenConversionProposal = { }, toAmino(message: ToggleTokenConversionProposal): ToggleTokenConversionProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.token = message.token; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.token = message.token === "" ? undefined : message.token; return obj; }, fromAminoMsg(object: ToggleTokenConversionProposalAminoMsg): ToggleTokenConversionProposal { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/genesis.ts index ef920d583f..7965af5ad5 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/genesis.ts @@ -135,7 +135,7 @@ export const GenesisState = { if (message.tokenPairs) { obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e) : undefined); } else { - obj.token_pairs = []; + obj.token_pairs = message.tokenPairs; } return obj; }, @@ -240,8 +240,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_erc20 = message.enableErc20; - obj.enable_evm_hook = message.enableEvmHook; + obj.enable_erc20 = message.enableErc20 === false ? undefined : message.enableErc20; + obj.enable_evm_hook = message.enableEvmHook === false ? undefined : message.enableEvmHook; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/query.ts index 1772568744..5d582cb95b 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/query.ts @@ -290,7 +290,7 @@ export const QueryTokenPairsResponse = { if (message.tokenPairs) { obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e) : undefined); } else { - obj.token_pairs = []; + obj.token_pairs = message.tokenPairs; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -380,7 +380,7 @@ export const QueryTokenPairRequest = { }, toAmino(message: QueryTokenPairRequest): QueryTokenPairRequestAmino { const obj: any = {}; - obj.token = message.token; + obj.token = message.token === "" ? undefined : message.token; return obj; }, fromAminoMsg(object: QueryTokenPairRequestAminoMsg): QueryTokenPairRequest { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/tx.amino.ts index 0be2123e86..66ca632c61 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/tx.amino.ts @@ -44,7 +44,7 @@ export const AminoConverter = { sender }: MsgConvertCoinAminoType["value"]): MsgConvertCoin => { return { - coin: { + coin: coin == null ? coin : { denom: coin.denom, amount: coin.amount }, diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/tx.ts b/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/tx.ts index 605414b3ec..486029ad07 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/erc20/v1/tx.ts @@ -172,8 +172,8 @@ export const MsgConvertCoin = { toAmino(message: MsgConvertCoin): MsgConvertCoinAmino { const obj: any = {}; obj.coin = message.coin ? Coin.toAmino(message.coin) : undefined; - obj.receiver = message.receiver; - obj.sender = message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgConvertCoinAminoMsg): MsgConvertCoin { @@ -377,10 +377,10 @@ export const MsgConvertERC20 = { }, toAmino(message: MsgConvertERC20): MsgConvertERC20Amino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.amount = message.amount; - obj.receiver = message.receiver; - obj.sender = message.sender; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.receiver = message.receiver === "" ? undefined : message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgConvertERC20AminoMsg): MsgConvertERC20 { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/fees.ts b/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/fees.ts index 980edfa4e5..0d72231999 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/fees.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/fees.ts @@ -130,9 +130,9 @@ export const DevFeeInfo = { }, toAmino(message: DevFeeInfo): DevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: DevFeeInfoAminoMsg): DevFeeInfo { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/genesis.ts index 119372e1cb..81003cf27c 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/genesis.ts @@ -150,7 +150,7 @@ export const GenesisState = { if (message.devFeeInfos) { obj.dev_fee_infos = message.devFeeInfos.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.dev_fee_infos = []; + obj.dev_fee_infos = message.devFeeInfos; } return obj; }, @@ -305,11 +305,11 @@ export const Params = { }, 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; + obj.enable_fees = message.enableFees === false ? undefined : message.enableFees; + obj.developer_shares = message.developerShares === "" ? undefined : message.developerShares; + obj.validator_shares = message.validatorShares === "" ? undefined : message.validatorShares; + obj.addr_derivation_cost_create = message.addrDerivationCostCreate !== BigInt(0) ? message.addrDerivationCostCreate.toString() : undefined; + obj.min_gas_price = message.minGasPrice === "" ? undefined : message.minGasPrice; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/query.ts index 005310d29a..b455127f67 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/query.ts @@ -336,7 +336,7 @@ export const QueryDevFeeInfosResponse = { if (message.fees) { obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.fees = []; + obj.fees = message.fees; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -426,7 +426,7 @@ export const QueryDevFeeInfoRequest = { }, toAmino(message: QueryDevFeeInfoRequest): QueryDevFeeInfoRequestAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; return obj; }, fromAminoMsg(object: QueryDevFeeInfoRequestAminoMsg): QueryDevFeeInfoRequest { @@ -780,7 +780,7 @@ export const QueryDevFeeInfosPerDeployerRequest = { }, toAmino(message: QueryDevFeeInfosPerDeployerRequest): QueryDevFeeInfosPerDeployerRequestAmino { const obj: any = {}; - obj.deployer_address = message.deployerAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -896,7 +896,7 @@ export const QueryDevFeeInfosPerDeployerResponse = { if (message.fees) { obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.fees = []; + obj.fees = message.fees; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/tx.amino.ts index c226ee6556..48b3a5fef2 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/tx.amino.ts @@ -50,7 +50,7 @@ export const AminoConverter = { contractAddress: contract_address, deployerAddress: deployer_address, withdrawAddress: withdraw_address, - nonces: nonces.map(el0 => BigInt(el0)) + nonces: nonces.map?.(el0 => BigInt(el0)) }; } }, diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/tx.ts b/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/tx.ts index 42e644af59..437bb6b2fe 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/fees/v1/tx.ts @@ -239,13 +239,13 @@ export const MsgRegisterDevFeeInfo = { }, toAmino(message: MsgRegisterDevFeeInfo): MsgRegisterDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; if (message.nonces) { obj.nonces = message.nonces.map(e => e.toString()); } else { - obj.nonces = []; + obj.nonces = message.nonces; } return obj; }, @@ -418,8 +418,8 @@ export const MsgCancelDevFeeInfo = { }, toAmino(message: MsgCancelDevFeeInfo): MsgCancelDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; return obj; }, fromAminoMsg(object: MsgCancelDevFeeInfoAminoMsg): MsgCancelDevFeeInfo { @@ -607,9 +607,9 @@ export const MsgUpdateDevFeeInfo = { }, toAmino(message: MsgUpdateDevFeeInfo): MsgUpdateDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: MsgUpdateDevFeeInfoAminoMsg): MsgUpdateDevFeeInfo { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/genesis.ts index 40e2e6314f..ea73685a40 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/genesis.ts @@ -163,12 +163,12 @@ export const GenesisState = { if (message.incentives) { obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e) : undefined); } else { - obj.incentives = []; + obj.incentives = message.incentives; } if (message.gasMeters) { obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e) : undefined); } else { - obj.gas_meters = []; + obj.gas_meters = message.gasMeters; } return obj; }, @@ -305,10 +305,10 @@ export const Params = { }, 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; + obj.enable_incentives = message.enableIncentives === false ? undefined : message.enableIncentives; + obj.allocation_limit = message.allocationLimit === "" ? undefined : message.allocationLimit; + obj.incentives_epoch_identifier = message.incentivesEpochIdentifier === "" ? undefined : message.incentivesEpochIdentifier; + obj.reward_scaler = message.rewardScaler === "" ? undefined : message.rewardScaler; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/incentives.ts b/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/incentives.ts index c563bf6a30..7424e30ede 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/incentives.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/incentives.ts @@ -238,15 +238,15 @@ export const Incentive = { }, toAmino(message: Incentive): IncentiveAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; if (message.allocations) { obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } - obj.epochs = message.epochs; + obj.epochs = message.epochs === 0 ? undefined : message.epochs; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.total_gas = message.totalGas ? message.totalGas.toString() : undefined; + obj.total_gas = message.totalGas !== BigInt(0) ? message.totalGas.toString() : undefined; return obj; }, fromAminoMsg(object: IncentiveAminoMsg): Incentive { @@ -368,9 +368,9 @@ export const GasMeter = { }, toAmino(message: GasMeter): GasMeterAmino { const obj: any = {}; - obj.contract = message.contract; - obj.participant = message.participant; - obj.cumulative_gas = message.cumulativeGas ? message.cumulativeGas.toString() : undefined; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.participant = message.participant === "" ? undefined : message.participant; + obj.cumulative_gas = message.cumulativeGas !== BigInt(0) ? message.cumulativeGas.toString() : undefined; return obj; }, fromAminoMsg(object: GasMeterAminoMsg): GasMeter { @@ -528,15 +528,15 @@ export const RegisterIncentiveProposal = { }, toAmino(message: RegisterIncentiveProposal): RegisterIncentiveProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; if (message.allocations) { obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } - obj.epochs = message.epochs; + obj.epochs = message.epochs === 0 ? undefined : message.epochs; return obj; }, fromAminoMsg(object: RegisterIncentiveProposalAminoMsg): RegisterIncentiveProposal { @@ -656,9 +656,9 @@ export const CancelIncentiveProposal = { }, toAmino(message: CancelIncentiveProposal): CancelIncentiveProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: CancelIncentiveProposalAminoMsg): CancelIncentiveProposal { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/query.ts index 8232ee1043..9858d8ae82 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/query.ts @@ -446,7 +446,7 @@ export const QueryIncentivesResponse = { if (message.incentives) { obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e) : undefined); } else { - obj.incentives = []; + obj.incentives = message.incentives; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -536,7 +536,7 @@ export const QueryIncentiveRequest = { }, toAmino(message: QueryIncentiveRequest): QueryIncentiveRequestAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: QueryIncentiveRequestAminoMsg): QueryIncentiveRequest { @@ -732,7 +732,7 @@ export const QueryGasMetersRequest = { }, toAmino(message: QueryGasMetersRequest): QueryGasMetersRequestAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -848,7 +848,7 @@ export const QueryGasMetersResponse = { if (message.gasMeters) { obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e) : undefined); } else { - obj.gas_meters = []; + obj.gas_meters = message.gasMeters; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -954,8 +954,8 @@ export const QueryGasMeterRequest = { }, toAmino(message: QueryGasMeterRequest): QueryGasMeterRequestAmino { const obj: any = {}; - obj.contract = message.contract; - obj.participant = message.participant; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.participant = message.participant === "" ? undefined : message.participant; return obj; }, fromAminoMsg(object: QueryGasMeterRequestAminoMsg): QueryGasMeterRequest { @@ -1045,7 +1045,7 @@ export const QueryGasMeterResponse = { }, toAmino(message: QueryGasMeterResponse): QueryGasMeterResponseAmino { const obj: any = {}; - obj.gas_meter = message.gasMeter ? message.gasMeter.toString() : undefined; + obj.gas_meter = message.gasMeter !== BigInt(0) ? message.gasMeter.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGasMeterResponseAminoMsg): QueryGasMeterResponse { @@ -1250,7 +1250,7 @@ export const QueryAllocationMetersResponse = { if (message.allocationMeters) { obj.allocation_meters = message.allocationMeters.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocation_meters = []; + obj.allocation_meters = message.allocationMeters; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1340,7 +1340,7 @@ export const QueryAllocationMeterRequest = { }, toAmino(message: QueryAllocationMeterRequest): QueryAllocationMeterRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryAllocationMeterRequestAminoMsg): QueryAllocationMeterRequest { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/inflation/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/evmos/inflation/v1/genesis.ts index 021f781274..12c5cc94f0 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/inflation/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/inflation/v1/genesis.ts @@ -191,10 +191,10 @@ export const GenesisState = { 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; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; + obj.epoch_identifier = message.epochIdentifier === "" ? undefined : message.epochIdentifier; + obj.epochs_per_period = message.epochsPerPeriod !== BigInt(0) ? message.epochsPerPeriod.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs !== BigInt(0) ? message.skippedEpochs.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -334,10 +334,10 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.mint_denom = message.mintDenom; + obj.mint_denom = message.mintDenom === "" ? undefined : 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; + obj.enable_inflation = message.enableInflation === false ? undefined : message.enableInflation; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/inflation/v1/inflation.ts b/__fixtures__/v-next/outputinstantrpc/evmos/inflation/v1/inflation.ts index 571fd32b00..bb47bc2295 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/inflation/v1/inflation.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/inflation/v1/inflation.ts @@ -184,9 +184,9 @@ export const InflationDistribution = { }, toAmino(message: InflationDistribution): InflationDistributionAmino { const obj: any = {}; - obj.staking_rewards = message.stakingRewards; - obj.usage_incentives = message.usageIncentives; - obj.community_pool = message.communityPool; + obj.staking_rewards = message.stakingRewards === "" ? undefined : message.stakingRewards; + obj.usage_incentives = message.usageIncentives === "" ? undefined : message.usageIncentives; + obj.community_pool = message.communityPool === "" ? undefined : message.communityPool; return obj; }, fromAminoMsg(object: InflationDistributionAminoMsg): InflationDistribution { @@ -338,11 +338,11 @@ export const ExponentialCalculation = { }, 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; + obj.a = message.a === "" ? undefined : message.a; + obj.r = message.r === "" ? undefined : message.r; + obj.c = message.c === "" ? undefined : message.c; + obj.bonding_target = message.bondingTarget === "" ? undefined : message.bondingTarget; + obj.max_variance = message.maxVariance === "" ? undefined : message.maxVariance; return obj; }, fromAminoMsg(object: ExponentialCalculationAminoMsg): ExponentialCalculation { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/inflation/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/evmos/inflation/v1/query.ts index 627e3d9fe0..9b13bfcea1 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/inflation/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/inflation/v1/query.ts @@ -317,7 +317,7 @@ export const QueryPeriodResponse = { }, toAmino(message: QueryPeriodResponse): QueryPeriodResponseAmino { const obj: any = {}; - obj.period = message.period ? message.period.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPeriodResponseAminoMsg): QueryPeriodResponse { @@ -633,7 +633,7 @@ export const QuerySkippedEpochsResponse = { }, toAmino(message: QuerySkippedEpochsResponse): QuerySkippedEpochsResponseAmino { const obj: any = {}; - obj.skipped_epochs = message.skippedEpochs ? message.skippedEpochs.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs !== BigInt(0) ? message.skippedEpochs.toString() : undefined; return obj; }, fromAminoMsg(object: QuerySkippedEpochsResponseAminoMsg): QuerySkippedEpochsResponse { @@ -947,7 +947,7 @@ export const QueryInflationRateResponse = { }, toAmino(message: QueryInflationRateResponse): QueryInflationRateResponseAmino { const obj: any = {}; - obj.inflation_rate = message.inflationRate; + obj.inflation_rate = message.inflationRate === "" ? undefined : message.inflationRate; return obj; }, fromAminoMsg(object: QueryInflationRateResponseAminoMsg): QueryInflationRateResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/recovery/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/evmos/recovery/v1/genesis.ts index fd797582aa..11b39553c0 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/recovery/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/recovery/v1/genesis.ts @@ -208,7 +208,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_recovery = message.enableRecovery; + obj.enable_recovery = message.enableRecovery === false ? undefined : message.enableRecovery; obj.packet_timeout_duration = message.packetTimeoutDuration ? Duration.toAmino(message.packetTimeoutDuration) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/query.ts index 1601453e8c..bfda615b80 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/query.ts @@ -109,7 +109,7 @@ export const QueryBalancesRequest = { }, toAmino(message: QueryBalancesRequest): QueryBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryBalancesRequestAminoMsg): QueryBalancesRequest { @@ -250,17 +250,17 @@ export const QueryBalancesResponse = { if (message.locked) { obj.locked = message.locked.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.locked = []; + obj.locked = message.locked; } if (message.unvested) { obj.unvested = message.unvested.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.unvested = []; + obj.unvested = message.unvested; } if (message.vested) { obj.vested = message.vested.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.vested = []; + obj.vested = message.vested; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/tx.amino.ts index ef55f48dca..b37f873caf 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/tx.amino.ts @@ -1,6 +1,7 @@ import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp"; import { Period, PeriodSDKType } from "../../../cosmos/vesting/v1beta1/vesting"; import { AminoMsg } from "@cosmjs/amino"; +import { omitDefault } from "../../../helpers"; import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { MsgCreateClawbackVestingAccount, MsgCreateClawbackVestingAccountSDKType, MsgClawback, MsgClawbackSDKType } from "./tx"; export interface MsgCreateClawbackVestingAccountAminoType extends AminoMsg { @@ -50,20 +51,20 @@ export const AminoConverter = { to_address: toAddress, start_time: startTime, lockup_periods: lockupPeriods.map(el0 => ({ - length: el0.length.toString(), + length: omitDefault(el0.length)?.toString?.(), amount: el0.amount.map(el1 => ({ denom: el1.denom, amount: el1.amount })) })), vesting_periods: vestingPeriods.map(el0 => ({ - length: el0.length.toString(), + length: omitDefault(el0.length)?.toString?.(), amount: el0.amount.map(el1 => ({ denom: el1.denom, amount: el1.amount })) })), - merge + merge: omitDefault(merge) }; }, fromAmino: ({ @@ -78,16 +79,16 @@ export const AminoConverter = { fromAddress: from_address, toAddress: to_address, startTime: start_time, - lockupPeriods: lockup_periods.map(el0 => ({ - length: BigInt(el0.length), - amount: el0.amount.map(el1 => ({ + lockupPeriods: lockup_periods.map?.(el0 => ({ + length: el0.length == null ? el0.length : BigInt(el0.length), + amount: el0.amount.map?.(el1 => ({ denom: el1.denom, amount: el1.amount })) })), - vestingPeriods: vesting_periods.map(el0 => ({ - length: BigInt(el0.length), - amount: el0.amount.map(el1 => ({ + vestingPeriods: vesting_periods.map?.(el0 => ({ + length: el0.length == null ? el0.length : BigInt(el0.length), + amount: el0.amount.map?.(el1 => ({ denom: el1.denom, amount: el1.amount })) diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/tx.ts b/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/tx.ts index 1a301fc010..c6dc1c0a23 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/tx.ts @@ -252,20 +252,20 @@ export const MsgCreateClawbackVestingAccount = { }, toAmino(message: MsgCreateClawbackVestingAccount): MsgCreateClawbackVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; if (message.lockupPeriods) { obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.lockup_periods = []; + obj.lockup_periods = message.lockupPeriods; } if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } - obj.merge = message.merge; + obj.merge = message.merge === false ? undefined : message.merge; return obj; }, fromAminoMsg(object: MsgCreateClawbackVestingAccountAminoMsg): MsgCreateClawbackVestingAccount { @@ -453,9 +453,9 @@ export const MsgClawback = { }, toAmino(message: MsgClawback): MsgClawbackAmino { const obj: any = {}; - obj.funder_address = message.funderAddress; - obj.account_address = message.accountAddress; - obj.dest_address = message.destAddress; + obj.funder_address = message.funderAddress === "" ? undefined : message.funderAddress; + obj.account_address = message.accountAddress === "" ? undefined : message.accountAddress; + obj.dest_address = message.destAddress === "" ? undefined : message.destAddress; return obj; }, fromAminoMsg(object: MsgClawbackAminoMsg): MsgClawback { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/vesting.ts b/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/vesting.ts index ffb222d228..03523bb20e 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/vesting.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/vesting/v1/vesting.ts @@ -189,17 +189,17 @@ export const ClawbackVestingAccount = { toAmino(message: ClawbackVestingAccount): ClawbackVestingAccountAmino { const obj: any = {}; obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined; - obj.funder_address = message.funderAddress; + obj.funder_address = message.funderAddress === "" ? undefined : message.funderAddress; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; if (message.lockupPeriods) { obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.lockup_periods = []; + obj.lockup_periods = message.lockupPeriods; } if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/auth.ts b/__fixtures__/v-next/outputinstantrpc/google/api/auth.ts index 7cd1e92b5f..c4ac81b745 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/auth.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/auth.ts @@ -442,12 +442,12 @@ export const Authentication = { if (message.rules) { obj.rules = message.rules.map(e => e ? AuthenticationRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } if (message.providers) { obj.providers = message.providers.map(e => e ? AuthProvider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } return obj; }, @@ -592,13 +592,13 @@ export const AuthenticationRule = { }, toAmino(message: AuthenticationRule): AuthenticationRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.oauth = message.oauth ? OAuthRequirements.toAmino(message.oauth) : undefined; - obj.allow_without_credential = message.allowWithoutCredential; + obj.allow_without_credential = message.allowWithoutCredential === false ? undefined : message.allowWithoutCredential; if (message.requirements) { obj.requirements = message.requirements.map(e => e ? AuthRequirement.toAmino(e) : undefined); } else { - obj.requirements = []; + obj.requirements = message.requirements; } return obj; }, @@ -719,9 +719,9 @@ export const JwtLocation = { }, toAmino(message: JwtLocation): JwtLocationAmino { const obj: any = {}; - obj.header = message.header; - obj.query = message.query; - obj.value_prefix = message.valuePrefix; + obj.header = message.header === null ? undefined : message.header; + obj.query = message.query === null ? undefined : message.query; + obj.value_prefix = message.valuePrefix === "" ? undefined : message.valuePrefix; return obj; }, fromAminoMsg(object: JwtLocationAminoMsg): JwtLocation { @@ -895,15 +895,15 @@ export const AuthProvider = { }, 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; + obj.id = message.id === "" ? undefined : message.id; + obj.issuer = message.issuer === "" ? undefined : message.issuer; + obj.jwks_uri = message.jwksUri === "" ? undefined : message.jwksUri; + obj.audiences = message.audiences === "" ? undefined : message.audiences; + obj.authorization_url = message.authorizationUrl === "" ? undefined : message.authorizationUrl; if (message.jwtLocations) { obj.jwt_locations = message.jwtLocations.map(e => e ? JwtLocation.toAmino(e) : undefined); } else { - obj.jwt_locations = []; + obj.jwt_locations = message.jwtLocations; } return obj; }, @@ -992,7 +992,7 @@ export const OAuthRequirements = { }, toAmino(message: OAuthRequirements): OAuthRequirementsAmino { const obj: any = {}; - obj.canonical_scopes = message.canonicalScopes; + obj.canonical_scopes = message.canonicalScopes === "" ? undefined : message.canonicalScopes; return obj; }, fromAminoMsg(object: OAuthRequirementsAminoMsg): OAuthRequirements { @@ -1096,8 +1096,8 @@ export const AuthRequirement = { }, toAmino(message: AuthRequirement): AuthRequirementAmino { const obj: any = {}; - obj.provider_id = message.providerId; - obj.audiences = message.audiences; + obj.provider_id = message.providerId === "" ? undefined : message.providerId; + obj.audiences = message.audiences === "" ? undefined : message.audiences; return obj; }, fromAminoMsg(object: AuthRequirementAminoMsg): AuthRequirement { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/backend.ts b/__fixtures__/v-next/outputinstantrpc/google/api/backend.ts index 2d0466c330..953d36987c 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/backend.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/backend.ts @@ -289,7 +289,7 @@ export const Backend = { if (message.rules) { obj.rules = message.rules.map(e => e ? BackendRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -491,7 +491,7 @@ export const BackendRule = { message.operationDeadline = object.operation_deadline; } if (object.path_translation !== undefined && object.path_translation !== null) { - message.pathTranslation = backendRule_PathTranslationFromJSON(object.path_translation); + message.pathTranslation = object.path_translation; } if (object.jwt_audience !== undefined && object.jwt_audience !== null) { message.jwtAudience = object.jwt_audience; @@ -506,15 +506,15 @@ export const BackendRule = { }, 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; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.address = message.address === "" ? undefined : message.address; + obj.deadline = message.deadline === 0 ? undefined : message.deadline; + obj.min_deadline = message.minDeadline === 0 ? undefined : message.minDeadline; + obj.operation_deadline = message.operationDeadline === 0 ? undefined : message.operationDeadline; + obj.path_translation = message.pathTranslation === 0 ? undefined : message.pathTranslation; + obj.jwt_audience = message.jwtAudience === null ? undefined : message.jwtAudience; + obj.disable_auth = message.disableAuth === null ? undefined : message.disableAuth; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: BackendRuleAminoMsg): BackendRule { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/billing.ts b/__fixtures__/v-next/outputinstantrpc/google/api/billing.ts index e2ad5411bf..cae2208762 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/billing.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/billing.ts @@ -191,7 +191,7 @@ export const Billing = { if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Billing_BillingDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -302,11 +302,11 @@ export const Billing_BillingDestination = { }, toAmino(message: Billing_BillingDestination): Billing_BillingDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.metrics) { obj.metrics = message.metrics.map(e => e); } else { - obj.metrics = []; + obj.metrics = message.metrics; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/config_change.ts b/__fixtures__/v-next/outputinstantrpc/google/api/config_change.ts index 0efcf4aee2..3c4038a3da 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/config_change.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/config_change.ts @@ -273,21 +273,21 @@ export const ConfigChange = { message.newValue = object.new_value; } if (object.change_type !== undefined && object.change_type !== null) { - message.changeType = changeTypeFromJSON(object.change_type); + message.changeType = object.change_type; } message.advices = object.advices?.map(e => Advice.fromAmino(e)) || []; return message; }, 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; + obj.element = message.element === "" ? undefined : message.element; + obj.old_value = message.oldValue === "" ? undefined : message.oldValue; + obj.new_value = message.newValue === "" ? undefined : message.newValue; + obj.change_type = message.changeType === 0 ? undefined : message.changeType; if (message.advices) { obj.advices = message.advices.map(e => e ? Advice.toAmino(e) : undefined); } else { - obj.advices = []; + obj.advices = message.advices; } return obj; }, @@ -376,7 +376,7 @@ export const Advice = { }, toAmino(message: Advice): AdviceAmino { const obj: any = {}; - obj.description = message.description; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: AdviceAminoMsg): Advice { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/consumer.ts b/__fixtures__/v-next/outputinstantrpc/google/api/consumer.ts index 964e640f32..bf377fdf76 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/consumer.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/consumer.ts @@ -222,7 +222,7 @@ export const ProjectProperties = { if (message.properties) { obj.properties = message.properties.map(e => e ? Property.toAmino(e) : undefined); } else { - obj.properties = []; + obj.properties = message.properties; } return obj; }, @@ -334,7 +334,7 @@ export const Property = { message.name = object.name; } if (object.type !== undefined && object.type !== null) { - message.type = property_PropertyTypeFromJSON(object.type); + message.type = object.type; } if (object.description !== undefined && object.description !== null) { message.description = object.description; @@ -343,9 +343,9 @@ export const Property = { }, toAmino(message: Property): PropertyAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === 0 ? undefined : message.type; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: PropertyAminoMsg): Property { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/context.ts b/__fixtures__/v-next/outputinstantrpc/google/api/context.ts index 91b357a791..e4d582c18c 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/context.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/context.ts @@ -211,7 +211,7 @@ export const Context = { if (message.rules) { obj.rules = message.rules.map(e => e ? ContextRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -388,26 +388,26 @@ export const ContextRule = { }, toAmino(message: ContextRule): ContextRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; if (message.requested) { obj.requested = message.requested.map(e => e); } else { - obj.requested = []; + obj.requested = message.requested; } if (message.provided) { obj.provided = message.provided.map(e => e); } else { - obj.provided = []; + obj.provided = message.provided; } if (message.allowedRequestExtensions) { obj.allowed_request_extensions = message.allowedRequestExtensions.map(e => e); } else { - obj.allowed_request_extensions = []; + obj.allowed_request_extensions = message.allowedRequestExtensions; } if (message.allowedResponseExtensions) { obj.allowed_response_extensions = message.allowedResponseExtensions.map(e => e); } else { - obj.allowed_response_extensions = []; + obj.allowed_response_extensions = message.allowedResponseExtensions; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/control.ts b/__fixtures__/v-next/outputinstantrpc/google/api/control.ts index c4a382b7a1..084229d3cd 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/control.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/control.ts @@ -94,7 +94,7 @@ export const Control = { }, toAmino(message: Control): ControlAmino { const obj: any = {}; - obj.environment = message.environment; + obj.environment = message.environment === "" ? undefined : message.environment; return obj; }, fromAminoMsg(object: ControlAminoMsg): Control { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/distribution.ts b/__fixtures__/v-next/outputinstantrpc/google/api/distribution.ts index 976cec91cd..0967ffbaaf 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/distribution.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/distribution.ts @@ -523,20 +523,20 @@ export const Distribution = { }, 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.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.mean = message.mean === 0 ? undefined : message.mean; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation === 0 ? undefined : 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 = []; + obj.bucket_counts = message.bucketCounts; } if (message.exemplars) { obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e) : undefined); } else { - obj.exemplars = []; + obj.exemplars = message.exemplars; } return obj; }, @@ -641,8 +641,8 @@ export const Distribution_Range = { }, toAmino(message: Distribution_Range): Distribution_RangeAmino { const obj: any = {}; - obj.min = message.min; - obj.max = message.max; + obj.min = message.min === 0 ? undefined : message.min; + obj.max = message.max === 0 ? undefined : message.max; return obj; }, fromAminoMsg(object: Distribution_RangeAminoMsg): Distribution_Range { @@ -890,9 +890,9 @@ export const Distribution_BucketOptions_Linear = { }, 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; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.width = message.width === 0 ? undefined : message.width; + obj.offset = message.offset === 0 ? undefined : message.offset; return obj; }, fromAminoMsg(object: Distribution_BucketOptions_LinearAminoMsg): Distribution_BucketOptions_Linear { @@ -1012,9 +1012,9 @@ export const Distribution_BucketOptions_Exponential = { }, 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; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.growth_factor = message.growthFactor === 0 ? undefined : message.growthFactor; + obj.scale = message.scale === 0 ? undefined : message.scale; return obj; }, fromAminoMsg(object: Distribution_BucketOptions_ExponentialAminoMsg): Distribution_BucketOptions_Exponential { @@ -1120,7 +1120,7 @@ export const Distribution_BucketOptions_Explicit = { if (message.bounds) { obj.bounds = message.bounds.map(e => e); } else { - obj.bounds = []; + obj.bounds = message.bounds; } return obj; }, @@ -1247,12 +1247,12 @@ export const Distribution_Exemplar = { }, toAmino(message: Distribution_Exemplar): Distribution_ExemplarAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; if (message.attachments) { obj.attachments = message.attachments.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.attachments = []; + obj.attachments = message.attachments; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/documentation.ts b/__fixtures__/v-next/outputinstantrpc/google/api/documentation.ts index e08d2d92e5..77dcae98fc 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/documentation.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/documentation.ts @@ -403,20 +403,20 @@ export const Documentation = { }, toAmino(message: Documentation): DocumentationAmino { const obj: any = {}; - obj.summary = message.summary; + obj.summary = message.summary === "" ? undefined : message.summary; if (message.pages) { obj.pages = message.pages.map(e => e ? Page.toAmino(e) : undefined); } else { - obj.pages = []; + obj.pages = message.pages; } if (message.rules) { obj.rules = message.rules.map(e => e ? DocumentationRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.documentation_root_url = message.documentationRootUrl; - obj.service_root_url = message.serviceRootUrl; - obj.overview = message.overview; + obj.documentation_root_url = message.documentationRootUrl === "" ? undefined : message.documentationRootUrl; + obj.service_root_url = message.serviceRootUrl === "" ? undefined : message.serviceRootUrl; + obj.overview = message.overview === "" ? undefined : message.overview; return obj; }, fromAminoMsg(object: DocumentationAminoMsg): Documentation { @@ -536,9 +536,9 @@ export const DocumentationRule = { }, toAmino(message: DocumentationRule): DocumentationRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.description = message.description; - obj.deprecation_description = message.deprecationDescription; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.description = message.description === "" ? undefined : message.description; + obj.deprecation_description = message.deprecationDescription === "" ? undefined : message.deprecationDescription; return obj; }, fromAminoMsg(object: DocumentationRuleAminoMsg): DocumentationRule { @@ -664,12 +664,12 @@ export const Page = { }, toAmino(message: Page): PageAmino { const obj: any = {}; - obj.name = message.name; - obj.content = message.content; + obj.name = message.name === "" ? undefined : message.name; + obj.content = message.content === "" ? undefined : message.content; if (message.subpages) { obj.subpages = message.subpages.map(e => e ? Page.toAmino(e) : undefined); } else { - obj.subpages = []; + obj.subpages = message.subpages; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/endpoint.ts b/__fixtures__/v-next/outputinstantrpc/google/api/endpoint.ts index ea00824b27..63ea26cf9e 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/endpoint.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/endpoint.ts @@ -203,14 +203,14 @@ export const Endpoint = { }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.aliases) { obj.aliases = message.aliases.map(e => e); } else { - obj.aliases = []; + obj.aliases = message.aliases; } - obj.target = message.target; - obj.allow_cors = message.allowCors; + obj.target = message.target === "" ? undefined : message.target; + obj.allow_cors = message.allowCors === false ? undefined : message.allowCors; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/expr/conformance/v1alpha1/conformance_service.ts b/__fixtures__/v-next/outputinstantrpc/google/api/expr/conformance/v1alpha1/conformance_service.ts index 9737c60a4d..fcf3d0737c 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/expr/conformance/v1alpha1/conformance_service.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/expr/conformance/v1alpha1/conformance_service.ts @@ -349,10 +349,10 @@ export const ParseRequest = { }, 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; + obj.cel_source = message.celSource === "" ? undefined : message.celSource; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.source_location = message.sourceLocation === "" ? undefined : message.sourceLocation; + obj.disable_macros = message.disableMacros === false ? undefined : message.disableMacros; return obj; }, fromAminoMsg(object: ParseRequestAminoMsg): ParseRequest { @@ -468,7 +468,7 @@ export const ParseResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -617,10 +617,10 @@ export const CheckRequest = { if (message.typeEnv) { obj.type_env = message.typeEnv.map(e => e ? Decl.toAmino(e) : undefined); } else { - obj.type_env = []; + obj.type_env = message.typeEnv; } - obj.container = message.container; - obj.no_std_env = message.noStdEnv; + obj.container = message.container === "" ? undefined : message.container; + obj.no_std_env = message.noStdEnv === false ? undefined : message.noStdEnv; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -736,7 +736,7 @@ export const CheckResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -842,7 +842,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -1028,7 +1028,7 @@ export const EvalRequest = { obj.bindings[k] = ExprValue.toAmino(v); }); } - obj.container = message.container; + obj.container = message.container === "" ? undefined : message.container; return obj; }, fromAminoMsg(object: EvalRequestAminoMsg): EvalRequest { @@ -1144,7 +1144,7 @@ export const EvalResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -1257,7 +1257,7 @@ export const IssueDetails = { fromAmino(object: IssueDetailsAmino): IssueDetails { const message = createBaseIssueDetails(); if (object.severity !== undefined && object.severity !== null) { - message.severity = issueDetails_SeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.position !== undefined && object.position !== null) { message.position = SourcePosition.fromAmino(object.position); @@ -1269,9 +1269,9 @@ export const IssueDetails = { }, toAmino(message: IssueDetails): IssueDetailsAmino { const obj: any = {}; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.position = message.position ? SourcePosition.toAmino(message.position) : undefined; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; return obj; }, fromAminoMsg(object: IssueDetailsAminoMsg): IssueDetails { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/checked.ts b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/checked.ts index eaf739cc81..1bb1e2eb2d 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/checked.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/checked.ts @@ -663,7 +663,7 @@ export const CheckedExpr_ReferenceMapEntry = { }, toAmino(message: CheckedExpr_ReferenceMapEntry): CheckedExpr_ReferenceMapEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Reference.toAmino(message.value) : undefined; return obj; }, @@ -765,7 +765,7 @@ export const CheckedExpr_TypeMapEntry = { }, toAmino(message: CheckedExpr_TypeMapEntry): CheckedExpr_TypeMapEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Type.toAmino(message.value) : undefined; return obj; }, @@ -1015,7 +1015,7 @@ export const CheckedExpr = { }); } obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined; - obj.expr_version = message.exprVersion; + obj.expr_version = message.exprVersion === "" ? undefined : message.exprVersion; obj.expr = message.expr ? Expr.toAmino(message.expr) : undefined; return obj; }, @@ -1271,16 +1271,16 @@ export const Type = { message.dyn = Empty.fromAmino(object.dyn); } if (object.null !== undefined && object.null !== null) { - message.null = nullValueFromJSON(object.null); + message.null = object.null; } if (object.primitive !== undefined && object.primitive !== null) { - message.primitive = type_PrimitiveTypeFromJSON(object.primitive); + message.primitive = object.primitive; } if (object.wrapper !== undefined && object.wrapper !== null) { - message.wrapper = type_PrimitiveTypeFromJSON(object.wrapper); + message.wrapper = object.wrapper; } if (object.well_known !== undefined && object.well_known !== null) { - message.wellKnown = type_WellKnownTypeFromJSON(object.well_known); + message.wellKnown = object.well_known; } if (object.list_type !== undefined && object.list_type !== null) { message.listType = Type_ListType.fromAmino(object.list_type); @@ -1311,15 +1311,15 @@ export const Type = { 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.null = message.null === null ? undefined : message.null; + obj.primitive = message.primitive === null ? undefined : message.primitive; + obj.wrapper = message.wrapper === null ? undefined : message.wrapper; + obj.well_known = message.wellKnown === null ? undefined : 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.message_type = message.messageType === null ? undefined : message.messageType; + obj.type_param = message.typeParam === null ? undefined : 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; @@ -1637,7 +1637,7 @@ export const Type_FunctionType = { if (message.argTypes) { obj.arg_types = message.argTypes.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.arg_types = []; + obj.arg_types = message.argTypes; } return obj; }, @@ -1748,11 +1748,11 @@ export const Type_AbstractType = { }, toAmino(message: Type_AbstractType): Type_AbstractTypeAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.parameterTypes) { obj.parameter_types = message.parameterTypes.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.parameter_types = []; + obj.parameter_types = message.parameterTypes; } return obj; }, @@ -1877,7 +1877,7 @@ export const Decl = { }, toAmino(message: Decl): DeclAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.ident = message.ident ? Decl_IdentDecl.toAmino(message.ident) : undefined; obj.function = message.function ? Decl_FunctionDecl.toAmino(message.function) : undefined; return obj; @@ -2005,7 +2005,7 @@ export const Decl_IdentDecl = { 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; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromAminoMsg(object: Decl_IdentDeclAminoMsg): Decl_IdentDecl { @@ -2102,7 +2102,7 @@ export const Decl_FunctionDecl = { if (message.overloads) { obj.overloads = message.overloads.map(e => e ? Decl_FunctionDecl_Overload.toAmino(e) : undefined); } else { - obj.overloads = []; + obj.overloads = message.overloads; } return obj; }, @@ -2285,20 +2285,20 @@ export const Decl_FunctionDecl_Overload = { }, toAmino(message: Decl_FunctionDecl_Overload): Decl_FunctionDecl_OverloadAmino { const obj: any = {}; - obj.overload_id = message.overloadId; + obj.overload_id = message.overloadId === "" ? undefined : message.overloadId; if (message.params) { obj.params = message.params.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.params = []; + obj.params = message.params; } if (message.typeParams) { obj.type_params = message.typeParams.map(e => e); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } obj.result_type = message.resultType ? Type.toAmino(message.resultType) : undefined; - obj.is_instance_function = message.isInstanceFunction; - obj.doc = message.doc; + obj.is_instance_function = message.isInstanceFunction === false ? undefined : message.isInstanceFunction; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromAminoMsg(object: Decl_FunctionDecl_OverloadAminoMsg): Decl_FunctionDecl_Overload { @@ -2426,11 +2426,11 @@ export const Reference = { }, toAmino(message: Reference): ReferenceAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.overloadId) { obj.overload_id = message.overloadId.map(e => e); } else { - obj.overload_id = []; + obj.overload_id = message.overloadId; } obj.value = message.value ? Constant.toAmino(message.value) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/eval.ts b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/eval.ts index cdf6dbc118..6a6f5d581d 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/eval.ts @@ -251,12 +251,12 @@ export const EvalState = { if (message.values) { obj.values = message.values.map(e => e ? ExprValue.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.results) { obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e) : undefined); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -365,8 +365,8 @@ export const EvalState_Result = { }, 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; + obj.expr = message.expr !== BigInt(0) ? message.expr.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result { @@ -591,7 +591,7 @@ export const ErrorSet = { if (message.errors) { obj.errors = message.errors.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.errors = []; + obj.errors = message.errors; } return obj; }, @@ -698,7 +698,7 @@ export const UnknownSet = { if (message.exprs) { obj.exprs = message.exprs.map(e => e.toString()); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/explain.ts b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/explain.ts index cc2921cfe6..d803047c0d 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/explain.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/explain.ts @@ -153,12 +153,12 @@ export const Explain = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.exprSteps) { obj.expr_steps = message.exprSteps.map(e => e ? Explain_ExprStep.toAmino(e) : undefined); } else { - obj.expr_steps = []; + obj.expr_steps = message.exprSteps; } return obj; }, @@ -265,8 +265,8 @@ export const Explain_ExprStep = { }, toAmino(message: Explain_ExprStep): Explain_ExprStepAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.value_index = message.valueIndex; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.value_index = message.valueIndex === 0 ? undefined : message.valueIndex; return obj; }, fromAminoMsg(object: Explain_ExprStepAminoMsg): Explain_ExprStep { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/syntax.ts b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/syntax.ts index e074a74f60..801b92b798 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/syntax.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/syntax.ts @@ -842,7 +842,7 @@ export const Expr = { }, toAmino(message: Expr): ExprAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? 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; @@ -937,7 +937,7 @@ export const Expr_Ident = { }, toAmino(message: Expr_Ident): Expr_IdentAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident { @@ -1060,8 +1060,8 @@ export const Expr_Select = { 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; + obj.field = message.field === "" ? undefined : message.field; + obj.test_only = message.testOnly === false ? undefined : message.testOnly; return obj; }, fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select { @@ -1190,11 +1190,11 @@ export const Expr_Call = { toAmino(message: Expr_Call): Expr_CallAmino { const obj: any = {}; obj.target = message.target ? Expr.toAmino(message.target) : undefined; - obj.function = message.function; + obj.function = message.function === "" ? undefined : message.function; if (message.args) { obj.args = message.args.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } return obj; }, @@ -1292,7 +1292,7 @@ export const Expr_CreateList = { if (message.elements) { obj.elements = message.elements.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.elements = []; + obj.elements = message.elements; } return obj; }, @@ -1403,11 +1403,11 @@ export const Expr_CreateStruct = { }, toAmino(message: Expr_CreateStruct): Expr_CreateStructAmino { const obj: any = {}; - obj.message_name = message.messageName; + obj.message_name = message.messageName === "" ? undefined : message.messageName; if (message.entries) { obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1550,8 +1550,8 @@ export const Expr_CreateStruct_Entry = { }, 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.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.field_key = message.fieldKey === null ? undefined : message.fieldKey; obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; @@ -1747,9 +1747,9 @@ export const Expr_Comprehension = { }, toAmino(message: Expr_Comprehension): Expr_ComprehensionAmino { const obj: any = {}; - obj.iter_var = message.iterVar; + obj.iter_var = message.iterVar === "" ? undefined : message.iterVar; obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange) : undefined; - obj.accu_var = message.accuVar; + obj.accu_var = message.accuVar === "" ? undefined : 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; @@ -1949,7 +1949,7 @@ export const Constant = { fromAmino(object: ConstantAmino): Constant { const message = createBaseConstant(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -1979,12 +1979,12 @@ export const Constant = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; obj.duration_value = message.durationValue ? Duration.toAmino(message.durationValue) : undefined; obj.timestamp_value = message.timestampValue ? Timestamp.toAmino(toTimestamp(message.timestampValue)) : undefined; @@ -2092,8 +2092,8 @@ export const SourceInfo_PositionsEntry = { }, toAmino(message: SourceInfo_PositionsEntry): SourceInfo_PositionsEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; - obj.value = message.value; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry { @@ -2194,7 +2194,7 @@ export const SourceInfo_MacroCallsEntry = { }, toAmino(message: SourceInfo_MacroCallsEntry): SourceInfo_MacroCallsEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; }, @@ -2442,12 +2442,12 @@ export const SourceInfo = { }, toAmino(message: SourceInfo): SourceInfoAmino { const obj: any = {}; - obj.syntax_version = message.syntaxVersion; - obj.location = message.location; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -2596,10 +2596,10 @@ export const SourcePosition = { }, toAmino(message: SourcePosition): SourcePositionAmino { const obj: any = {}; - obj.location = message.location; - obj.offset = message.offset; - obj.line = message.line; - obj.column = message.column; + obj.location = message.location === "" ? undefined : message.location; + obj.offset = message.offset === 0 ? undefined : message.offset; + obj.line = message.line === 0 ? undefined : message.line; + obj.column = message.column === 0 ? undefined : message.column; return obj; }, fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/value.ts b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/value.ts index 885e7fecb0..f7387d7dc3 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/value.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1alpha1/value.ts @@ -369,7 +369,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -408,18 +408,18 @@ export const 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; 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; + obj.type_value = message.typeValue === null ? undefined : message.typeValue; return obj; }, fromAminoMsg(object: ValueAminoMsg): Value { @@ -523,8 +523,8 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.type = message.type; - obj.value = message.value; + obj.type = message.type === "" ? undefined : message.type; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EnumValueAminoMsg): EnumValue { @@ -621,7 +621,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, @@ -719,7 +719,7 @@ export const MapValue = { if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/decl.ts b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/decl.ts index d58da40c85..aa5c27d0e9 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/decl.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/decl.ts @@ -231,9 +231,9 @@ export const Decl = { }, toAmino(message: Decl): DeclAmino { const obj: any = {}; - obj.id = message.id; - obj.name = message.name; - obj.doc = message.doc; + obj.id = message.id === 0 ? undefined : message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.doc = message.doc === "" ? undefined : message.doc; obj.ident = message.ident ? IdentDecl.toAmino(message.ident) : undefined; obj.function = message.function ? FunctionDecl.toAmino(message.function) : undefined; return obj; @@ -361,12 +361,12 @@ export const DeclType = { }, toAmino(message: DeclType): DeclTypeAmino { const obj: any = {}; - obj.id = message.id; - obj.type = message.type; + obj.id = message.id === 0 ? undefined : message.id; + obj.type = message.type === "" ? undefined : message.type; if (message.typeParams) { obj.type_params = message.typeParams.map(e => e ? DeclType.toAmino(e) : undefined); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } return obj; }, @@ -607,10 +607,10 @@ export const FunctionDecl = { if (message.args) { obj.args = message.args.map(e => e ? IdentDecl.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } obj.return_type = message.returnType ? DeclType.toAmino(message.returnType) : undefined; - obj.receiver_function = message.receiverFunction; + obj.receiver_function = message.receiverFunction === false ? undefined : message.receiverFunction; return obj; }, fromAminoMsg(object: FunctionDeclAminoMsg): FunctionDecl { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/eval.ts b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/eval.ts index 2613dc06f8..a0c78e0fcc 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/eval.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/eval.ts @@ -264,12 +264,12 @@ export const EvalState = { if (message.values) { obj.values = message.values.map(e => e ? ExprValue.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.results) { obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e) : undefined); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -377,7 +377,7 @@ export const EvalState_Result = { toAmino(message: EvalState_Result): EvalState_ResultAmino { const obj: any = {}; obj.expr = message.expr ? IdRef.toAmino(message.expr) : undefined; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result { @@ -602,7 +602,7 @@ export const ErrorSet = { if (message.errors) { obj.errors = message.errors.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.errors = []; + obj.errors = message.errors; } return obj; }, @@ -700,7 +700,7 @@ export const UnknownSet = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -789,7 +789,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/expr.ts b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/expr.ts index 5e90f4ccd5..d461fbe243 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/expr.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/expr.ts @@ -513,7 +513,7 @@ export const ParsedExpr = { 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; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; return obj; }, fromAminoMsg(object: ParsedExprAminoMsg): ParsedExpr { @@ -727,7 +727,7 @@ export const Expr = { }, toAmino(message: Expr): ExprAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : 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; @@ -822,7 +822,7 @@ export const Expr_Ident = { }, toAmino(message: Expr_Ident): Expr_IdentAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident { @@ -945,8 +945,8 @@ export const Expr_Select = { 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; + obj.field = message.field === "" ? undefined : message.field; + obj.test_only = message.testOnly === false ? undefined : message.testOnly; return obj; }, fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select { @@ -1075,11 +1075,11 @@ export const Expr_Call = { toAmino(message: Expr_Call): Expr_CallAmino { const obj: any = {}; obj.target = message.target ? Expr.toAmino(message.target) : undefined; - obj.function = message.function; + obj.function = message.function === "" ? undefined : message.function; if (message.args) { obj.args = message.args.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } return obj; }, @@ -1177,7 +1177,7 @@ export const Expr_CreateList = { if (message.elements) { obj.elements = message.elements.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.elements = []; + obj.elements = message.elements; } return obj; }, @@ -1288,11 +1288,11 @@ export const Expr_CreateStruct = { }, toAmino(message: Expr_CreateStruct): Expr_CreateStructAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.entries) { obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1433,8 +1433,8 @@ export const Expr_CreateStruct_Entry = { }, toAmino(message: Expr_CreateStruct_Entry): Expr_CreateStruct_EntryAmino { const obj: any = {}; - obj.id = message.id; - obj.field_key = message.fieldKey; + obj.id = message.id === 0 ? undefined : message.id; + obj.field_key = message.fieldKey === null ? undefined : message.fieldKey; obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; @@ -1630,9 +1630,9 @@ export const Expr_Comprehension = { }, toAmino(message: Expr_Comprehension): Expr_ComprehensionAmino { const obj: any = {}; - obj.iter_var = message.iterVar; + obj.iter_var = message.iterVar === "" ? undefined : message.iterVar; obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange) : undefined; - obj.accu_var = message.accuVar; + obj.accu_var = message.accuVar === "" ? undefined : 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; @@ -1804,7 +1804,7 @@ export const Literal = { fromAmino(object: LiteralAmino): Literal { const message = createBaseLiteral(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -1828,12 +1828,12 @@ export const Literal = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/source.ts b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/source.ts index 74d34127db..afa2dccaf0 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/source.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/source.ts @@ -163,8 +163,8 @@ export const SourceInfo_PositionsEntry = { }, toAmino(message: SourceInfo_PositionsEntry): SourceInfo_PositionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === 0 ? undefined : message.key; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry { @@ -336,11 +336,11 @@ export const SourceInfo = { }, toAmino(message: SourceInfo): SourceInfoAmino { const obj: any = {}; - obj.location = message.location; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -483,10 +483,10 @@ export const SourcePosition = { }, toAmino(message: SourcePosition): SourcePositionAmino { const obj: any = {}; - obj.location = message.location; - obj.offset = message.offset; - obj.line = message.line; - obj.column = message.column; + obj.location = message.location === "" ? undefined : message.location; + obj.offset = message.offset === 0 ? undefined : message.offset; + obj.line = message.line === 0 ? undefined : message.line; + obj.column = message.column === 0 ? undefined : message.column; return obj; }, fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/value.ts b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/value.ts index c77a38f1b5..5de8bc247e 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/value.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/expr/v1beta1/value.ts @@ -369,7 +369,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -408,18 +408,18 @@ export const 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; 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; + obj.type_value = message.typeValue === null ? undefined : message.typeValue; return obj; }, fromAminoMsg(object: ValueAminoMsg): Value { @@ -523,8 +523,8 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.type = message.type; - obj.value = message.value; + obj.type = message.type === "" ? undefined : message.type; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EnumValueAminoMsg): EnumValue { @@ -621,7 +621,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, @@ -719,7 +719,7 @@ export const MapValue = { if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/http.ts b/__fixtures__/v-next/outputinstantrpc/google/api/http.ts index 0464bcb646..27fefd5395 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/http.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/http.ts @@ -756,9 +756,9 @@ export const Http = { if (message.rules) { obj.rules = message.rules.map(e => e ? HttpRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion; + obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion === false ? undefined : message.fullyDecodeReservedExpansion; return obj; }, fromAminoMsg(object: HttpAminoMsg): Http { @@ -998,19 +998,19 @@ export const HttpRule = { }, 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.selector = message.selector === "" ? undefined : message.selector; + obj.get = message.get === null ? undefined : message.get; + obj.put = message.put === null ? undefined : message.put; + obj.post = message.post === null ? undefined : message.post; + obj.delete = message.delete === null ? undefined : message.delete; + obj.patch = message.patch === null ? undefined : message.patch; obj.custom = message.custom ? CustomHttpPattern.toAmino(message.custom) : undefined; - obj.body = message.body; - obj.response_body = message.responseBody; + obj.body = message.body === "" ? undefined : message.body; + obj.response_body = message.responseBody === "" ? undefined : message.responseBody; if (message.additionalBindings) { obj.additional_bindings = message.additionalBindings.map(e => e ? HttpRule.toAmino(e) : undefined); } else { - obj.additional_bindings = []; + obj.additional_bindings = message.additionalBindings; } return obj; }, @@ -1115,8 +1115,8 @@ export const CustomHttpPattern = { }, toAmino(message: CustomHttpPattern): CustomHttpPatternAmino { const obj: any = {}; - obj.kind = message.kind; - obj.path = message.path; + obj.kind = message.kind === "" ? undefined : message.kind; + obj.path = message.path === "" ? undefined : message.path; return obj; }, fromAminoMsg(object: CustomHttpPatternAminoMsg): CustomHttpPattern { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/httpbody.ts b/__fixtures__/v-next/outputinstantrpc/google/api/httpbody.ts index 2bc4912c79..bc07994016 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/httpbody.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/httpbody.ts @@ -219,12 +219,12 @@ export const HttpBody = { }, toAmino(message: HttpBody): HttpBodyAmino { const obj: any = {}; - obj.content_type = message.contentType; + obj.content_type = message.contentType === "" ? undefined : message.contentType; obj.data = message.data ? base64FromBytes(message.data) : undefined; if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/label.ts b/__fixtures__/v-next/outputinstantrpc/google/api/label.ts index 034a9d8e4b..a26f34855d 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/label.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/label.ts @@ -153,7 +153,7 @@ export const LabelDescriptor = { message.key = object.key; } if (object.value_type !== undefined && object.value_type !== null) { - message.valueType = labelDescriptor_ValueTypeFromJSON(object.value_type); + message.valueType = object.value_type; } if (object.description !== undefined && object.description !== null) { message.description = object.description; @@ -162,9 +162,9 @@ export const LabelDescriptor = { }, toAmino(message: LabelDescriptor): LabelDescriptorAmino { const obj: any = {}; - obj.key = message.key; - obj.value_type = message.valueType; - obj.description = message.description; + obj.key = message.key === "" ? undefined : message.key; + obj.value_type = message.valueType === 0 ? undefined : message.valueType; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: LabelDescriptorAminoMsg): LabelDescriptor { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/log.ts b/__fixtures__/v-next/outputinstantrpc/google/api/log.ts index 240c58997a..aaf0a95b5c 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/log.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/log.ts @@ -180,14 +180,14 @@ export const LogDescriptor = { }, toAmino(message: LogDescriptor): LogDescriptorAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.labels; } - obj.description = message.description; - obj.display_name = message.displayName; + obj.description = message.description === "" ? undefined : message.description; + obj.display_name = message.displayName === "" ? undefined : message.displayName; return obj; }, fromAminoMsg(object: LogDescriptorAminoMsg): LogDescriptor { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/logging.ts b/__fixtures__/v-next/outputinstantrpc/google/api/logging.ts index 0af3ad896c..640f2aced6 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/logging.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/logging.ts @@ -217,12 +217,12 @@ export const Logging = { if (message.producerDestinations) { obj.producer_destinations = message.producerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e) : undefined); } else { - obj.producer_destinations = []; + obj.producer_destinations = message.producerDestinations; } if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -333,11 +333,11 @@ export const Logging_LoggingDestination = { }, toAmino(message: Logging_LoggingDestination): Logging_LoggingDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.logs) { obj.logs = message.logs.map(e => e); } else { - obj.logs = []; + obj.logs = message.logs; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/metric.ts b/__fixtures__/v-next/outputinstantrpc/google/api/metric.ts index fac907d104..e77750b1b5 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/metric.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/metric.ts @@ -616,10 +616,10 @@ export const MetricDescriptor = { } message.labels = object.labels?.map(e => LabelDescriptor.fromAmino(e)) || []; if (object.metric_kind !== undefined && object.metric_kind !== null) { - message.metricKind = metricDescriptor_MetricKindFromJSON(object.metric_kind); + message.metricKind = object.metric_kind; } if (object.value_type !== undefined && object.value_type !== null) { - message.valueType = metricDescriptor_ValueTypeFromJSON(object.value_type); + message.valueType = object.value_type; } if (object.unit !== undefined && object.unit !== null) { message.unit = object.unit; @@ -634,31 +634,31 @@ export const MetricDescriptor = { message.metadata = MetricDescriptor_MetricDescriptorMetadata.fromAmino(object.metadata); } if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } message.monitoredResourceTypes = object.monitored_resource_types?.map(e => e) || []; return message; }, toAmino(message: MetricDescriptor): MetricDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.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.metric_kind = message.metricKind === 0 ? undefined : message.metricKind; + obj.value_type = message.valueType === 0 ? undefined : message.valueType; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.description = message.description === "" ? undefined : message.description; + obj.display_name = message.displayName === "" ? undefined : message.displayName; obj.metadata = message.metadata ? MetricDescriptor_MetricDescriptorMetadata.toAmino(message.metadata) : undefined; - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; if (message.monitoredResourceTypes) { obj.monitored_resource_types = message.monitoredResourceTypes.map(e => e); } else { - obj.monitored_resource_types = []; + obj.monitored_resource_types = message.monitoredResourceTypes; } return obj; }, @@ -771,7 +771,7 @@ export const MetricDescriptor_MetricDescriptorMetadata = { fromAmino(object: MetricDescriptor_MetricDescriptorMetadataAmino): MetricDescriptor_MetricDescriptorMetadata { const message = createBaseMetricDescriptor_MetricDescriptorMetadata(); if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } if (object.sample_period !== undefined && object.sample_period !== null) { message.samplePeriod = Duration.fromAmino(object.sample_period); @@ -783,7 +783,7 @@ export const MetricDescriptor_MetricDescriptorMetadata = { }, toAmino(message: MetricDescriptor_MetricDescriptorMetadata): MetricDescriptor_MetricDescriptorMetadataAmino { const obj: any = {}; - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; obj.sample_period = message.samplePeriod ? Duration.toAmino(message.samplePeriod) : undefined; obj.ingest_delay = message.ingestDelay ? Duration.toAmino(message.ingestDelay) : undefined; return obj; @@ -888,8 +888,8 @@ export const Metric_LabelsEntry = { }, toAmino(message: Metric_LabelsEntry): Metric_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: Metric_LabelsEntryAminoMsg): Metric_LabelsEntry { @@ -1030,7 +1030,7 @@ export const Metric = { }, toAmino(message: Metric): MetricAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/monitored_resource.ts b/__fixtures__/v-next/outputinstantrpc/google/api/monitored_resource.ts index b30b9532b3..08ce330325 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/monitored_resource.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/monitored_resource.ts @@ -348,22 +348,22 @@ export const MonitoredResourceDescriptor = { } message.labels = object.labels?.map(e => LabelDescriptor.fromAmino(e)) || []; if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } return message; }, toAmino(message: MonitoredResourceDescriptor): MonitoredResourceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.display_name = message.displayName; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; + obj.display_name = message.displayName === "" ? undefined : message.displayName; + obj.description = message.description === "" ? undefined : message.description; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.labels; } - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; return obj; }, fromAminoMsg(object: MonitoredResourceDescriptorAminoMsg): MonitoredResourceDescriptor { @@ -466,8 +466,8 @@ export const MonitoredResource_LabelsEntry = { }, toAmino(message: MonitoredResource_LabelsEntry): MonitoredResource_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MonitoredResource_LabelsEntryAminoMsg): MonitoredResource_LabelsEntry { @@ -608,7 +608,7 @@ export const MonitoredResource = { }, toAmino(message: MonitoredResource): MonitoredResourceAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -717,8 +717,8 @@ export const MonitoredResourceMetadata_UserLabelsEntry = { }, toAmino(message: MonitoredResourceMetadata_UserLabelsEntry): MonitoredResourceMetadata_UserLabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MonitoredResourceMetadata_UserLabelsEntryAminoMsg): MonitoredResourceMetadata_UserLabelsEntry { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/monitoring.ts b/__fixtures__/v-next/outputinstantrpc/google/api/monitoring.ts index 4df9a3652e..ab5f9b5a3d 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/monitoring.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/monitoring.ts @@ -265,12 +265,12 @@ export const Monitoring = { if (message.producerDestinations) { obj.producer_destinations = message.producerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e) : undefined); } else { - obj.producer_destinations = []; + obj.producer_destinations = message.producerDestinations; } if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -381,11 +381,11 @@ export const Monitoring_MonitoringDestination = { }, toAmino(message: Monitoring_MonitoringDestination): Monitoring_MonitoringDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.metrics) { obj.metrics = message.metrics.map(e => e); } else { - obj.metrics = []; + obj.metrics = message.metrics; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/quota.ts b/__fixtures__/v-next/outputinstantrpc/google/api/quota.ts index e5bee1b8e7..62d8ed3331 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/quota.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/quota.ts @@ -401,12 +401,12 @@ export const Quota = { if (message.limits) { obj.limits = message.limits.map(e => e ? QuotaLimit.toAmino(e) : undefined); } else { - obj.limits = []; + obj.limits = message.limits; } if (message.metricRules) { obj.metric_rules = message.metricRules.map(e => e ? MetricRule.toAmino(e) : undefined); } else { - obj.metric_rules = []; + obj.metric_rules = message.metricRules; } return obj; }, @@ -512,8 +512,8 @@ export const MetricRule_MetricCostsEntry = { }, toAmino(message: MetricRule_MetricCostsEntry): MetricRule_MetricCostsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value ? message.value.toString() : undefined; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: MetricRule_MetricCostsEntryAminoMsg): MetricRule_MetricCostsEntry { @@ -654,7 +654,7 @@ export const MetricRule = { }, toAmino(message: MetricRule): MetricRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.metric_costs = {}; if (message.metricCosts) { Object.entries(message.metricCosts).forEach(([k, v]) => { @@ -765,8 +765,8 @@ export const QuotaLimit_ValuesEntry = { }, toAmino(message: QuotaLimit_ValuesEntry): QuotaLimit_ValuesEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value ? message.value.toString() : undefined; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: QuotaLimit_ValuesEntryAminoMsg): QuotaLimit_ValuesEntry { @@ -1041,21 +1041,21 @@ export const QuotaLimit = { }, 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.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.default_limit = message.defaultLimit !== BigInt(0) ? message.defaultLimit.toString() : undefined; + obj.max_limit = message.maxLimit !== BigInt(0) ? message.maxLimit.toString() : undefined; + obj.free_tier = message.freeTier !== BigInt(0) ? message.freeTier.toString() : undefined; + obj.duration = message.duration === "" ? undefined : message.duration; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; obj.values = {}; if (message.values) { Object.entries(message.values).forEach(([k, v]) => { obj.values[k] = v.toString(); }); } - obj.display_name = message.displayName; + obj.display_name = message.displayName === "" ? undefined : message.displayName; return obj; }, fromAminoMsg(object: QuotaLimitAminoMsg): QuotaLimit { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/resource.ts b/__fixtures__/v-next/outputinstantrpc/google/api/resource.ts index 962d17d5ef..0e4a5e2623 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/resource.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/resource.ts @@ -517,7 +517,7 @@ export const ResourceDescriptor = { message.nameField = object.name_field; } if (object.history !== undefined && object.history !== null) { - message.history = resourceDescriptor_HistoryFromJSON(object.history); + message.history = object.history; } if (object.plural !== undefined && object.plural !== null) { message.plural = object.plural; @@ -525,25 +525,25 @@ export const ResourceDescriptor = { if (object.singular !== undefined && object.singular !== null) { message.singular = object.singular; } - message.style = object.style?.map(e => resourceDescriptor_StyleFromJSON(e)) || []; + message.style = object.style?.map(e => e) || []; return message; }, toAmino(message: ResourceDescriptor): ResourceDescriptorAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.pattern) { obj.pattern = message.pattern.map(e => e); } else { - obj.pattern = []; + obj.pattern = message.pattern; } - obj.name_field = message.nameField; - obj.history = message.history; - obj.plural = message.plural; - obj.singular = message.singular; + obj.name_field = message.nameField === "" ? undefined : message.nameField; + obj.history = message.history === 0 ? undefined : message.history; + obj.plural = message.plural === "" ? undefined : message.plural; + obj.singular = message.singular === "" ? undefined : message.singular; if (message.style) { obj.style = message.style.map(e => e); } else { - obj.style = []; + obj.style = message.style; } return obj; }, @@ -648,8 +648,8 @@ export const ResourceReference = { }, toAmino(message: ResourceReference): ResourceReferenceAmino { const obj: any = {}; - obj.type = message.type; - obj.child_type = message.childType; + obj.type = message.type === "" ? undefined : message.type; + obj.child_type = message.childType === "" ? undefined : message.childType; return obj; }, fromAminoMsg(object: ResourceReferenceAminoMsg): ResourceReference { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/routing.ts b/__fixtures__/v-next/outputinstantrpc/google/api/routing.ts index 43980d662e..f045948f92 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/routing.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/routing.ts @@ -890,7 +890,7 @@ export const RoutingRule = { if (message.routingParameters) { obj.routing_parameters = message.routingParameters.map(e => e ? RoutingParameter.toAmino(e) : undefined); } else { - obj.routing_parameters = []; + obj.routing_parameters = message.routingParameters; } return obj; }, @@ -995,8 +995,8 @@ export const RoutingParameter = { }, toAmino(message: RoutingParameter): RoutingParameterAmino { const obj: any = {}; - obj.field = message.field; - obj.path_template = message.pathTemplate; + obj.field = message.field === "" ? undefined : message.field; + obj.path_template = message.pathTemplate === "" ? undefined : message.pathTemplate; return obj; }, fromAminoMsg(object: RoutingParameterAminoMsg): RoutingParameter { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/service.ts b/__fixtures__/v-next/outputinstantrpc/google/api/service.ts index 92c85c7773..0a985a4bd4 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/service.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/service.ts @@ -722,24 +722,24 @@ export const Service = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; + obj.id = message.id === "" ? undefined : message.id; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } if (message.types) { obj.types = message.types.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.types = []; + obj.types = message.types; } if (message.enums) { obj.enums = message.enums.map(e => e ? Enum.toAmino(e) : undefined); } else { - obj.enums = []; + obj.enums = message.enums; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.backend = message.backend ? Backend.toAmino(message.backend) : undefined; @@ -751,23 +751,23 @@ export const Service = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.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 = []; + obj.logs = message.logs; } if (message.metrics) { obj.metrics = message.metrics.map(e => e ? MetricDescriptor.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.billing = message.billing ? Billing.toAmino(message.billing) : undefined; obj.logging = message.logging ? Logging.toAmino(message.logging) : undefined; diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/check_error.ts b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/check_error.ts index f5a810c0d4..9cfb8461ed 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/check_error.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/check_error.ts @@ -333,7 +333,7 @@ export const CheckError = { fromAmino(object: CheckErrorAmino): CheckError { const message = createBaseCheckError(); if (object.code !== undefined && object.code !== null) { - message.code = checkError_CodeFromJSON(object.code); + message.code = object.code; } if (object.subject !== undefined && object.subject !== null) { message.subject = object.subject; @@ -348,9 +348,9 @@ export const CheckError = { }, toAmino(message: CheckError): CheckErrorAmino { const obj: any = {}; - obj.code = message.code; - obj.subject = message.subject; - obj.detail = message.detail; + obj.code = message.code === 0 ? undefined : message.code; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.detail = message.detail === "" ? undefined : message.detail; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/distribution.ts b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/distribution.ts index af739438ec..2d585a36c2 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/distribution.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/distribution.ts @@ -416,15 +416,15 @@ export const Distribution = { }, 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; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.mean = message.mean === 0 ? undefined : message.mean; + obj.minimum = message.minimum === 0 ? undefined : message.minimum; + obj.maximum = message.maximum === 0 ? undefined : message.maximum; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation === 0 ? undefined : message.sumOfSquaredDeviation; if (message.bucketCounts) { obj.bucket_counts = message.bucketCounts.map(e => e.toString()); } else { - obj.bucket_counts = []; + obj.bucket_counts = message.bucketCounts; } obj.linear_buckets = message.linearBuckets ? Distribution_LinearBuckets.toAmino(message.linearBuckets) : undefined; obj.exponential_buckets = message.exponentialBuckets ? Distribution_ExponentialBuckets.toAmino(message.exponentialBuckets) : undefined; @@ -432,7 +432,7 @@ export const Distribution = { if (message.exemplars) { obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e) : undefined); } else { - obj.exemplars = []; + obj.exemplars = message.exemplars; } return obj; }, @@ -553,9 +553,9 @@ export const Distribution_LinearBuckets = { }, toAmino(message: Distribution_LinearBuckets): Distribution_LinearBucketsAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.width = message.width; - obj.offset = message.offset; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.width = message.width === 0 ? undefined : message.width; + obj.offset = message.offset === 0 ? undefined : message.offset; return obj; }, fromAminoMsg(object: Distribution_LinearBucketsAminoMsg): Distribution_LinearBuckets { @@ -675,9 +675,9 @@ export const Distribution_ExponentialBuckets = { }, toAmino(message: Distribution_ExponentialBuckets): Distribution_ExponentialBucketsAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.growth_factor = message.growthFactor; - obj.scale = message.scale; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.growth_factor = message.growthFactor === 0 ? undefined : message.growthFactor; + obj.scale = message.scale === 0 ? undefined : message.scale; return obj; }, fromAminoMsg(object: Distribution_ExponentialBucketsAminoMsg): Distribution_ExponentialBuckets { @@ -783,7 +783,7 @@ export const Distribution_ExplicitBuckets = { if (message.bounds) { obj.bounds = message.bounds.map(e => e); } else { - obj.bounds = []; + obj.bounds = message.bounds; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/http_request.ts b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/http_request.ts index 42a252a826..62ddb90d53 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/http_request.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/http_request.ts @@ -406,21 +406,21 @@ export const HttpRequest = { }, 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.request_method = message.requestMethod === "" ? undefined : message.requestMethod; + obj.request_url = message.requestUrl === "" ? undefined : message.requestUrl; + obj.request_size = message.requestSize !== BigInt(0) ? message.requestSize.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.response_size = message.responseSize !== BigInt(0) ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent === "" ? undefined : message.userAgent; + obj.remote_ip = message.remoteIp === "" ? undefined : message.remoteIp; + obj.server_ip = message.serverIp === "" ? undefined : message.serverIp; + obj.referer = message.referer === "" ? undefined : 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; + obj.cache_lookup = message.cacheLookup === false ? undefined : message.cacheLookup; + obj.cache_hit = message.cacheHit === false ? undefined : message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer === false ? undefined : message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes !== BigInt(0) ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/log_entry.ts b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/log_entry.ts index ae3b9973d1..3217d86cfe 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/log_entry.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/log_entry.ts @@ -261,8 +261,8 @@ export const LogEntry_LabelsEntry = { }, toAmino(message: LogEntry_LabelsEntry): LogEntry_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry { @@ -535,7 +535,7 @@ export const LogEntry = { message.timestamp = fromTimestamp(Timestamp.fromAmino(object.timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.http_request !== undefined && object.http_request !== null) { message.httpRequest = HttpRequest.fromAmino(object.http_request); @@ -573,12 +573,12 @@ export const LogEntry = { }, toAmino(message: LogEntry): LogEntryAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; - obj.trace = message.trace; - obj.insert_id = message.insertId; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -586,7 +586,7 @@ export const LogEntry = { }); } obj.proto_payload = message.protoPayload ? Any.toAmino(message.protoPayload) : undefined; - obj.text_payload = message.textPayload; + obj.text_payload = message.textPayload === null ? undefined : 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; @@ -725,10 +725,10 @@ export const LogEntryOperation = { }, toAmino(message: LogEntryOperation): LogEntryOperationAmino { const obj: any = {}; - obj.id = message.id; - obj.producer = message.producer; - obj.first = message.first; - obj.last = message.last; + obj.id = message.id === "" ? undefined : message.id; + obj.producer = message.producer === "" ? undefined : message.producer; + obj.first = message.first === false ? undefined : message.first; + obj.last = message.last === false ? undefined : message.last; return obj; }, fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation { @@ -850,9 +850,9 @@ export const LogEntrySourceLocation = { }, toAmino(message: LogEntrySourceLocation): LogEntrySourceLocationAmino { const obj: any = {}; - obj.file = message.file; - obj.line = message.line ? message.line.toString() : undefined; - obj.function = message.function; + obj.file = message.file === "" ? undefined : message.file; + obj.line = message.line !== BigInt(0) ? message.line.toString() : undefined; + obj.function = message.function === "" ? undefined : message.function; return obj; }, fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/metric_value.ts b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/metric_value.ts index 6f369d68b9..47d8c3ac9d 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/metric_value.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/metric_value.ts @@ -176,8 +176,8 @@ export const MetricValue_LabelsEntry = { }, toAmino(message: MetricValue_LabelsEntry): MetricValue_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MetricValue_LabelsEntryAminoMsg): MetricValue_LabelsEntry { @@ -428,10 +428,10 @@ export const MetricValue = { } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; - 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.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.distribution_value = message.distributionValue ? Distribution.toAmino(message.distributionValue) : undefined; return obj; }, @@ -542,11 +542,11 @@ export const MetricValueSet = { }, toAmino(message: MetricValueSet): MetricValueSetAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; if (message.metricValues) { obj.metric_values = message.metricValues.map(e => e ? MetricValue.toAmino(e) : undefined); } else { - obj.metric_values = []; + obj.metric_values = message.metricValues; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/operation.ts b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/operation.ts index 516a95321a..f35cf14063 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/operation.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/operation.ts @@ -243,8 +243,8 @@ export const Operation_LabelsEntry = { }, toAmino(message: Operation_LabelsEntry): Operation_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: Operation_LabelsEntryAminoMsg): Operation_LabelsEntry { @@ -524,16 +524,16 @@ export const Operation = { message.metricValueSets = object.metric_value_sets?.map(e => MetricValueSet.fromAmino(e)) || []; message.logEntries = object.log_entries?.map(e => LogEntry.fromAmino(e)) || []; if (object.importance !== undefined && object.importance !== null) { - message.importance = operation_ImportanceFromJSON(object.importance); + message.importance = object.importance; } message.extensions = object.extensions?.map(e => Any.fromAmino(e)) || []; return message; }, toAmino(message: Operation): OperationAmino { const obj: any = {}; - obj.operation_id = message.operationId; - obj.operation_name = message.operationName; - obj.consumer_id = message.consumerId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; + obj.operation_name = message.operationName === "" ? undefined : message.operationName; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; obj.labels = {}; @@ -545,18 +545,18 @@ export const Operation = { if (message.metricValueSets) { obj.metric_value_sets = message.metricValueSets.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.metric_value_sets = []; + obj.metric_value_sets = message.metricValueSets; } if (message.logEntries) { obj.log_entries = message.logEntries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.log_entries = []; + obj.log_entries = message.logEntries; } - obj.importance = message.importance; + obj.importance = message.importance === 0 ? undefined : message.importance; if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/quota_controller.ts b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/quota_controller.ts index 5398852c61..932a0e3206 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/quota_controller.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/quota_controller.ts @@ -453,9 +453,9 @@ export const AllocateQuotaRequest = { }, toAmino(message: AllocateQuotaRequest): AllocateQuotaRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.allocate_operation = message.allocateOperation ? QuotaOperation.toAmino(message.allocateOperation) : undefined; - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: AllocateQuotaRequestAminoMsg): AllocateQuotaRequest { @@ -558,8 +558,8 @@ export const QuotaOperation_LabelsEntry = { }, toAmino(message: QuotaOperation_LabelsEntry): QuotaOperation_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaOperation_LabelsEntryAminoMsg): QuotaOperation_LabelsEntry { @@ -764,15 +764,15 @@ export const QuotaOperation = { }, {}); message.quotaMetrics = object.quota_metrics?.map(e => MetricValueSet.fromAmino(e)) || []; if (object.quota_mode !== undefined && object.quota_mode !== null) { - message.quotaMode = quotaOperation_QuotaModeFromJSON(object.quota_mode); + message.quotaMode = object.quota_mode; } return message; }, toAmino(message: QuotaOperation): QuotaOperationAmino { const obj: any = {}; - obj.operation_id = message.operationId; - obj.method_name = message.methodName; - obj.consumer_id = message.consumerId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; + obj.method_name = message.methodName === "" ? undefined : message.methodName; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -782,9 +782,9 @@ export const QuotaOperation = { if (message.quotaMetrics) { obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.quota_metrics = []; + obj.quota_metrics = message.quotaMetrics; } - obj.quota_mode = message.quotaMode; + obj.quota_mode = message.quotaMode === 0 ? undefined : message.quotaMode; return obj; }, fromAminoMsg(object: QuotaOperationAminoMsg): QuotaOperation { @@ -932,18 +932,18 @@ export const AllocateQuotaResponse = { }, toAmino(message: AllocateQuotaResponse): AllocateQuotaResponseAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; if (message.allocateErrors) { obj.allocate_errors = message.allocateErrors.map(e => e ? QuotaError.toAmino(e) : undefined); } else { - obj.allocate_errors = []; + obj.allocate_errors = message.allocateErrors; } if (message.quotaMetrics) { obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.quota_metrics = []; + obj.quota_metrics = message.quotaMetrics; } - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: AllocateQuotaResponseAminoMsg): AllocateQuotaResponse { @@ -1066,7 +1066,7 @@ export const QuotaError = { fromAmino(object: QuotaErrorAmino): QuotaError { const message = createBaseQuotaError(); if (object.code !== undefined && object.code !== null) { - message.code = quotaError_CodeFromJSON(object.code); + message.code = object.code; } if (object.subject !== undefined && object.subject !== null) { message.subject = object.subject; @@ -1081,9 +1081,9 @@ export const QuotaError = { }, toAmino(message: QuotaError): QuotaErrorAmino { const obj: any = {}; - obj.code = message.code; - obj.subject = message.subject; - obj.description = message.description; + obj.code = message.code === 0 ? undefined : message.code; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/service_controller.ts b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/service_controller.ts index 73adaa976a..cba968e113 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/service_controller.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v1/service_controller.ts @@ -395,9 +395,9 @@ export const CheckRequest = { }, toAmino(message: CheckRequest): CheckRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.operation = message.operation ? Operation.toAmino(message.operation) : undefined; - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -557,14 +557,14 @@ export const CheckResponse = { }, toAmino(message: CheckResponse): CheckResponseAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; if (message.checkErrors) { obj.check_errors = message.checkErrors.map(e => e ? CheckError.toAmino(e) : undefined); } else { - obj.check_errors = []; + obj.check_errors = message.checkErrors; } - obj.service_config_id = message.serviceConfigId; - obj.service_rollout_id = message.serviceRolloutId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId === "" ? undefined : message.serviceRolloutId; obj.check_info = message.checkInfo ? CheckResponse_CheckInfo.toAmino(message.checkInfo) : undefined; return obj; }, @@ -680,7 +680,7 @@ export const CheckResponse_CheckInfo = { if (message.unusedArguments) { obj.unused_arguments = message.unusedArguments.map(e => e); } else { - obj.unused_arguments = []; + obj.unused_arguments = message.unusedArguments; } obj.consumer_info = message.consumerInfo ? CheckResponse_ConsumerInfo.toAmino(message.consumerInfo) : undefined; return obj; @@ -797,7 +797,7 @@ export const CheckResponse_ConsumerInfo = { message.projectNumber = BigInt(object.project_number); } if (object.type !== undefined && object.type !== null) { - message.type = checkResponse_ConsumerInfo_ConsumerTypeFromJSON(object.type); + message.type = object.type; } if (object.consumer_number !== undefined && object.consumer_number !== null) { message.consumerNumber = BigInt(object.consumer_number); @@ -806,9 +806,9 @@ export const CheckResponse_ConsumerInfo = { }, 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; + obj.project_number = message.projectNumber !== BigInt(0) ? message.projectNumber.toString() : undefined; + obj.type = message.type === 0 ? undefined : message.type; + obj.consumer_number = message.consumerNumber !== BigInt(0) ? message.consumerNumber.toString() : undefined; return obj; }, fromAminoMsg(object: CheckResponse_ConsumerInfoAminoMsg): CheckResponse_ConsumerInfo { @@ -934,13 +934,13 @@ export const ReportRequest = { }, toAmino(message: ReportRequest): ReportRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; if (message.operations) { obj.operations = message.operations.map(e => e ? Operation.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: ReportRequestAminoMsg): ReportRequest { @@ -1069,10 +1069,10 @@ export const ReportResponse = { if (message.reportErrors) { obj.report_errors = message.reportErrors.map(e => e ? ReportResponse_ReportError.toAmino(e) : undefined); } else { - obj.report_errors = []; + obj.report_errors = message.reportErrors; } - obj.service_config_id = message.serviceConfigId; - obj.service_rollout_id = message.serviceRolloutId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId === "" ? undefined : message.serviceRolloutId; return obj; }, fromAminoMsg(object: ReportResponseAminoMsg): ReportResponse { @@ -1178,7 +1178,7 @@ export const ReportResponse_ReportError = { }, toAmino(message: ReportResponse_ReportError): ReportResponse_ReportErrorAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v2/service_controller.ts b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v2/service_controller.ts index 9c8027e793..aa0391be97 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v2/service_controller.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/servicecontrol/v2/service_controller.ts @@ -305,15 +305,15 @@ export const CheckRequest = { }, toAmino(message: CheckRequest): CheckRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.service_config_id = message.serviceConfigId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.service_config_id = message.serviceConfigId === "" ? undefined : 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.resources = message.resources; } - obj.flags = message.flags; + obj.flags = message.flags === "" ? undefined : message.flags; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -465,11 +465,11 @@ export const ResourceInfo = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; + obj.permission = message.permission === "" ? undefined : message.permission; + obj.container = message.container === "" ? undefined : message.container; + obj.location = message.location === "" ? undefined : message.location; return obj; }, fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo { @@ -572,8 +572,8 @@ export const CheckResponse_HeadersEntry = { }, toAmino(message: CheckResponse_HeadersEntry): CheckResponse_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: CheckResponse_HeadersEntryAminoMsg): CheckResponse_HeadersEntry { @@ -848,12 +848,12 @@ export const ReportRequest = { }, toAmino(message: ReportRequest): ReportRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.service_config_id = message.serviceConfigId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; if (message.operations) { obj.operations = message.operations.map(e => e ? AttributeContext.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/servicemanagement/v1/resources.ts b/__fixtures__/v-next/outputinstantrpc/google/api/servicemanagement/v1/resources.ts index 122986199d..7f9a439da8 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/servicemanagement/v1/resources.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/servicemanagement/v1/resources.ts @@ -682,8 +682,8 @@ export const ManagedService = { }, toAmino(message: ManagedService): ManagedServiceAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.producer_project_id = message.producerProjectId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; return obj; }, fromAminoMsg(object: ManagedServiceAminoMsg): ManagedService { @@ -834,14 +834,14 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } if (message.steps) { obj.steps = message.steps.map(e => e ? OperationMetadata_Step.toAmino(e) : undefined); } else { - obj.steps = []; + obj.steps = message.steps; } - obj.progress_percentage = message.progressPercentage; + obj.progress_percentage = message.progressPercentage === 0 ? undefined : message.progressPercentage; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, @@ -940,14 +940,14 @@ export const OperationMetadata_Step = { message.description = object.description; } if (object.status !== undefined && object.status !== null) { - message.status = operationMetadata_StatusFromJSON(object.status); + message.status = object.status; } return message; }, toAmino(message: OperationMetadata_Step): OperationMetadata_StepAmino { const obj: any = {}; - obj.description = message.description; - obj.status = message.status; + obj.description = message.description === "" ? undefined : message.description; + obj.status = message.status === 0 ? undefined : message.status; return obj; }, fromAminoMsg(object: OperationMetadata_StepAminoMsg): OperationMetadata_Step { @@ -1058,7 +1058,7 @@ export const Diagnostic = { message.location = object.location; } if (object.kind !== undefined && object.kind !== null) { - message.kind = diagnostic_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.message !== undefined && object.message !== null) { message.message = object.message; @@ -1067,9 +1067,9 @@ export const Diagnostic = { }, toAmino(message: Diagnostic): DiagnosticAmino { const obj: any = {}; - obj.location = message.location; - obj.kind = message.kind; - obj.message = message.message; + obj.location = message.location === "" ? undefined : message.location; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: DiagnosticAminoMsg): Diagnostic { @@ -1179,11 +1179,11 @@ export const ConfigSource = { }, toAmino(message: ConfigSource): ConfigSourceAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; if (message.files) { obj.files = message.files.map(e => e ? ConfigFile.toAmino(e) : undefined); } else { - obj.files = []; + obj.files = message.files; } return obj; }, @@ -1298,15 +1298,15 @@ export const ConfigFile = { message.fileContents = bytesFromBase64(object.file_contents); } if (object.file_type !== undefined && object.file_type !== null) { - message.fileType = configFile_FileTypeFromJSON(object.file_type); + message.fileType = object.file_type; } return message; }, toAmino(message: ConfigFile): ConfigFileAmino { const obj: any = {}; - obj.file_path = message.filePath; + obj.file_path = message.filePath === "" ? undefined : message.filePath; obj.file_contents = message.fileContents ? base64FromBytes(message.fileContents) : undefined; - obj.file_type = message.fileType; + obj.file_type = message.fileType === 0 ? undefined : message.fileType; return obj; }, fromAminoMsg(object: ConfigFileAminoMsg): ConfigFile { @@ -1394,7 +1394,7 @@ export const ConfigRef = { }, toAmino(message: ConfigRef): ConfigRefAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: ConfigRefAminoMsg): ConfigRef { @@ -1491,7 +1491,7 @@ export const ChangeReport = { if (message.configChanges) { obj.config_changes = message.configChanges.map(e => e ? ConfigChange.toAmino(e) : undefined); } else { - obj.config_changes = []; + obj.config_changes = message.configChanges; } return obj; }, @@ -1665,7 +1665,7 @@ export const Rollout = { message.createdBy = object.created_by; } if (object.status !== undefined && object.status !== null) { - message.status = rollout_RolloutStatusFromJSON(object.status); + message.status = object.status; } if (object.traffic_percent_strategy !== undefined && object.traffic_percent_strategy !== null) { message.trafficPercentStrategy = Rollout_TrafficPercentStrategy.fromAmino(object.traffic_percent_strategy); @@ -1680,13 +1680,13 @@ export const Rollout = { }, toAmino(message: Rollout): RolloutAmino { const obj: any = {}; - obj.rollout_id = message.rolloutId; + obj.rollout_id = message.rolloutId === "" ? undefined : message.rolloutId; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; - obj.created_by = message.createdBy; - obj.status = message.status; + obj.created_by = message.createdBy === "" ? undefined : message.createdBy; + obj.status = message.status === 0 ? undefined : 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; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: RolloutAminoMsg): Rollout { @@ -1789,8 +1789,8 @@ export const Rollout_TrafficPercentStrategy_PercentagesEntry = { }, toAmino(message: Rollout_TrafficPercentStrategy_PercentagesEntry): Rollout_TrafficPercentStrategy_PercentagesEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: Rollout_TrafficPercentStrategy_PercentagesEntryAminoMsg): Rollout_TrafficPercentStrategy_PercentagesEntry { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/servicemanagement/v1/servicemanager.ts b/__fixtures__/v-next/outputinstantrpc/google/api/servicemanagement/v1/servicemanager.ts index 4657b47d10..a5b9a64b21 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/servicemanagement/v1/servicemanager.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/servicemanagement/v1/servicemanager.ts @@ -562,10 +562,10 @@ export const ListServicesRequest = { }, 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; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -678,9 +678,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? ManagedService.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -768,7 +768,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -946,7 +946,7 @@ export const DeleteServiceRequest = { }, toAmino(message: DeleteServiceRequest): DeleteServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: DeleteServiceRequestAminoMsg): DeleteServiceRequest { @@ -1034,7 +1034,7 @@ export const UndeleteServiceRequest = { }, toAmino(message: UndeleteServiceRequest): UndeleteServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: UndeleteServiceRequestAminoMsg): UndeleteServiceRequest { @@ -1238,15 +1238,15 @@ export const GetServiceConfigRequest = { message.configId = object.config_id; } if (object.view !== undefined && object.view !== null) { - message.view = getServiceConfigRequest_ConfigViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetServiceConfigRequest): GetServiceConfigRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.config_id = message.configId; - obj.view = message.view; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.config_id = message.configId === "" ? undefined : message.configId; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetServiceConfigRequestAminoMsg): GetServiceConfigRequest { @@ -1366,9 +1366,9 @@ export const ListServiceConfigsRequest = { }, toAmino(message: ListServiceConfigsRequest): ListServiceConfigsRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListServiceConfigsRequestAminoMsg): ListServiceConfigsRequest { @@ -1481,9 +1481,9 @@ export const ListServiceConfigsResponse = { if (message.serviceConfigs) { obj.service_configs = message.serviceConfigs.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.service_configs = []; + obj.service_configs = message.serviceConfigs; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServiceConfigsResponseAminoMsg): ListServiceConfigsResponse { @@ -1589,7 +1589,7 @@ export const CreateServiceConfigRequest = { }, toAmino(message: CreateServiceConfigRequest): CreateServiceConfigRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.service_config = message.serviceConfig ? Service.toAmino(message.serviceConfig) : undefined; return obj; }, @@ -1712,9 +1712,9 @@ export const SubmitConfigSourceRequest = { }, toAmino(message: SubmitConfigSourceRequest): SubmitConfigSourceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.config_source = message.configSource ? ConfigSource.toAmino(message.configSource) : undefined; - obj.validate_only = message.validateOnly; + obj.validate_only = message.validateOnly === false ? undefined : message.validateOnly; return obj; }, fromAminoMsg(object: SubmitConfigSourceRequestAminoMsg): SubmitConfigSourceRequest { @@ -1910,7 +1910,7 @@ export const CreateServiceRolloutRequest = { }, toAmino(message: CreateServiceRolloutRequest): CreateServiceRolloutRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.rollout = message.rollout ? Rollout.toAmino(message.rollout) : undefined; return obj; }, @@ -2047,10 +2047,10 @@ export const ListServiceRolloutsRequest = { }, 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; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServiceRolloutsRequestAminoMsg): ListServiceRolloutsRequest { @@ -2163,9 +2163,9 @@ export const ListServiceRolloutsResponse = { if (message.rollouts) { obj.rollouts = message.rollouts.map(e => e ? Rollout.toAmino(e) : undefined); } else { - obj.rollouts = []; + obj.rollouts = message.rollouts; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServiceRolloutsResponseAminoMsg): ListServiceRolloutsResponse { @@ -2269,8 +2269,8 @@ export const GetServiceRolloutRequest = { }, toAmino(message: GetServiceRolloutRequest): GetServiceRolloutRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.rollout_id = message.rolloutId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.rollout_id = message.rolloutId === "" ? undefined : message.rolloutId; return obj; }, fromAminoMsg(object: GetServiceRolloutRequestAminoMsg): GetServiceRolloutRequest { @@ -2527,17 +2527,17 @@ export const GenerateConfigReportResponse = { }, toAmino(message: GenerateConfigReportResponse): GenerateConfigReportResponseAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.id = message.id; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.id = message.id === "" ? undefined : message.id; if (message.changeReports) { obj.change_reports = message.changeReports.map(e => e ? ChangeReport.toAmino(e) : undefined); } else { - obj.change_reports = []; + obj.change_reports = message.changeReports; } if (message.diagnostics) { obj.diagnostics = message.diagnostics.map(e => e ? Diagnostic.toAmino(e) : undefined); } else { - obj.diagnostics = []; + obj.diagnostics = message.diagnostics; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1/resources.ts b/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1/resources.ts index 2ceb0f402b..024c546cb1 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1/resources.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1/resources.ts @@ -283,16 +283,16 @@ export const Service = { message.config = ServiceConfig.fromAmino(object.config); } if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: Service): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.parent = message.parent; + obj.name = message.name === "" ? undefined : message.name; + obj.parent = message.parent === "" ? undefined : message.parent; obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: ServiceAminoMsg): Service { @@ -552,12 +552,12 @@ export const ServiceConfig = { }, toAmino(message: ServiceConfig): ServiceConfigAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; @@ -566,12 +566,12 @@ export const ServiceConfig = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; return obj; @@ -670,7 +670,7 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1/serviceusage.ts b/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1/serviceusage.ts index 2c92e2c7c0..2d43ff4fd6 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1/serviceusage.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1/serviceusage.ts @@ -414,7 +414,7 @@ export const EnableServiceRequest = { }, toAmino(message: EnableServiceRequest): EnableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest { @@ -618,15 +618,15 @@ export const DisableServiceRequest = { message.disableDependentServices = object.disable_dependent_services; } if (object.check_if_service_has_usage !== undefined && object.check_if_service_has_usage !== null) { - message.checkIfServiceHasUsage = disableServiceRequest_CheckIfServiceHasUsageFromJSON(object.check_if_service_has_usage); + message.checkIfServiceHasUsage = object.check_if_service_has_usage; } return message; }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.disable_dependent_services = message.disableDependentServices === false ? undefined : message.disableDependentServices; + obj.check_if_service_has_usage = message.checkIfServiceHasUsage === 0 ? undefined : message.checkIfServiceHasUsage; return obj; }, fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest { @@ -804,7 +804,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -940,10 +940,10 @@ export const ListServicesRequest = { }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -1056,9 +1056,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -1168,11 +1168,11 @@ export const BatchEnableServicesRequest = { }, toAmino(message: BatchEnableServicesRequest): BatchEnableServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.serviceIds) { obj.service_ids = message.serviceIds.map(e => e); } else { - obj.service_ids = []; + obj.service_ids = message.serviceIds; } return obj; }, @@ -1292,12 +1292,12 @@ export const BatchEnableServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } if (message.failures) { obj.failures = message.failures.map(e => e ? BatchEnableServicesResponse_EnableFailure.toAmino(e) : undefined); } else { - obj.failures = []; + obj.failures = message.failures; } return obj; }, @@ -1402,8 +1402,8 @@ export const BatchEnableServicesResponse_EnableFailure = { }, toAmino(message: BatchEnableServicesResponse_EnableFailure): BatchEnableServicesResponse_EnableFailureAmino { const obj: any = {}; - obj.service_id = message.serviceId; - obj.error_message = message.errorMessage; + obj.service_id = message.serviceId === "" ? undefined : message.serviceId; + obj.error_message = message.errorMessage === "" ? undefined : message.errorMessage; return obj; }, fromAminoMsg(object: BatchEnableServicesResponse_EnableFailureAminoMsg): BatchEnableServicesResponse_EnableFailure { @@ -1513,11 +1513,11 @@ export const BatchGetServicesRequest = { }, toAmino(message: BatchGetServicesRequest): BatchGetServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.names) { obj.names = message.names.map(e => e); } else { - obj.names = []; + obj.names = message.names; } return obj; }, @@ -1615,7 +1615,7 @@ export const BatchGetServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1beta1/resources.ts b/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1beta1/resources.ts index 8021a8f462..c772a7d927 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1beta1/resources.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1beta1/resources.ts @@ -777,16 +777,16 @@ export const Service = { message.config = ServiceConfig.fromAmino(object.config); } if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: Service): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.parent = message.parent; + obj.name = message.name === "" ? undefined : message.name; + obj.parent = message.parent === "" ? undefined : message.parent; obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: ServiceAminoMsg): Service { @@ -1046,12 +1046,12 @@ export const ServiceConfig = { }, toAmino(message: ServiceConfig): ServiceConfigAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; @@ -1060,12 +1060,12 @@ export const ServiceConfig = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; return obj; @@ -1164,7 +1164,7 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, @@ -1345,20 +1345,20 @@ export const ConsumerQuotaMetric = { }, toAmino(message: ConsumerQuotaMetric): ConsumerQuotaMetricAmino { const obj: any = {}; - obj.name = message.name; - obj.metric = message.metric; - obj.display_name = message.displayName; + obj.name = message.name === "" ? undefined : message.name; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.display_name = message.displayName === "" ? undefined : message.displayName; if (message.consumerQuotaLimits) { obj.consumer_quota_limits = message.consumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e) : undefined); } else { - obj.consumer_quota_limits = []; + obj.consumer_quota_limits = message.consumerQuotaLimits; } if (message.descendantConsumerQuotaLimits) { obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e) : undefined); } else { - obj.descendant_consumer_quota_limits = []; + obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits; } - obj.unit = message.unit; + obj.unit = message.unit === "" ? undefined : message.unit; return obj; }, fromAminoMsg(object: ConsumerQuotaMetricAminoMsg): ConsumerQuotaMetric { @@ -1532,15 +1532,15 @@ export const ConsumerQuotaLimit = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.is_precise = message.isPrecise === false ? undefined : message.isPrecise; + obj.allows_admin_overrides = message.allowsAdminOverrides === false ? undefined : message.allowsAdminOverrides; if (message.quotaBuckets) { obj.quota_buckets = message.quotaBuckets.map(e => e ? QuotaBucket.toAmino(e) : undefined); } else { - obj.quota_buckets = []; + obj.quota_buckets = message.quotaBuckets; } return obj; }, @@ -1644,8 +1644,8 @@ export const QuotaBucket_DimensionsEntry = { }, toAmino(message: QuotaBucket_DimensionsEntry): QuotaBucket_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaBucket_DimensionsEntryAminoMsg): QuotaBucket_DimensionsEntry { @@ -1860,8 +1860,8 @@ export const QuotaBucket = { }, 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.effective_limit = message.effectiveLimit !== BigInt(0) ? message.effectiveLimit.toString() : undefined; + obj.default_limit = message.defaultLimit !== BigInt(0) ? 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; @@ -1973,8 +1973,8 @@ export const QuotaOverride_DimensionsEntry = { }, toAmino(message: QuotaOverride_DimensionsEntry): QuotaOverride_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaOverride_DimensionsEntryAminoMsg): QuotaOverride_DimensionsEntry { @@ -2181,17 +2181,17 @@ export const QuotaOverride = { }, toAmino(message: QuotaOverride): QuotaOverrideAmino { const obj: any = {}; - obj.name = message.name; - obj.override_value = message.overrideValue ? message.overrideValue.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.override_value = message.overrideValue !== BigInt(0) ? 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; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.admin_override_ancestor = message.adminOverrideAncestor === "" ? undefined : message.adminOverrideAncestor; return obj; }, fromAminoMsg(object: QuotaOverrideAminoMsg): QuotaOverride { @@ -2288,7 +2288,7 @@ export const OverrideInlineSource = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -2392,8 +2392,8 @@ export const AdminQuotaPolicy_DimensionsEntry = { }, toAmino(message: AdminQuotaPolicy_DimensionsEntry): AdminQuotaPolicy_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AdminQuotaPolicy_DimensionsEntryAminoMsg): AdminQuotaPolicy_DimensionsEntry { @@ -2600,17 +2600,17 @@ export const AdminQuotaPolicy = { }, toAmino(message: AdminQuotaPolicy): AdminQuotaPolicyAmino { const obj: any = {}; - obj.name = message.name; - obj.policy_value = message.policyValue ? message.policyValue.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.policy_value = message.policyValue !== BigInt(0) ? 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; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.container = message.container === "" ? undefined : message.container; return obj; }, fromAminoMsg(object: AdminQuotaPolicyAminoMsg): AdminQuotaPolicy { @@ -2714,8 +2714,8 @@ export const ServiceIdentity = { }, toAmino(message: ServiceIdentity): ServiceIdentityAmino { const obj: any = {}; - obj.email = message.email; - obj.unique_id = message.uniqueId; + obj.email = message.email === "" ? undefined : message.email; + obj.unique_id = message.uniqueId === "" ? undefined : message.uniqueId; return obj; }, fromAminoMsg(object: ServiceIdentityAminoMsg): ServiceIdentity { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1beta1/serviceusage.ts b/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1beta1/serviceusage.ts index 8b26c0cee0..3ce3566f5d 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1beta1/serviceusage.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/serviceusage/v1beta1/serviceusage.ts @@ -969,7 +969,7 @@ export const EnableServiceRequest = { }, toAmino(message: EnableServiceRequest): EnableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest { @@ -1057,7 +1057,7 @@ export const DisableServiceRequest = { }, toAmino(message: DisableServiceRequest): DisableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest { @@ -1145,7 +1145,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -1281,10 +1281,10 @@ export const ListServicesRequest = { }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -1397,9 +1397,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -1509,11 +1509,11 @@ export const BatchEnableServicesRequest = { }, toAmino(message: BatchEnableServicesRequest): BatchEnableServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.serviceIds) { obj.service_ids = message.serviceIds.map(e => e); } else { - obj.service_ids = []; + obj.service_ids = message.serviceIds; } return obj; }, @@ -1644,16 +1644,16 @@ export const ListConsumerQuotaMetricsRequest = { message.pageToken = object.page_token; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: ListConsumerQuotaMetricsRequestAminoMsg): ListConsumerQuotaMetricsRequest { @@ -1766,9 +1766,9 @@ export const ListConsumerQuotaMetricsResponse = { if (message.metrics) { obj.metrics = message.metrics.map(e => e ? ConsumerQuotaMetric.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListConsumerQuotaMetricsResponseAminoMsg): ListConsumerQuotaMetricsResponse { @@ -1866,14 +1866,14 @@ export const GetConsumerQuotaMetricRequest = { message.name = object.name; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetConsumerQuotaMetricRequest): GetConsumerQuotaMetricRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.view = message.view; + obj.name = message.name === "" ? undefined : message.name; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetConsumerQuotaMetricRequestAminoMsg): GetConsumerQuotaMetricRequest { @@ -1971,14 +1971,14 @@ export const GetConsumerQuotaLimitRequest = { message.name = object.name; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetConsumerQuotaLimitRequest): GetConsumerQuotaLimitRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.view = message.view; + obj.name = message.name === "" ? undefined : message.name; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetConsumerQuotaLimitRequestAminoMsg): GetConsumerQuotaLimitRequest { @@ -2126,18 +2126,18 @@ export const CreateAdminOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: CreateAdminOverrideRequest): CreateAdminOverrideRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2304,19 +2304,19 @@ export const UpdateAdminOverrideRequest = { if (object.update_mask !== undefined && object.update_mask !== null) { message.updateMask = FieldMask.fromAmino(object.update_mask); } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: UpdateAdminOverrideRequest): UpdateAdminOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2447,17 +2447,17 @@ export const DeleteAdminOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: DeleteAdminOverrideRequest): DeleteAdminOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.force = message.force; + obj.name = message.name === "" ? undefined : message.name; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2578,9 +2578,9 @@ export const ListAdminOverridesRequest = { }, toAmino(message: ListAdminOverridesRequest): ListAdminOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListAdminOverridesRequestAminoMsg): ListAdminOverridesRequest { @@ -2693,9 +2693,9 @@ export const ListAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListAdminOverridesResponseAminoMsg): ListAdminOverridesResponse { @@ -2792,7 +2792,7 @@ export const BatchCreateAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -2941,18 +2941,18 @@ export const ImportAdminOverridesRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: ImportAdminOverridesRequest): ImportAdminOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3050,7 +3050,7 @@ export const ImportAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -3267,18 +3267,18 @@ export const CreateConsumerOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: CreateConsumerOverrideRequest): CreateConsumerOverrideRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3445,19 +3445,19 @@ export const UpdateConsumerOverrideRequest = { if (object.update_mask !== undefined && object.update_mask !== null) { message.updateMask = FieldMask.fromAmino(object.update_mask); } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: UpdateConsumerOverrideRequest): UpdateConsumerOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3588,17 +3588,17 @@ export const DeleteConsumerOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: DeleteConsumerOverrideRequest): DeleteConsumerOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.force = message.force; + obj.name = message.name === "" ? undefined : message.name; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3719,9 +3719,9 @@ export const ListConsumerOverridesRequest = { }, toAmino(message: ListConsumerOverridesRequest): ListConsumerOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListConsumerOverridesRequestAminoMsg): ListConsumerOverridesRequest { @@ -3834,9 +3834,9 @@ export const ListConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListConsumerOverridesResponseAminoMsg): ListConsumerOverridesResponse { @@ -3933,7 +3933,7 @@ export const BatchCreateConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -4082,18 +4082,18 @@ export const ImportConsumerOverridesRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: ImportConsumerOverridesRequest): ImportConsumerOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -4191,7 +4191,7 @@ export const ImportConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -4357,7 +4357,7 @@ export const ImportAdminQuotaPoliciesResponse = { if (message.policies) { obj.policies = message.policies.map(e => e ? AdminQuotaPolicy.toAmino(e) : undefined); } else { - obj.policies = []; + obj.policies = message.policies; } return obj; }, @@ -4718,7 +4718,7 @@ export const GenerateServiceIdentityRequest = { }, toAmino(message: GenerateServiceIdentityRequest): GenerateServiceIdentityRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; return obj; }, fromAminoMsg(object: GenerateServiceIdentityRequestAminoMsg): GenerateServiceIdentityRequest { @@ -4818,14 +4818,14 @@ export const GetServiceIdentityResponse = { message.identity = ServiceIdentity.fromAmino(object.identity); } if (object.state !== undefined && object.state !== null) { - message.state = getServiceIdentityResponse_IdentityStateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: GetServiceIdentityResponse): GetServiceIdentityResponseAmino { const obj: any = {}; obj.identity = message.identity ? ServiceIdentity.toAmino(message.identity) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: GetServiceIdentityResponseAminoMsg): GetServiceIdentityResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/source_info.ts b/__fixtures__/v-next/outputinstantrpc/google/api/source_info.ts index 6744c567c6..9e0ba28110 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/source_info.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/source_info.ts @@ -93,7 +93,7 @@ export const SourceInfo = { if (message.sourceFiles) { obj.source_files = message.sourceFiles.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.source_files = []; + obj.source_files = message.sourceFiles; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/system_parameter.ts b/__fixtures__/v-next/outputinstantrpc/google/api/system_parameter.ts index 1809103059..27679cfc2d 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/system_parameter.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/system_parameter.ts @@ -202,7 +202,7 @@ export const SystemParameters = { if (message.rules) { obj.rules = message.rules.map(e => e ? SystemParameterRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -313,11 +313,11 @@ export const SystemParameterRule = { }, toAmino(message: SystemParameterRule): SystemParameterRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; if (message.parameters) { obj.parameters = message.parameters.map(e => e ? SystemParameter.toAmino(e) : undefined); } else { - obj.parameters = []; + obj.parameters = message.parameters; } return obj; }, @@ -438,9 +438,9 @@ export const SystemParameter = { }, toAmino(message: SystemParameter): SystemParameterAmino { const obj: any = {}; - obj.name = message.name; - obj.http_header = message.httpHeader; - obj.url_query_parameter = message.urlQueryParameter; + obj.name = message.name === "" ? undefined : message.name; + obj.http_header = message.httpHeader === "" ? undefined : message.httpHeader; + obj.url_query_parameter = message.urlQueryParameter === "" ? undefined : message.urlQueryParameter; return obj; }, fromAminoMsg(object: SystemParameterAminoMsg): SystemParameter { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/usage.ts b/__fixtures__/v-next/outputinstantrpc/google/api/usage.ts index fb98bc774b..d855f107fa 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/usage.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/usage.ts @@ -243,14 +243,14 @@ export const Usage = { if (message.requirements) { obj.requirements = message.requirements.map(e => e); } else { - obj.requirements = []; + obj.requirements = message.requirements; } if (message.rules) { obj.rules = message.rules.map(e => e ? UsageRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.producer_notification_channel = message.producerNotificationChannel; + obj.producer_notification_channel = message.producerNotificationChannel === "" ? undefined : message.producerNotificationChannel; return obj; }, fromAminoMsg(object: UsageAminoMsg): Usage { @@ -370,9 +370,9 @@ export const UsageRule = { }, toAmino(message: UsageRule): UsageRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.allow_unregistered_calls = message.allowUnregisteredCalls; - obj.skip_service_control = message.skipServiceControl; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.allow_unregistered_calls = message.allowUnregisteredCalls === false ? undefined : message.allowUnregisteredCalls; + obj.skip_service_control = message.skipServiceControl === false ? undefined : message.skipServiceControl; return obj; }, fromAminoMsg(object: UsageRuleAminoMsg): UsageRule { diff --git a/__fixtures__/v-next/outputinstantrpc/google/api/visibility.ts b/__fixtures__/v-next/outputinstantrpc/google/api/visibility.ts index 9fcf20f062..c1b47c4efe 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/api/visibility.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/api/visibility.ts @@ -184,7 +184,7 @@ export const Visibility = { if (message.rules) { obj.rules = message.rules.map(e => e ? VisibilityRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -289,8 +289,8 @@ export const VisibilityRule = { }, toAmino(message: VisibilityRule): VisibilityRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.restriction = message.restriction; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.restriction = message.restriction === "" ? undefined : message.restriction; return obj; }, fromAminoMsg(object: VisibilityRuleAminoMsg): VisibilityRule { diff --git a/__fixtures__/v-next/outputinstantrpc/google/logging/type/http_request.ts b/__fixtures__/v-next/outputinstantrpc/google/logging/type/http_request.ts index 2eabff49d4..0a812f230f 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/logging/type/http_request.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/logging/type/http_request.ts @@ -408,21 +408,21 @@ export const HttpRequest = { }, 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.request_method = message.requestMethod === "" ? undefined : message.requestMethod; + obj.request_url = message.requestUrl === "" ? undefined : message.requestUrl; + obj.request_size = message.requestSize !== BigInt(0) ? message.requestSize.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.response_size = message.responseSize !== BigInt(0) ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent === "" ? undefined : message.userAgent; + obj.remote_ip = message.remoteIp === "" ? undefined : message.remoteIp; + obj.server_ip = message.serverIp === "" ? undefined : message.serverIp; + obj.referer = message.referer === "" ? undefined : 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; + obj.cache_lookup = message.cacheLookup === false ? undefined : message.cacheLookup; + obj.cache_hit = message.cacheHit === false ? undefined : message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer === false ? undefined : message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes !== BigInt(0) ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest { diff --git a/__fixtures__/v-next/outputinstantrpc/google/logging/v2/log_entry.ts b/__fixtures__/v-next/outputinstantrpc/google/logging/v2/log_entry.ts index 8cbbe20485..8d788c0a02 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/logging/v2/log_entry.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/logging/v2/log_entry.ts @@ -385,8 +385,8 @@ export const LogEntry_LabelsEntry = { }, toAmino(message: LogEntry_LabelsEntry): LogEntry_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry { @@ -743,7 +743,7 @@ export const LogEntry = { message.receiveTimestamp = fromTimestamp(Timestamp.fromAmino(object.receive_timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.insert_id !== undefined && object.insert_id !== null) { message.insertId = object.insert_id; @@ -781,15 +781,15 @@ export const LogEntry = { }, toAmino(message: LogEntry): LogEntryAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : 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.text_payload = message.textPayload === null ? undefined : message.textPayload; obj.json_payload = message.jsonPayload ? Struct.toAmino(message.jsonPayload) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.receive_timestamp = message.receiveTimestamp ? Timestamp.toAmino(toTimestamp(message.receiveTimestamp)) : undefined; - obj.severity = message.severity; - obj.insert_id = message.insertId; + obj.severity = message.severity === 0 ? undefined : message.severity; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; obj.labels = {}; if (message.labels) { @@ -798,9 +798,9 @@ export const LogEntry = { }); } obj.operation = message.operation ? LogEntryOperation.toAmino(message.operation) : undefined; - obj.trace = message.trace; - obj.span_id = message.spanId; - obj.trace_sampled = message.traceSampled; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.span_id = message.spanId === "" ? undefined : message.spanId; + obj.trace_sampled = message.traceSampled === false ? undefined : message.traceSampled; obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toAmino(message.sourceLocation) : undefined; obj.split = message.split ? LogSplit.toAmino(message.split) : undefined; return obj; @@ -938,10 +938,10 @@ export const LogEntryOperation = { }, toAmino(message: LogEntryOperation): LogEntryOperationAmino { const obj: any = {}; - obj.id = message.id; - obj.producer = message.producer; - obj.first = message.first; - obj.last = message.last; + obj.id = message.id === "" ? undefined : message.id; + obj.producer = message.producer === "" ? undefined : message.producer; + obj.first = message.first === false ? undefined : message.first; + obj.last = message.last === false ? undefined : message.last; return obj; }, fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation { @@ -1063,9 +1063,9 @@ export const LogEntrySourceLocation = { }, toAmino(message: LogEntrySourceLocation): LogEntrySourceLocationAmino { const obj: any = {}; - obj.file = message.file; - obj.line = message.line ? message.line.toString() : undefined; - obj.function = message.function; + obj.file = message.file === "" ? undefined : message.file; + obj.line = message.line !== BigInt(0) ? message.line.toString() : undefined; + obj.function = message.function === "" ? undefined : message.function; return obj; }, fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation { @@ -1185,9 +1185,9 @@ export const LogSplit = { }, toAmino(message: LogSplit): LogSplitAmino { const obj: any = {}; - obj.uid = message.uid; - obj.index = message.index; - obj.total_splits = message.totalSplits; + obj.uid = message.uid === "" ? undefined : message.uid; + obj.index = message.index === 0 ? undefined : message.index; + obj.total_splits = message.totalSplits === 0 ? undefined : message.totalSplits; return obj; }, fromAminoMsg(object: LogSplitAminoMsg): LogSplit { diff --git a/__fixtures__/v-next/outputinstantrpc/google/logging/v2/logging.ts b/__fixtures__/v-next/outputinstantrpc/google/logging/v2/logging.ts index ba3ba50128..fb3584aab8 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/logging/v2/logging.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/logging/v2/logging.ts @@ -612,7 +612,7 @@ export const DeleteLogRequest = { }, toAmino(message: DeleteLogRequest): DeleteLogRequestAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; return obj; }, fromAminoMsg(object: DeleteLogRequestAminoMsg): DeleteLogRequest { @@ -715,8 +715,8 @@ export const WriteLogEntriesRequest_LabelsEntry = { }, toAmino(message: WriteLogEntriesRequest_LabelsEntry): WriteLogEntriesRequest_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: WriteLogEntriesRequest_LabelsEntryAminoMsg): WriteLogEntriesRequest_LabelsEntry { @@ -929,7 +929,7 @@ export const WriteLogEntriesRequest = { }, toAmino(message: WriteLogEntriesRequest): WriteLogEntriesRequestAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; obj.resource = message.resource ? MonitoredResource.toAmino(message.resource) : undefined; obj.labels = {}; if (message.labels) { @@ -940,10 +940,10 @@ export const WriteLogEntriesRequest = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } - obj.partial_success = message.partialSuccess; - obj.dry_run = message.dryRun; + obj.partial_success = message.partialSuccess === false ? undefined : message.partialSuccess; + obj.dry_run = message.dryRun === false ? undefined : message.dryRun; return obj; }, fromAminoMsg(object: WriteLogEntriesRequestAminoMsg): WriteLogEntriesRequest { @@ -1116,7 +1116,7 @@ export const WriteLogEntriesPartialErrors_LogEntryErrorsEntry = { }, toAmino(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntry): WriteLogEntriesPartialErrors_LogEntryErrorsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === 0 ? undefined : message.key; obj.value = message.value ? Status.toAmino(message.value) : undefined; return obj; }, @@ -1408,12 +1408,12 @@ export const ListLogEntriesRequest = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } - obj.filter = message.filter; - obj.order_by = message.orderBy; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.order_by = message.orderBy === "" ? undefined : message.orderBy; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListLogEntriesRequestAminoMsg): ListLogEntriesRequest { @@ -1526,9 +1526,9 @@ export const ListLogEntriesResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogEntriesResponseAminoMsg): ListLogEntriesResponse { @@ -1632,8 +1632,8 @@ export const ListMonitoredResourceDescriptorsRequest = { }, toAmino(message: ListMonitoredResourceDescriptorsRequest): ListMonitoredResourceDescriptorsRequestAmino { const obj: any = {}; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListMonitoredResourceDescriptorsRequestAminoMsg): ListMonitoredResourceDescriptorsRequest { @@ -1746,9 +1746,9 @@ export const ListMonitoredResourceDescriptorsResponse = { if (message.resourceDescriptors) { obj.resource_descriptors = message.resourceDescriptors.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.resource_descriptors = []; + obj.resource_descriptors = message.resourceDescriptors; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListMonitoredResourceDescriptorsResponseAminoMsg): ListMonitoredResourceDescriptorsResponse { @@ -1890,13 +1890,13 @@ export const ListLogsRequest = { }, toAmino(message: ListLogsRequest): ListLogsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, @@ -2010,9 +2010,9 @@ export const ListLogsResponse = { if (message.logNames) { obj.log_names = message.logNames.map(e => e); } else { - obj.log_names = []; + obj.log_names = message.logNames; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogsResponseAminoMsg): ListLogsResponse { @@ -2143,9 +2143,9 @@ export const TailLogEntriesRequest = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } - obj.filter = message.filter; + obj.filter = message.filter === "" ? undefined : message.filter; obj.buffer_window = message.bufferWindow ? Duration.toAmino(message.bufferWindow) : undefined; return obj; }, @@ -2265,12 +2265,12 @@ export const TailLogEntriesResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.suppressionInfo) { obj.suppression_info = message.suppressionInfo.map(e => e ? TailLogEntriesResponse_SuppressionInfo.toAmino(e) : undefined); } else { - obj.suppression_info = []; + obj.suppression_info = message.suppressionInfo; } return obj; }, @@ -2366,7 +2366,7 @@ export const TailLogEntriesResponse_SuppressionInfo = { fromAmino(object: TailLogEntriesResponse_SuppressionInfoAmino): TailLogEntriesResponse_SuppressionInfo { const message = createBaseTailLogEntriesResponse_SuppressionInfo(); if (object.reason !== undefined && object.reason !== null) { - message.reason = tailLogEntriesResponse_SuppressionInfo_ReasonFromJSON(object.reason); + message.reason = object.reason; } if (object.suppressed_count !== undefined && object.suppressed_count !== null) { message.suppressedCount = object.suppressed_count; @@ -2375,8 +2375,8 @@ export const TailLogEntriesResponse_SuppressionInfo = { }, toAmino(message: TailLogEntriesResponse_SuppressionInfo): TailLogEntriesResponse_SuppressionInfoAmino { const obj: any = {}; - obj.reason = message.reason; - obj.suppressed_count = message.suppressedCount; + obj.reason = message.reason === 0 ? undefined : message.reason; + obj.suppressed_count = message.suppressedCount === 0 ? undefined : message.suppressedCount; return obj; }, fromAminoMsg(object: TailLogEntriesResponse_SuppressionInfoAminoMsg): TailLogEntriesResponse_SuppressionInfo { diff --git a/__fixtures__/v-next/outputinstantrpc/google/logging/v2/logging_config.ts b/__fixtures__/v-next/outputinstantrpc/google/logging/v2/logging_config.ts index 38e82517cc..c69b11ff68 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/logging/v2/logging_config.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/logging/v2/logging_config.ts @@ -1936,7 +1936,7 @@ export const LogBucket = { message.locked = object.locked; } if (object.lifecycle_state !== undefined && object.lifecycle_state !== null) { - message.lifecycleState = lifecycleStateFromJSON(object.lifecycle_state); + message.lifecycleState = object.lifecycle_state; } message.restrictedFields = object.restricted_fields?.map(e => e) || []; if (object.cmek_settings !== undefined && object.cmek_settings !== null) { @@ -1946,17 +1946,17 @@ export const LogBucket = { }, toAmino(message: LogBucket): LogBucketAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.retention_days = message.retentionDays; - obj.locked = message.locked; - obj.lifecycle_state = message.lifecycleState; + obj.retention_days = message.retentionDays === 0 ? undefined : message.retentionDays; + obj.locked = message.locked === false ? undefined : message.locked; + obj.lifecycle_state = message.lifecycleState === 0 ? undefined : message.lifecycleState; if (message.restrictedFields) { obj.restricted_fields = message.restrictedFields.map(e => e); } else { - obj.restricted_fields = []; + obj.restricted_fields = message.restrictedFields; } obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined; return obj; @@ -2110,11 +2110,11 @@ export const LogView = { }, toAmino(message: LogView): LogViewAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.filter = message.filter; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: LogViewAminoMsg): LogView { @@ -2365,7 +2365,7 @@ export const LogSink = { } message.exclusions = object.exclusions?.map(e => LogExclusion.fromAmino(e)) || []; if (object.output_version_format !== undefined && object.output_version_format !== null) { - message.outputVersionFormat = logSink_VersionFormatFromJSON(object.output_version_format); + message.outputVersionFormat = object.output_version_format; } if (object.writer_identity !== undefined && object.writer_identity !== null) { message.writerIdentity = object.writer_identity; @@ -2386,19 +2386,19 @@ export const LogSink = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.destination = message.destination === "" ? undefined : message.destination; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.description = message.description === "" ? undefined : message.description; + obj.disabled = message.disabled === false ? undefined : message.disabled; if (message.exclusions) { obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e) : undefined); } else { - obj.exclusions = []; + obj.exclusions = message.exclusions; } - obj.output_version_format = message.outputVersionFormat; - obj.writer_identity = message.writerIdentity; - obj.include_children = message.includeChildren; + obj.output_version_format = message.outputVersionFormat === 0 ? undefined : message.outputVersionFormat; + obj.writer_identity = message.writerIdentity === "" ? undefined : message.writerIdentity; + obj.include_children = message.includeChildren === false ? undefined : message.includeChildren; obj.bigquery_options = message.bigqueryOptions ? BigQueryOptions.toAmino(message.bigqueryOptions) : undefined; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; @@ -2505,8 +2505,8 @@ export const BigQueryOptions = { }, toAmino(message: BigQueryOptions): BigQueryOptionsAmino { const obj: any = {}; - obj.use_partitioned_tables = message.usePartitionedTables; - obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning; + obj.use_partitioned_tables = message.usePartitionedTables === false ? undefined : message.usePartitionedTables; + obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning === false ? undefined : message.usesTimestampColumnPartitioning; return obj; }, fromAminoMsg(object: BigQueryOptionsAminoMsg): BigQueryOptions { @@ -2626,9 +2626,9 @@ export const ListBucketsRequest = { }, toAmino(message: ListBucketsRequest): ListBucketsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListBucketsRequestAminoMsg): ListBucketsRequest { @@ -2741,9 +2741,9 @@ export const ListBucketsResponse = { if (message.buckets) { obj.buckets = message.buckets.map(e => e ? LogBucket.toAmino(e) : undefined); } else { - obj.buckets = []; + obj.buckets = message.buckets; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListBucketsResponseAminoMsg): ListBucketsResponse { @@ -2865,8 +2865,8 @@ export const CreateBucketRequest = { }, toAmino(message: CreateBucketRequest): CreateBucketRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.bucket_id = message.bucketId; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.bucket_id = message.bucketId === "" ? undefined : message.bucketId; obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined; return obj; }, @@ -2991,7 +2991,7 @@ export const UpdateBucketRequest = { }, toAmino(message: UpdateBucketRequest): UpdateBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -3081,7 +3081,7 @@ export const GetBucketRequest = { }, toAmino(message: GetBucketRequest): GetBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetBucketRequestAminoMsg): GetBucketRequest { @@ -3169,7 +3169,7 @@ export const DeleteBucketRequest = { }, toAmino(message: DeleteBucketRequest): DeleteBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteBucketRequestAminoMsg): DeleteBucketRequest { @@ -3257,7 +3257,7 @@ export const UndeleteBucketRequest = { }, toAmino(message: UndeleteBucketRequest): UndeleteBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: UndeleteBucketRequestAminoMsg): UndeleteBucketRequest { @@ -3377,9 +3377,9 @@ export const ListViewsRequest = { }, toAmino(message: ListViewsRequest): ListViewsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListViewsRequestAminoMsg): ListViewsRequest { @@ -3492,9 +3492,9 @@ export const ListViewsResponse = { if (message.views) { obj.views = message.views.map(e => e ? LogView.toAmino(e) : undefined); } else { - obj.views = []; + obj.views = message.views; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListViewsResponseAminoMsg): ListViewsResponse { @@ -3616,8 +3616,8 @@ export const CreateViewRequest = { }, toAmino(message: CreateViewRequest): CreateViewRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.view_id = message.viewId; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.view_id = message.viewId === "" ? undefined : message.viewId; obj.view = message.view ? LogView.toAmino(message.view) : undefined; return obj; }, @@ -3742,7 +3742,7 @@ export const UpdateViewRequest = { }, toAmino(message: UpdateViewRequest): UpdateViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.view = message.view ? LogView.toAmino(message.view) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -3832,7 +3832,7 @@ export const GetViewRequest = { }, toAmino(message: GetViewRequest): GetViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetViewRequestAminoMsg): GetViewRequest { @@ -3920,7 +3920,7 @@ export const DeleteViewRequest = { }, toAmino(message: DeleteViewRequest): DeleteViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteViewRequestAminoMsg): DeleteViewRequest { @@ -4040,9 +4040,9 @@ export const ListSinksRequest = { }, toAmino(message: ListSinksRequest): ListSinksRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListSinksRequestAminoMsg): ListSinksRequest { @@ -4155,9 +4155,9 @@ export const ListSinksResponse = { if (message.sinks) { obj.sinks = message.sinks.map(e => e ? LogSink.toAmino(e) : undefined); } else { - obj.sinks = []; + obj.sinks = message.sinks; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListSinksResponseAminoMsg): ListSinksResponse { @@ -4245,7 +4245,7 @@ export const GetSinkRequest = { }, toAmino(message: GetSinkRequest): GetSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; return obj; }, fromAminoMsg(object: GetSinkRequestAminoMsg): GetSinkRequest { @@ -4367,9 +4367,9 @@ export const CreateSinkRequest = { }, toAmino(message: CreateSinkRequest): CreateSinkRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined; - obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.unique_writer_identity = message.uniqueWriterIdentity === false ? undefined : message.uniqueWriterIdentity; return obj; }, fromAminoMsg(object: CreateSinkRequestAminoMsg): CreateSinkRequest { @@ -4509,9 +4509,9 @@ export const UpdateSinkRequest = { }, toAmino(message: UpdateSinkRequest): UpdateSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined; - obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.unique_writer_identity = message.uniqueWriterIdentity === false ? undefined : message.uniqueWriterIdentity; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; }, @@ -4600,7 +4600,7 @@ export const DeleteSinkRequest = { }, toAmino(message: DeleteSinkRequest): DeleteSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; return obj; }, fromAminoMsg(object: DeleteSinkRequestAminoMsg): DeleteSinkRequest { @@ -4768,10 +4768,10 @@ export const LogExclusion = { }, toAmino(message: LogExclusion): LogExclusionAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; - obj.filter = message.filter; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.disabled = message.disabled === false ? undefined : message.disabled; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; return obj; @@ -4893,9 +4893,9 @@ export const ListExclusionsRequest = { }, toAmino(message: ListExclusionsRequest): ListExclusionsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListExclusionsRequestAminoMsg): ListExclusionsRequest { @@ -5008,9 +5008,9 @@ export const ListExclusionsResponse = { if (message.exclusions) { obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e) : undefined); } else { - obj.exclusions = []; + obj.exclusions = message.exclusions; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListExclusionsResponseAminoMsg): ListExclusionsResponse { @@ -5098,7 +5098,7 @@ export const GetExclusionRequest = { }, toAmino(message: GetExclusionRequest): GetExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetExclusionRequestAminoMsg): GetExclusionRequest { @@ -5204,7 +5204,7 @@ export const CreateExclusionRequest = { }, toAmino(message: CreateExclusionRequest): CreateExclusionRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined; return obj; }, @@ -5329,7 +5329,7 @@ export const UpdateExclusionRequest = { }, toAmino(message: UpdateExclusionRequest): UpdateExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -5419,7 +5419,7 @@ export const DeleteExclusionRequest = { }, toAmino(message: DeleteExclusionRequest): DeleteExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteExclusionRequestAminoMsg): DeleteExclusionRequest { @@ -5507,7 +5507,7 @@ export const GetCmekSettingsRequest = { }, toAmino(message: GetCmekSettingsRequest): GetCmekSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetCmekSettingsRequestAminoMsg): GetCmekSettingsRequest { @@ -5631,7 +5631,7 @@ export const UpdateCmekSettingsRequest = { }, toAmino(message: UpdateCmekSettingsRequest): UpdateCmekSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -5753,9 +5753,9 @@ export const CmekSettings = { }, toAmino(message: CmekSettings): CmekSettingsAmino { const obj: any = {}; - obj.name = message.name; - obj.kms_key_name = message.kmsKeyName; - obj.service_account_id = message.serviceAccountId; + obj.name = message.name === "" ? undefined : message.name; + obj.kms_key_name = message.kmsKeyName === "" ? undefined : message.kmsKeyName; + obj.service_account_id = message.serviceAccountId === "" ? undefined : message.serviceAccountId; return obj; }, fromAminoMsg(object: CmekSettingsAminoMsg): CmekSettings { @@ -5843,7 +5843,7 @@ export const GetSettingsRequest = { }, toAmino(message: GetSettingsRequest): GetSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetSettingsRequestAminoMsg): GetSettingsRequest { @@ -5967,7 +5967,7 @@ export const UpdateSettingsRequest = { }, toAmino(message: UpdateSettingsRequest): UpdateSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.settings = message.settings ? Settings.toAmino(message.settings) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -6121,11 +6121,11 @@ export const Settings = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.kms_key_name = message.kmsKeyName === "" ? undefined : message.kmsKeyName; + obj.kms_service_account_id = message.kmsServiceAccountId === "" ? undefined : message.kmsServiceAccountId; + obj.storage_location = message.storageLocation === "" ? undefined : message.storageLocation; + obj.disable_default_sink = message.disableDefaultSink === false ? undefined : message.disableDefaultSink; return obj; }, fromAminoMsg(object: SettingsAminoMsg): Settings { @@ -6245,9 +6245,9 @@ export const CopyLogEntriesRequest = { }, toAmino(message: CopyLogEntriesRequest): CopyLogEntriesRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.filter = message.filter; - obj.destination = message.destination; + obj.name = message.name === "" ? undefined : message.name; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.destination = message.destination === "" ? undefined : message.destination; return obj; }, fromAminoMsg(object: CopyLogEntriesRequestAminoMsg): CopyLogEntriesRequest { @@ -6415,7 +6415,7 @@ export const CopyLogEntriesMetadata = { message.endTime = fromTimestamp(Timestamp.fromAmino(object.end_time)); } if (object.state !== undefined && object.state !== null) { - message.state = operationStateFromJSON(object.state); + message.state = object.state; } if (object.cancellation_requested !== undefined && object.cancellation_requested !== null) { message.cancellationRequested = object.cancellation_requested; @@ -6435,11 +6435,11 @@ export const CopyLogEntriesMetadata = { const obj: any = {}; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; - obj.state = message.state; - obj.cancellation_requested = message.cancellationRequested; + obj.state = message.state === 0 ? undefined : message.state; + obj.cancellation_requested = message.cancellationRequested === false ? undefined : message.cancellationRequested; obj.request = message.request ? CopyLogEntriesRequest.toAmino(message.request) : undefined; - obj.progress = message.progress; - obj.writer_identity = message.writerIdentity; + obj.progress = message.progress === 0 ? undefined : message.progress; + obj.writer_identity = message.writerIdentity === "" ? undefined : message.writerIdentity; return obj; }, fromAminoMsg(object: CopyLogEntriesMetadataAminoMsg): CopyLogEntriesMetadata { @@ -6529,7 +6529,7 @@ export const CopyLogEntriesResponse = { }, toAmino(message: CopyLogEntriesResponse): CopyLogEntriesResponseAmino { const obj: any = {}; - obj.log_entries_copied_count = message.logEntriesCopiedCount ? message.logEntriesCopiedCount.toString() : undefined; + obj.log_entries_copied_count = message.logEntriesCopiedCount !== BigInt(0) ? message.logEntriesCopiedCount.toString() : undefined; return obj; }, fromAminoMsg(object: CopyLogEntriesResponseAminoMsg): CopyLogEntriesResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/google/logging/v2/logging_metrics.ts b/__fixtures__/v-next/outputinstantrpc/google/logging/v2/logging_metrics.ts index 47dd67034b..740e2beef9 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/logging/v2/logging_metrics.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/logging/v2/logging_metrics.ts @@ -434,8 +434,8 @@ export const LogMetric_LabelExtractorsEntry = { }, toAmino(message: LogMetric_LabelExtractorsEntry): LogMetric_LabelExtractorsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogMetric_LabelExtractorsEntryAminoMsg): LogMetric_LabelExtractorsEntry { @@ -718,18 +718,18 @@ export const LogMetric = { message.updateTime = fromTimestamp(Timestamp.fromAmino(object.update_time)); } if (object.version !== undefined && object.version !== null) { - message.version = logMetric_ApiVersionFromJSON(object.version); + message.version = object.version; } return message; }, toAmino(message: LogMetric): LogMetricAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; - obj.filter = message.filter; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.disabled = message.disabled === false ? undefined : message.disabled; obj.metric_descriptor = message.metricDescriptor ? MetricDescriptor.toAmino(message.metricDescriptor) : undefined; - obj.value_extractor = message.valueExtractor; + obj.value_extractor = message.valueExtractor === "" ? undefined : message.valueExtractor; obj.label_extractors = {}; if (message.labelExtractors) { Object.entries(message.labelExtractors).forEach(([k, v]) => { @@ -739,7 +739,7 @@ export const LogMetric = { obj.bucket_options = message.bucketOptions ? Distribution_BucketOptions.toAmino(message.bucketOptions) : undefined; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.version = message.version; + obj.version = message.version === 0 ? undefined : message.version; return obj; }, fromAminoMsg(object: LogMetricAminoMsg): LogMetric { @@ -859,9 +859,9 @@ export const ListLogMetricsRequest = { }, toAmino(message: ListLogMetricsRequest): ListLogMetricsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListLogMetricsRequestAminoMsg): ListLogMetricsRequest { @@ -974,9 +974,9 @@ export const ListLogMetricsResponse = { if (message.metrics) { obj.metrics = message.metrics.map(e => e ? LogMetric.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogMetricsResponseAminoMsg): ListLogMetricsResponse { @@ -1064,7 +1064,7 @@ export const GetLogMetricRequest = { }, toAmino(message: GetLogMetricRequest): GetLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; return obj; }, fromAminoMsg(object: GetLogMetricRequestAminoMsg): GetLogMetricRequest { @@ -1170,7 +1170,7 @@ export const CreateLogMetricRequest = { }, toAmino(message: CreateLogMetricRequest): CreateLogMetricRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined; return obj; }, @@ -1277,7 +1277,7 @@ export const UpdateLogMetricRequest = { }, toAmino(message: UpdateLogMetricRequest): UpdateLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined; return obj; }, @@ -1366,7 +1366,7 @@ export const DeleteLogMetricRequest = { }, toAmino(message: DeleteLogMetricRequest): DeleteLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; return obj; }, fromAminoMsg(object: DeleteLogMetricRequestAminoMsg): DeleteLogMetricRequest { diff --git a/__fixtures__/v-next/outputinstantrpc/google/longrunning/operations.ts b/__fixtures__/v-next/outputinstantrpc/google/longrunning/operations.ts index 20133f6772..92d219685d 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/longrunning/operations.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/longrunning/operations.ts @@ -350,9 +350,9 @@ export const Operation = { }, toAmino(message: Operation): OperationAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.metadata = message.metadata ? Any.toAmino(message.metadata) : undefined; - obj.done = message.done; + obj.done = message.done === false ? undefined : message.done; obj.error = message.error ? Status.toAmino(message.error) : undefined; obj.response = message.response ? Any.toAmino(message.response) : undefined; return obj; @@ -442,7 +442,7 @@ export const GetOperationRequest = { }, toAmino(message: GetOperationRequest): GetOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetOperationRequestAminoMsg): GetOperationRequest { @@ -578,10 +578,10 @@ export const ListOperationsRequest = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListOperationsRequestAminoMsg): ListOperationsRequest { @@ -694,9 +694,9 @@ export const ListOperationsResponse = { if (message.operations) { obj.operations = message.operations.map(e => e ? Operation.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListOperationsResponseAminoMsg): ListOperationsResponse { @@ -784,7 +784,7 @@ export const CancelOperationRequest = { }, toAmino(message: CancelOperationRequest): CancelOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: CancelOperationRequestAminoMsg): CancelOperationRequest { @@ -872,7 +872,7 @@ export const DeleteOperationRequest = { }, toAmino(message: DeleteOperationRequest): DeleteOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteOperationRequestAminoMsg): DeleteOperationRequest { @@ -978,7 +978,7 @@ export const WaitOperationRequest = { }, toAmino(message: WaitOperationRequest): WaitOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timeout = message.timeout ? Duration.toAmino(message.timeout) : undefined; return obj; }, @@ -1083,8 +1083,8 @@ export const OperationInfo = { }, toAmino(message: OperationInfo): OperationInfoAmino { const obj: any = {}; - obj.response_type = message.responseType; - obj.metadata_type = message.metadataType; + obj.response_type = message.responseType === "" ? undefined : message.responseType; + obj.metadata_type = message.metadataType === "" ? undefined : message.metadataType; return obj; }, fromAminoMsg(object: OperationInfoAminoMsg): OperationInfo { diff --git a/__fixtures__/v-next/outputinstantrpc/google/protobuf/api.ts b/__fixtures__/v-next/outputinstantrpc/google/protobuf/api.ts index 6b4b885baa..f3fb5a648e 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/protobuf/api.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/protobuf/api.ts @@ -467,31 +467,31 @@ export const Api = { } message.mixins = object.mixins?.map(e => Mixin.fromAmino(e)) || []; if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Api): ApiAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.methods) { obj.methods = message.methods.map(e => e ? Method.toAmino(e) : undefined); } else { - obj.methods = []; + obj.methods = message.methods; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.version = message.version; + obj.version = message.version === "" ? undefined : 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.mixins = message.mixins; } - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: ApiAminoMsg): Api { @@ -675,23 +675,23 @@ export const Method = { } message.options = object.options?.map(e => Option.fromAmino(e)) || []; if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.request_type_url = message.requestTypeUrl === "" ? undefined : message.requestTypeUrl; + obj.request_streaming = message.requestStreaming === false ? undefined : message.requestStreaming; + obj.response_type_url = message.responseTypeUrl === "" ? undefined : message.responseTypeUrl; + obj.response_streaming = message.responseStreaming === false ? undefined : message.responseStreaming; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: MethodAminoMsg): Method { @@ -795,8 +795,8 @@ export const Mixin = { }, toAmino(message: Mixin): MixinAmino { const obj: any = {}; - obj.name = message.name; - obj.root = message.root; + obj.name = message.name === "" ? undefined : message.name; + obj.root = message.root === "" ? undefined : message.root; return obj; }, fromAminoMsg(object: MixinAminoMsg): Mixin { diff --git a/__fixtures__/v-next/outputinstantrpc/google/protobuf/compiler/plugin.ts b/__fixtures__/v-next/outputinstantrpc/google/protobuf/compiler/plugin.ts index 2d6c02af1d..d9afa67558 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/protobuf/compiler/plugin.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/protobuf/compiler/plugin.ts @@ -275,10 +275,10 @@ export const Version = { }, toAmino(message: Version): VersionAmino { const obj: any = {}; - obj.major = message.major; - obj.minor = message.minor; - obj.patch = message.patch; - obj.suffix = message.suffix; + obj.major = message.major === 0 ? undefined : message.major; + obj.minor = message.minor === 0 ? undefined : message.minor; + obj.patch = message.patch === 0 ? undefined : message.patch; + obj.suffix = message.suffix === "" ? undefined : message.suffix; return obj; }, fromAminoMsg(object: VersionAminoMsg): Version { @@ -431,13 +431,13 @@ export const CodeGeneratorRequest = { if (message.fileToGenerate) { obj.file_to_generate = message.fileToGenerate.map(e => e); } else { - obj.file_to_generate = []; + obj.file_to_generate = message.fileToGenerate; } - obj.parameter = message.parameter; + obj.parameter = message.parameter === "" ? undefined : message.parameter; if (message.protoFile) { obj.proto_file = message.protoFile.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.proto_file = []; + obj.proto_file = message.protoFile; } obj.compiler_version = message.compilerVersion ? Version.toAmino(message.compilerVersion) : undefined; return obj; @@ -549,11 +549,11 @@ export const CodeGeneratorResponse = { }, toAmino(message: CodeGeneratorResponse): CodeGeneratorResponseAmino { const obj: any = {}; - obj.error = message.error; + obj.error = message.error === "" ? undefined : message.error; if (message.file) { obj.file = message.file.map(e => e ? CodeGeneratorResponse_File.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -674,9 +674,9 @@ export const CodeGeneratorResponse_File = { }, toAmino(message: CodeGeneratorResponse_File): CodeGeneratorResponse_FileAmino { const obj: any = {}; - obj.name = message.name; - obj.insertion_point = message.insertionPoint; - obj.content = message.content; + obj.name = message.name === "" ? undefined : message.name; + obj.insertion_point = message.insertionPoint === "" ? undefined : message.insertionPoint; + obj.content = message.content === "" ? undefined : message.content; return obj; }, fromAminoMsg(object: CodeGeneratorResponse_FileAminoMsg): CodeGeneratorResponse_File { diff --git a/__fixtures__/v-next/outputinstantrpc/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputinstantrpc/google/protobuf/descriptor.ts index 3963cde0e8..0e1d99dacf 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/protobuf/descriptor.ts @@ -1464,7 +1464,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -1793,46 +1793,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2114,47 +2114,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -2277,8 +2277,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -2383,8 +2383,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -2481,7 +2481,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -2689,10 +2689,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -2716,15 +2716,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -2831,7 +2831,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3004,22 +3004,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3124,8 +3124,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -3247,8 +3247,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -3377,11 +3377,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -3553,12 +3553,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -3923,7 +3923,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -3972,30 +3972,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4154,14 +4154,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4330,13 +4330,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -4352,16 +4352,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4459,7 +4459,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4586,12 +4586,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4702,11 +4702,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4817,11 +4817,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4941,19 +4941,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5151,14 +5151,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -5262,8 +5262,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -5360,7 +5360,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -5552,19 +5552,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -5662,7 +5662,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -5817,11 +5817,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/v-next/outputinstantrpc/google/protobuf/field_mask.ts b/__fixtures__/v-next/outputinstantrpc/google/protobuf/field_mask.ts index 9b2c3c999a..1c21f0603a 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/protobuf/field_mask.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/protobuf/field_mask.ts @@ -492,7 +492,7 @@ export const FieldMask = { if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/protobuf/source_context.ts b/__fixtures__/v-next/outputinstantrpc/google/protobuf/source_context.ts index 82bcb1121b..88cf9c3e3b 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/protobuf/source_context.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/protobuf/source_context.ts @@ -92,7 +92,7 @@ export const SourceContext = { }, toAmino(message: SourceContext): SourceContextAmino { const obj: any = {}; - obj.file_name = message.fileName; + obj.file_name = message.fileName === "" ? undefined : message.fileName; return obj; }, fromAminoMsg(object: SourceContextAminoMsg): SourceContext { diff --git a/__fixtures__/v-next/outputinstantrpc/google/protobuf/struct.ts b/__fixtures__/v-next/outputinstantrpc/google/protobuf/struct.ts index 6b2bb07801..4a433eedd9 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/protobuf/struct.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/protobuf/struct.ts @@ -229,7 +229,7 @@ export const Struct_FieldsEntry = { }, toAmino(message: Struct_FieldsEntry): Struct_FieldsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? Value.toAmino(message.value) : undefined; return obj; }, @@ -511,7 +511,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.number_value !== undefined && object.number_value !== null) { message.numberValue = object.number_value; @@ -532,10 +532,10 @@ export const Value = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.number_value = message.numberValue === null ? undefined : message.numberValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; obj.struct_value = message.structValue ? Struct.toAmino(message.structValue) : undefined; obj.list_value = message.listValue ? ListValue.toAmino(message.listValue) : undefined; return obj; @@ -634,7 +634,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/protobuf/type.ts b/__fixtures__/v-next/outputinstantrpc/google/protobuf/type.ts index 8839221c95..2d773bfb19 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/protobuf/type.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/protobuf/type.ts @@ -551,30 +551,30 @@ export const Type = { message.sourceContext = SourceContext.fromAmino(object.source_context); } if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Type): TypeAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.fields) { obj.fields = message.fields.map(e => e ? Field.toAmino(e) : undefined); } else { - obj.fields = []; + obj.fields = message.fields; } if (message.oneofs) { obj.oneofs = message.oneofs.map(e => e); } else { - obj.oneofs = []; + obj.oneofs = message.oneofs; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: TypeAminoMsg): Type { @@ -781,10 +781,10 @@ export const Field = { fromAmino(object: FieldAmino): Field { const message = createBaseField(); if (object.kind !== undefined && object.kind !== null) { - message.kind = field_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.cardinality !== undefined && object.cardinality !== null) { - message.cardinality = field_CardinalityFromJSON(object.cardinality); + message.cardinality = object.cardinality; } if (object.number !== undefined && object.number !== null) { message.number = object.number; @@ -812,20 +812,20 @@ export const Field = { }, 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; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.cardinality = message.cardinality === 0 ? undefined : message.cardinality; + obj.number = message.number === 0 ? undefined : message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.type_url = message.typeUrl === "" ? undefined : message.typeUrl; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.packed = message.packed === false ? undefined : message.packed; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.json_name = message.jsonName; - obj.default_value = message.defaultValue; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; return obj; }, fromAminoMsg(object: FieldAminoMsg): Field { @@ -985,25 +985,25 @@ export const Enum = { message.sourceContext = SourceContext.fromAmino(object.source_context); } if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Enum): EnumAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.enumvalue) { obj.enumvalue = message.enumvalue.map(e => e ? EnumValue.toAmino(e) : undefined); } else { - obj.enumvalue = []; + obj.enumvalue = message.enumvalue; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: EnumAminoMsg): Enum { @@ -1129,12 +1129,12 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -1241,7 +1241,7 @@ export const Option = { }, toAmino(message: Option): OptionAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.value = message.value ? Any.toAmino(message.value) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/google/protobuf/wrappers.ts b/__fixtures__/v-next/outputinstantrpc/google/protobuf/wrappers.ts index 7a09facc61..e22e95be06 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/protobuf/wrappers.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/protobuf/wrappers.ts @@ -259,7 +259,7 @@ export const DoubleValue = { }, toAmino(message: DoubleValue): DoubleValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: DoubleValueAminoMsg): DoubleValue { @@ -347,7 +347,7 @@ export const FloatValue = { }, toAmino(message: FloatValue): FloatValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: FloatValueAminoMsg): FloatValue { @@ -437,7 +437,7 @@ export const Int64Value = { }, toAmino(message: Int64Value): Int64ValueAmino { const obj: any = {}; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: Int64ValueAminoMsg): Int64Value { @@ -527,7 +527,7 @@ export const UInt64Value = { }, toAmino(message: UInt64Value): UInt64ValueAmino { const obj: any = {}; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: UInt64ValueAminoMsg): UInt64Value { @@ -615,7 +615,7 @@ export const Int32Value = { }, toAmino(message: Int32Value): Int32ValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: Int32ValueAminoMsg): Int32Value { @@ -703,7 +703,7 @@ export const UInt32Value = { }, toAmino(message: UInt32Value): UInt32ValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: UInt32ValueAminoMsg): UInt32Value { @@ -791,7 +791,7 @@ export const BoolValue = { }, toAmino(message: BoolValue): BoolValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === false ? undefined : message.value; return obj; }, fromAminoMsg(object: BoolValueAminoMsg): BoolValue { @@ -879,7 +879,7 @@ export const StringValue = { }, toAmino(message: StringValue): StringValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: StringValueAminoMsg): StringValue { diff --git a/__fixtures__/v-next/outputinstantrpc/google/rpc/context/attribute_context.ts b/__fixtures__/v-next/outputinstantrpc/google/rpc/context/attribute_context.ts index 4be65bc155..4ec47edc48 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/rpc/context/attribute_context.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/rpc/context/attribute_context.ts @@ -788,7 +788,7 @@ export const AttributeContext = { if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, @@ -892,8 +892,8 @@ export const AttributeContext_Peer_LabelsEntry = { }, toAmino(message: AttributeContext_Peer_LabelsEntry): AttributeContext_Peer_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Peer_LabelsEntryAminoMsg): AttributeContext_Peer_LabelsEntry { @@ -1084,16 +1084,16 @@ export const AttributeContext_Peer = { }, toAmino(message: AttributeContext_Peer): AttributeContext_PeerAmino { const obj: any = {}; - obj.ip = message.ip; - obj.port = message.port ? message.port.toString() : undefined; + obj.ip = message.ip === "" ? undefined : message.ip; + obj.port = message.port !== BigInt(0) ? 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; + obj.principal = message.principal === "" ? undefined : message.principal; + obj.region_code = message.regionCode === "" ? undefined : message.regionCode; return obj; }, fromAminoMsg(object: AttributeContext_PeerAminoMsg): AttributeContext_Peer { @@ -1229,10 +1229,10 @@ export const AttributeContext_Api = { }, 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; + obj.service = message.service === "" ? undefined : message.service; + obj.operation = message.operation === "" ? undefined : message.operation; + obj.protocol = message.protocol === "" ? undefined : message.protocol; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: AttributeContext_ApiAminoMsg): AttributeContext_Api { @@ -1398,18 +1398,18 @@ export const AttributeContext_Auth = { }, toAmino(message: AttributeContext_Auth): AttributeContext_AuthAmino { const obj: any = {}; - obj.principal = message.principal; + obj.principal = message.principal === "" ? undefined : message.principal; if (message.audiences) { obj.audiences = message.audiences.map(e => e); } else { - obj.audiences = []; + obj.audiences = message.audiences; } - obj.presenter = message.presenter; + obj.presenter = message.presenter === "" ? undefined : 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 = []; + obj.access_levels = message.accessLevels; } return obj; }, @@ -1513,8 +1513,8 @@ export const AttributeContext_Request_HeadersEntry = { }, toAmino(message: AttributeContext_Request_HeadersEntry): AttributeContext_Request_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Request_HeadersEntryAminoMsg): AttributeContext_Request_HeadersEntry { @@ -1819,22 +1819,22 @@ export const AttributeContext_Request = { }, toAmino(message: AttributeContext_Request): AttributeContext_RequestAmino { const obj: any = {}; - obj.id = message.id; - obj.method = message.method; + obj.id = message.id === "" ? undefined : message.id; + obj.method = message.method === "" ? undefined : 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.path = message.path === "" ? undefined : message.path; + obj.host = message.host === "" ? undefined : message.host; + obj.scheme = message.scheme === "" ? undefined : message.scheme; + obj.query = message.query === "" ? undefined : message.query; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.size = message.size ? message.size.toString() : undefined; - obj.protocol = message.protocol; - obj.reason = message.reason; + obj.size = message.size !== BigInt(0) ? message.size.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; + obj.reason = message.reason === "" ? undefined : message.reason; obj.auth = message.auth ? AttributeContext_Auth.toAmino(message.auth) : undefined; return obj; }, @@ -1938,8 +1938,8 @@ export const AttributeContext_Response_HeadersEntry = { }, toAmino(message: AttributeContext_Response_HeadersEntry): AttributeContext_Response_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Response_HeadersEntryAminoMsg): AttributeContext_Response_HeadersEntry { @@ -2134,8 +2134,8 @@ export const AttributeContext_Response = { }, 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.code = message.code !== BigInt(0) ? message.code.toString() : undefined; + obj.size = message.size !== BigInt(0) ? message.size.toString() : undefined; obj.headers = {}; if (message.headers) { Object.entries(message.headers).forEach(([k, v]) => { @@ -2246,8 +2246,8 @@ export const AttributeContext_Resource_LabelsEntry = { }, toAmino(message: AttributeContext_Resource_LabelsEntry): AttributeContext_Resource_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Resource_LabelsEntryAminoMsg): AttributeContext_Resource_LabelsEntry { @@ -2344,8 +2344,8 @@ export const AttributeContext_Resource_AnnotationsEntry = { }, toAmino(message: AttributeContext_Resource_AnnotationsEntry): AttributeContext_Resource_AnnotationsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Resource_AnnotationsEntryAminoMsg): AttributeContext_Resource_AnnotationsEntry { @@ -2689,28 +2689,28 @@ export const AttributeContext_Resource = { }, toAmino(message: AttributeContext_Resource): AttributeContext_ResourceAmino { const obj: any = {}; - obj.service = message.service; - obj.name = message.name; - obj.type = message.type; + obj.service = message.service === "" ? undefined : message.service; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { obj.labels[k] = v; }); } - obj.uid = message.uid; + obj.uid = message.uid === "" ? undefined : message.uid; obj.annotations = {}; if (message.annotations) { Object.entries(message.annotations).forEach(([k, v]) => { obj.annotations[k] = v; }); } - obj.display_name = message.displayName; + obj.display_name = message.displayName === "" ? undefined : message.displayName; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; obj.delete_time = message.deleteTime ? Timestamp.toAmino(toTimestamp(message.deleteTime)) : undefined; - obj.etag = message.etag; - obj.location = message.location; + obj.etag = message.etag === "" ? undefined : message.etag; + obj.location = message.location === "" ? undefined : message.location; return obj; }, fromAminoMsg(object: AttributeContext_ResourceAminoMsg): AttributeContext_Resource { diff --git a/__fixtures__/v-next/outputinstantrpc/google/rpc/error_details.ts b/__fixtures__/v-next/outputinstantrpc/google/rpc/error_details.ts index b8c41aeb78..e0f767f60a 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/rpc/error_details.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/rpc/error_details.ts @@ -649,9 +649,9 @@ export const DebugInfo = { if (message.stackEntries) { obj.stack_entries = message.stackEntries.map(e => e); } else { - obj.stack_entries = []; + obj.stack_entries = message.stackEntries; } - obj.detail = message.detail; + obj.detail = message.detail === "" ? undefined : message.detail; return obj; }, fromAminoMsg(object: DebugInfoAminoMsg): DebugInfo { @@ -748,7 +748,7 @@ export const QuotaFailure = { if (message.violations) { obj.violations = message.violations.map(e => e ? QuotaFailure_Violation.toAmino(e) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -853,8 +853,8 @@ export const QuotaFailure_Violation = { }, toAmino(message: QuotaFailure_Violation): QuotaFailure_ViolationAmino { const obj: any = {}; - obj.subject = message.subject; - obj.description = message.description; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: QuotaFailure_ViolationAminoMsg): QuotaFailure_Violation { @@ -957,8 +957,8 @@ export const ErrorInfo_MetadataEntry = { }, toAmino(message: ErrorInfo_MetadataEntry): ErrorInfo_MetadataEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: ErrorInfo_MetadataEntryAminoMsg): ErrorInfo_MetadataEntry { @@ -1115,8 +1115,8 @@ export const ErrorInfo = { }, toAmino(message: ErrorInfo): ErrorInfoAmino { const obj: any = {}; - obj.reason = message.reason; - obj.domain = message.domain; + obj.reason = message.reason === "" ? undefined : message.reason; + obj.domain = message.domain === "" ? undefined : message.domain; obj.metadata = {}; if (message.metadata) { Object.entries(message.metadata).forEach(([k, v]) => { @@ -1219,7 +1219,7 @@ export const PreconditionFailure = { if (message.violations) { obj.violations = message.violations.map(e => e ? PreconditionFailure_Violation.toAmino(e) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -1340,9 +1340,9 @@ export const PreconditionFailure_Violation = { }, toAmino(message: PreconditionFailure_Violation): PreconditionFailure_ViolationAmino { const obj: any = {}; - obj.type = message.type; - obj.subject = message.subject; - obj.description = message.description; + obj.type = message.type === "" ? undefined : message.type; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: PreconditionFailure_ViolationAminoMsg): PreconditionFailure_Violation { @@ -1439,7 +1439,7 @@ export const BadRequest = { if (message.fieldViolations) { obj.field_violations = message.fieldViolations.map(e => e ? BadRequest_FieldViolation.toAmino(e) : undefined); } else { - obj.field_violations = []; + obj.field_violations = message.fieldViolations; } return obj; }, @@ -1544,8 +1544,8 @@ export const BadRequest_FieldViolation = { }, toAmino(message: BadRequest_FieldViolation): BadRequest_FieldViolationAmino { const obj: any = {}; - obj.field = message.field; - obj.description = message.description; + obj.field = message.field === "" ? undefined : message.field; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: BadRequest_FieldViolationAminoMsg): BadRequest_FieldViolation { @@ -1649,8 +1649,8 @@ export const RequestInfo = { }, toAmino(message: RequestInfo): RequestInfoAmino { const obj: any = {}; - obj.request_id = message.requestId; - obj.serving_data = message.servingData; + obj.request_id = message.requestId === "" ? undefined : message.requestId; + obj.serving_data = message.servingData === "" ? undefined : message.servingData; return obj; }, fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo { @@ -1786,10 +1786,10 @@ export const ResourceInfo = { }, 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; + obj.resource_type = message.resourceType === "" ? undefined : message.resourceType; + obj.resource_name = message.resourceName === "" ? undefined : message.resourceName; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo { @@ -1886,7 +1886,7 @@ export const Help = { if (message.links) { obj.links = message.links.map(e => e ? Help_Link.toAmino(e) : undefined); } else { - obj.links = []; + obj.links = message.links; } return obj; }, @@ -1991,8 +1991,8 @@ export const Help_Link = { }, toAmino(message: Help_Link): Help_LinkAmino { const obj: any = {}; - obj.description = message.description; - obj.url = message.url; + obj.description = message.description === "" ? undefined : message.description; + obj.url = message.url === "" ? undefined : message.url; return obj; }, fromAminoMsg(object: Help_LinkAminoMsg): Help_Link { @@ -2096,8 +2096,8 @@ export const LocalizedMessage = { }, toAmino(message: LocalizedMessage): LocalizedMessageAmino { const obj: any = {}; - obj.locale = message.locale; - obj.message = message.message; + obj.locale = message.locale === "" ? undefined : message.locale; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: LocalizedMessageAminoMsg): LocalizedMessage { diff --git a/__fixtures__/v-next/outputinstantrpc/google/rpc/status.ts b/__fixtures__/v-next/outputinstantrpc/google/rpc/status.ts index eab4f0f35c..bab5c2f9c8 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/rpc/status.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/rpc/status.ts @@ -151,12 +151,12 @@ export const Status = { }, toAmino(message: Status): StatusAmino { const obj: any = {}; - obj.code = message.code; - obj.message = message.message; + obj.code = message.code === 0 ? undefined : message.code; + obj.message = message.message === "" ? undefined : message.message; if (message.details) { obj.details = message.details.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.details = []; + obj.details = message.details; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/helpers.ts b/__fixtures__/v-next/outputinstantrpc/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/v-next/outputinstantrpc/helpers.ts +++ b/__fixtures__/v-next/outputinstantrpc/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/genesis.ts index a1aeb24f13..5b0b9efa32 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/genesis.ts @@ -127,11 +127,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.port_id = message.portId; + obj.port_id = message.portId === "" ? undefined : message.portId; if (message.denomTraces) { obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e) : undefined); } else { - obj.denom_traces = []; + obj.denom_traces = message.denomTraces; } obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/query.ts index 8f9252e490..96cd23516d 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/query.ts @@ -172,7 +172,7 @@ export const QueryDenomTraceRequest = { }, toAmino(message: QueryDenomTraceRequest): QueryDenomTraceRequestAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === "" ? undefined : message.hash; return obj; }, fromAminoMsg(object: QueryDenomTraceRequestAminoMsg): QueryDenomTraceRequest { @@ -485,7 +485,7 @@ export const QueryDenomTracesResponse = { if (message.denomTraces) { obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e) : undefined); } else { - obj.denom_traces = []; + obj.denom_traces = message.denomTraces; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/transfer.ts b/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/transfer.ts index ec8c7fd069..8a098f7429 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/transfer.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/transfer.ts @@ -143,8 +143,8 @@ export const DenomTrace = { }, toAmino(message: DenomTrace): DenomTraceAmino { const obj: any = {}; - obj.path = message.path; - obj.base_denom = message.baseDenom; + obj.path = message.path === "" ? undefined : message.path; + obj.base_denom = message.baseDenom === "" ? undefined : message.baseDenom; return obj; }, fromAminoMsg(object: DenomTraceAminoMsg): DenomTrace { @@ -254,8 +254,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.send_enabled = message.sendEnabled; - obj.receive_enabled = message.receiveEnabled; + obj.send_enabled = message.sendEnabled === false ? undefined : message.sendEnabled; + obj.receive_enabled = message.receiveEnabled === false ? undefined : message.receiveEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/tx.amino.ts index a03ccde6de..af0d8699c0 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/tx.amino.ts @@ -43,7 +43,7 @@ export const AminoConverter = { revision_height: omitDefault(timeoutHeight.revisionHeight)?.toString(), revision_number: omitDefault(timeoutHeight.revisionNumber)?.toString() } : {}, - timeout_timestamp: timeoutTimestamp.toString() + timeout_timestamp: omitDefault(timeoutTimestamp)?.toString?.() }; }, fromAmino: ({ @@ -58,7 +58,7 @@ export const AminoConverter = { return { sourcePort: source_port, sourceChannel: source_channel, - token: { + token: token == null ? token : { denom: token.denom, amount: token.amount }, @@ -68,7 +68,7 @@ export const AminoConverter = { revisionHeight: BigInt(timeout_height.revision_height || "0"), revisionNumber: BigInt(timeout_height.revision_number || "0") } : undefined, - timeoutTimestamp: BigInt(timeout_timestamp) + timeoutTimestamp: timeout_timestamp == null ? timeout_timestamp : BigInt(timeout_timestamp) }; } } diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/tx.ts b/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/tx.ts index a6e3bd1dd0..cef091965d 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v1/tx.ts @@ -227,13 +227,13 @@ export const MsgTransfer = { }, toAmino(message: MsgTransfer): MsgTransferAmino { const obj: any = {}; - obj.source_port = message.sourcePort; - obj.source_channel = message.sourceChannel; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; obj.token = message.token ? Coin.toAmino(message.token) : undefined; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromAminoMsg(object: MsgTransferAminoMsg): MsgTransfer { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v2/packet.ts b/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v2/packet.ts index 88a453a77e..2a1111cf41 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v2/packet.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/applications/transfer/v2/packet.ts @@ -148,10 +148,10 @@ export const FungibleTokenPacketData = { }, toAmino(message: FungibleTokenPacketData): FungibleTokenPacketDataAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: FungibleTokenPacketDataAminoMsg): FungibleTokenPacketData { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/channel.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/channel.ts index c22df4787f..02430de508 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/channel.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/channel.ts @@ -427,10 +427,10 @@ export const Channel = { fromAmino(object: ChannelAmino): Channel { const message = createBaseChannel(); if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -443,15 +443,15 @@ export const Channel = { }, toAmino(message: Channel): ChannelAmino { const obj: any = {}; - obj.state = message.state; - obj.ordering = message.ordering; + obj.state = message.state === 0 ? undefined : message.state; + obj.ordering = message.ordering === 0 ? undefined : 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.connection_hops = message.connectionHops; } - obj.version = message.version; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: ChannelAminoMsg): Channel { @@ -627,10 +627,10 @@ export const IdentifiedChannel = { fromAmino(object: IdentifiedChannelAmino): IdentifiedChannel { const message = createBaseIdentifiedChannel(); if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -649,17 +649,17 @@ export const IdentifiedChannel = { }, toAmino(message: IdentifiedChannel): IdentifiedChannelAmino { const obj: any = {}; - obj.state = message.state; - obj.ordering = message.ordering; + obj.state = message.state === 0 ? undefined : message.state; + obj.ordering = message.ordering === 0 ? undefined : 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.connection_hops = message.connectionHops; } - obj.version = message.version; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.version = message.version === "" ? undefined : message.version; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: IdentifiedChannelAminoMsg): IdentifiedChannel { @@ -769,8 +769,8 @@ export const Counterparty = { }, toAmino(message: Counterparty): CounterpartyAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: CounterpartyAminoMsg): Counterparty { @@ -982,14 +982,14 @@ export const Packet = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; + obj.destination_port = message.destinationPort === "" ? undefined : message.destinationPort; + obj.destination_channel = message.destinationChannel === "" ? undefined : message.destinationChannel; obj.data = message.data ? base64FromBytes(message.data) : undefined; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromAminoMsg(object: PacketAminoMsg): Packet { @@ -1133,9 +1133,9 @@ export const PacketState = { }, 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.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1247,7 +1247,7 @@ export const Acknowledgement = { toAmino(message: Acknowledgement): AcknowledgementAmino { const obj: any = {}; obj.result = message.result ? base64FromBytes(message.result) : undefined; - obj.error = message.error; + obj.error = message.error === null ? undefined : message.error; return obj; }, fromAminoMsg(object: AcknowledgementAminoMsg): Acknowledgement { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/genesis.ts index 4af54092e2..c91ee16cc9 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/genesis.ts @@ -279,39 +279,39 @@ export const GenesisState = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } if (message.acknowledgements) { obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.acknowledgements = []; + obj.acknowledgements = message.acknowledgements; } if (message.commitments) { obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.commitments = []; + obj.commitments = message.commitments; } if (message.receipts) { obj.receipts = message.receipts.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.receipts = []; + obj.receipts = message.receipts; } if (message.sendSequences) { obj.send_sequences = message.sendSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.send_sequences = []; + obj.send_sequences = message.sendSequences; } if (message.recvSequences) { obj.recv_sequences = message.recvSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.recv_sequences = []; + obj.recv_sequences = message.recvSequences; } if (message.ackSequences) { obj.ack_sequences = message.ackSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.ack_sequences = []; + obj.ack_sequences = message.ackSequences; } - obj.next_channel_sequence = message.nextChannelSequence ? message.nextChannelSequence.toString() : undefined; + obj.next_channel_sequence = message.nextChannelSequence !== BigInt(0) ? message.nextChannelSequence.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -439,9 +439,9 @@ export const PacketSequence = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: PacketSequenceAminoMsg): PacketSequence { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/query.ts index b4a5916f73..4f7af83913 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/query.ts @@ -713,8 +713,8 @@ export const QueryChannelRequest = { }, toAmino(message: QueryChannelRequest): QueryChannelRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryChannelRequestAminoMsg): QueryChannelRequest { @@ -1081,7 +1081,7 @@ export const QueryChannelsResponse = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -1196,7 +1196,7 @@ export const QueryConnectionChannelsRequest = { }, toAmino(message: QueryConnectionChannelsRequest): QueryConnectionChannelsRequestAmino { const obj: any = {}; - obj.connection = message.connection; + obj.connection = message.connection === "" ? undefined : message.connection; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1336,7 +1336,7 @@ export const QueryConnectionChannelsResponse = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -1449,8 +1449,8 @@ export const QueryChannelClientStateRequest = { }, toAmino(message: QueryChannelClientStateRequest): QueryChannelClientStateRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryChannelClientStateRequestAminoMsg): QueryChannelClientStateRequest { @@ -1728,10 +1728,10 @@ export const QueryChannelConsensusStateRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryChannelConsensusStateRequestAminoMsg): QueryChannelConsensusStateRequest { @@ -1878,7 +1878,7 @@ export const QueryChannelConsensusStateResponse = { toAmino(message: QueryChannelConsensusStateResponse): QueryChannelConsensusStateResponseAmino { const obj: any = {}; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; @@ -2008,9 +2008,9 @@ export const QueryPacketCommitmentRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketCommitmentRequestAminoMsg): QueryPacketCommitmentRequest { @@ -2268,8 +2268,8 @@ export const QueryPacketCommitmentsRequest = { }, toAmino(message: QueryPacketCommitmentsRequest): QueryPacketCommitmentsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2409,7 +2409,7 @@ export const QueryPacketCommitmentsResponse = { if (message.commitments) { obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.commitments = []; + obj.commitments = message.commitments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -2540,9 +2540,9 @@ export const QueryPacketReceiptRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketReceiptRequestAminoMsg): QueryPacketReceiptRequest { @@ -2670,7 +2670,7 @@ export const QueryPacketReceiptResponse = { }, toAmino(message: QueryPacketReceiptResponse): QueryPacketReceiptResponseAmino { const obj: any = {}; - obj.received = message.received; + obj.received = message.received === false ? undefined : message.received; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; @@ -2800,9 +2800,9 @@ export const QueryPacketAcknowledgementRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketAcknowledgementRequestAminoMsg): QueryPacketAcknowledgementRequest { @@ -3091,13 +3091,13 @@ export const QueryPacketAcknowledgementsRequest = { }, toAmino(message: QueryPacketAcknowledgementsRequest): QueryPacketAcknowledgementsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : 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 = []; + obj.packet_commitment_sequences = message.packetCommitmentSequences; } return obj; }, @@ -3237,7 +3237,7 @@ export const QueryPacketAcknowledgementsResponse = { if (message.acknowledgements) { obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.acknowledgements = []; + obj.acknowledgements = message.acknowledgements; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -3381,12 +3381,12 @@ export const QueryUnreceivedPacketsRequest = { }, toAmino(message: QueryUnreceivedPacketsRequest): QueryUnreceivedPacketsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; if (message.packetCommitmentSequences) { obj.packet_commitment_sequences = message.packetCommitmentSequences.map(e => e.toString()); } else { - obj.packet_commitment_sequences = []; + obj.packet_commitment_sequences = message.packetCommitmentSequences; } return obj; }, @@ -3517,7 +3517,7 @@ export const QueryUnreceivedPacketsResponse = { if (message.sequences) { obj.sequences = message.sequences.map(e => e.toString()); } else { - obj.sequences = []; + obj.sequences = message.sequences; } obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; @@ -3660,12 +3660,12 @@ export const QueryUnreceivedAcksRequest = { }, toAmino(message: QueryUnreceivedAcksRequest): QueryUnreceivedAcksRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; if (message.packetAckSequences) { obj.packet_ack_sequences = message.packetAckSequences.map(e => e.toString()); } else { - obj.packet_ack_sequences = []; + obj.packet_ack_sequences = message.packetAckSequences; } return obj; }, @@ -3796,7 +3796,7 @@ export const QueryUnreceivedAcksResponse = { if (message.sequences) { obj.sequences = message.sequences.map(e => e.toString()); } else { - obj.sequences = []; + obj.sequences = message.sequences; } obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; @@ -3908,8 +3908,8 @@ export const QueryNextSequenceReceiveRequest = { }, toAmino(message: QueryNextSequenceReceiveRequest): QueryNextSequenceReceiveRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryNextSequenceReceiveRequestAminoMsg): QueryNextSequenceReceiveRequest { @@ -4039,7 +4039,7 @@ export const QueryNextSequenceReceiveResponse = { }, toAmino(message: QueryNextSequenceReceiveResponse): QueryNextSequenceReceiveResponseAmino { const obj: any = {}; - obj.next_sequence_receive = message.nextSequenceReceive ? message.nextSequenceReceive.toString() : undefined; + obj.next_sequence_receive = message.nextSequenceReceive !== BigInt(0) ? message.nextSequenceReceive.toString() : undefined; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/tx.amino.ts index a2055c9569..5f0c565293 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/tx.amino.ts @@ -187,10 +187,10 @@ export const AminoConverter = { }: MsgChannelOpenInitAminoType["value"]): MsgChannelOpenInit => { return { portId: port_id, - channel: { - state: stateFromJSON(channel.state), - ordering: orderFromJSON(channel.ordering), - counterparty: { + channel: channel == null ? channel : { + state: channel.state == null ? channel.state : stateFromJSON(channel.state), + ordering: channel.ordering == null ? channel.ordering : orderFromJSON(channel.ordering), + counterparty: channel.counterparty == null ? channel.counterparty : { portId: channel.counterparty.port_id, channelId: channel.counterparty.channel_id }, @@ -246,10 +246,10 @@ export const AminoConverter = { return { portId: port_id, previousChannelId: previous_channel_id, - channel: { - state: stateFromJSON(channel.state), - ordering: orderFromJSON(channel.ordering), - counterparty: { + channel: channel == null ? channel : { + state: channel.state == null ? channel.state : stateFromJSON(channel.state), + ordering: channel.ordering == null ? channel.ordering : orderFromJSON(channel.ordering), + counterparty: channel.counterparty == null ? channel.counterparty : { portId: channel.counterparty.port_id, channelId: channel.counterparty.channel_id }, @@ -426,7 +426,7 @@ export const AminoConverter = { }: MsgRecvPacket): MsgRecvPacketAminoType["value"] => { return { packet: { - sequence: packet.sequence.toString(), + sequence: omitDefault(packet.sequence)?.toString?.(), source_port: packet.sourcePort, source_channel: packet.sourceChannel, destination_port: packet.destinationPort, @@ -436,7 +436,7 @@ export const AminoConverter = { revision_height: omitDefault(packet.timeoutHeight.revisionHeight)?.toString(), revision_number: omitDefault(packet.timeoutHeight.revisionNumber)?.toString() } : {}, - timeout_timestamp: packet.timeoutTimestamp.toString() + timeout_timestamp: omitDefault(packet.timeoutTimestamp)?.toString?.() }, proof_commitment: proofCommitment, proof_height: proofHeight ? { @@ -453,8 +453,8 @@ export const AminoConverter = { signer }: MsgRecvPacketAminoType["value"]): MsgRecvPacket => { return { - packet: { - sequence: BigInt(packet.sequence), + packet: packet == null ? packet : { + sequence: packet.sequence == null ? packet.sequence : BigInt(packet.sequence), sourcePort: packet.source_port, sourceChannel: packet.source_channel, destinationPort: packet.destination_port, @@ -464,7 +464,7 @@ export const AminoConverter = { revisionHeight: BigInt(packet.timeout_height.revision_height || "0"), revisionNumber: BigInt(packet.timeout_height.revision_number || "0") } : undefined, - timeoutTimestamp: BigInt(packet.timeout_timestamp) + timeoutTimestamp: packet.timeout_timestamp == null ? packet.timeout_timestamp : BigInt(packet.timeout_timestamp) }, proofCommitment: proof_commitment, proofHeight: proof_height ? { @@ -486,7 +486,7 @@ export const AminoConverter = { }: MsgTimeout): MsgTimeoutAminoType["value"] => { return { packet: { - sequence: packet.sequence.toString(), + sequence: omitDefault(packet.sequence)?.toString?.(), source_port: packet.sourcePort, source_channel: packet.sourceChannel, destination_port: packet.destinationPort, @@ -496,14 +496,14 @@ export const AminoConverter = { revision_height: omitDefault(packet.timeoutHeight.revisionHeight)?.toString(), revision_number: omitDefault(packet.timeoutHeight.revisionNumber)?.toString() } : {}, - timeout_timestamp: packet.timeoutTimestamp.toString() + timeout_timestamp: omitDefault(packet.timeoutTimestamp)?.toString?.() }, proof_unreceived: proofUnreceived, proof_height: proofHeight ? { revision_height: omitDefault(proofHeight.revisionHeight)?.toString(), revision_number: omitDefault(proofHeight.revisionNumber)?.toString() } : {}, - next_sequence_recv: nextSequenceRecv.toString(), + next_sequence_recv: omitDefault(nextSequenceRecv)?.toString?.(), signer }; }, @@ -515,8 +515,8 @@ export const AminoConverter = { signer }: MsgTimeoutAminoType["value"]): MsgTimeout => { return { - packet: { - sequence: BigInt(packet.sequence), + packet: packet == null ? packet : { + sequence: packet.sequence == null ? packet.sequence : BigInt(packet.sequence), sourcePort: packet.source_port, sourceChannel: packet.source_channel, destinationPort: packet.destination_port, @@ -526,14 +526,14 @@ export const AminoConverter = { revisionHeight: BigInt(packet.timeout_height.revision_height || "0"), revisionNumber: BigInt(packet.timeout_height.revision_number || "0") } : undefined, - timeoutTimestamp: BigInt(packet.timeout_timestamp) + timeoutTimestamp: packet.timeout_timestamp == null ? packet.timeout_timestamp : BigInt(packet.timeout_timestamp) }, proofUnreceived: proof_unreceived, proofHeight: proof_height ? { revisionHeight: BigInt(proof_height.revision_height || "0"), revisionNumber: BigInt(proof_height.revision_number || "0") } : undefined, - nextSequenceRecv: BigInt(next_sequence_recv), + nextSequenceRecv: next_sequence_recv == null ? next_sequence_recv : BigInt(next_sequence_recv), signer }; } @@ -550,7 +550,7 @@ export const AminoConverter = { }: MsgTimeoutOnClose): MsgTimeoutOnCloseAminoType["value"] => { return { packet: { - sequence: packet.sequence.toString(), + sequence: omitDefault(packet.sequence)?.toString?.(), source_port: packet.sourcePort, source_channel: packet.sourceChannel, destination_port: packet.destinationPort, @@ -560,7 +560,7 @@ export const AminoConverter = { revision_height: omitDefault(packet.timeoutHeight.revisionHeight)?.toString(), revision_number: omitDefault(packet.timeoutHeight.revisionNumber)?.toString() } : {}, - timeout_timestamp: packet.timeoutTimestamp.toString() + timeout_timestamp: omitDefault(packet.timeoutTimestamp)?.toString?.() }, proof_unreceived: proofUnreceived, proof_close: proofClose, @@ -568,7 +568,7 @@ export const AminoConverter = { revision_height: omitDefault(proofHeight.revisionHeight)?.toString(), revision_number: omitDefault(proofHeight.revisionNumber)?.toString() } : {}, - next_sequence_recv: nextSequenceRecv.toString(), + next_sequence_recv: omitDefault(nextSequenceRecv)?.toString?.(), signer }; }, @@ -581,8 +581,8 @@ export const AminoConverter = { signer }: MsgTimeoutOnCloseAminoType["value"]): MsgTimeoutOnClose => { return { - packet: { - sequence: BigInt(packet.sequence), + packet: packet == null ? packet : { + sequence: packet.sequence == null ? packet.sequence : BigInt(packet.sequence), sourcePort: packet.source_port, sourceChannel: packet.source_channel, destinationPort: packet.destination_port, @@ -592,7 +592,7 @@ export const AminoConverter = { revisionHeight: BigInt(packet.timeout_height.revision_height || "0"), revisionNumber: BigInt(packet.timeout_height.revision_number || "0") } : undefined, - timeoutTimestamp: BigInt(packet.timeout_timestamp) + timeoutTimestamp: packet.timeout_timestamp == null ? packet.timeout_timestamp : BigInt(packet.timeout_timestamp) }, proofUnreceived: proof_unreceived, proofClose: proof_close, @@ -600,7 +600,7 @@ export const AminoConverter = { revisionHeight: BigInt(proof_height.revision_height || "0"), revisionNumber: BigInt(proof_height.revision_number || "0") } : undefined, - nextSequenceRecv: BigInt(next_sequence_recv), + nextSequenceRecv: next_sequence_recv == null ? next_sequence_recv : BigInt(next_sequence_recv), signer }; } @@ -616,7 +616,7 @@ export const AminoConverter = { }: MsgAcknowledgement): MsgAcknowledgementAminoType["value"] => { return { packet: { - sequence: packet.sequence.toString(), + sequence: omitDefault(packet.sequence)?.toString?.(), source_port: packet.sourcePort, source_channel: packet.sourceChannel, destination_port: packet.destinationPort, @@ -626,7 +626,7 @@ export const AminoConverter = { revision_height: omitDefault(packet.timeoutHeight.revisionHeight)?.toString(), revision_number: omitDefault(packet.timeoutHeight.revisionNumber)?.toString() } : {}, - timeout_timestamp: packet.timeoutTimestamp.toString() + timeout_timestamp: omitDefault(packet.timeoutTimestamp)?.toString?.() }, acknowledgement, proof_acked: proofAcked, @@ -645,8 +645,8 @@ export const AminoConverter = { signer }: MsgAcknowledgementAminoType["value"]): MsgAcknowledgement => { return { - packet: { - sequence: BigInt(packet.sequence), + packet: packet == null ? packet : { + sequence: packet.sequence == null ? packet.sequence : BigInt(packet.sequence), sourcePort: packet.source_port, sourceChannel: packet.source_channel, destinationPort: packet.destination_port, @@ -656,7 +656,7 @@ export const AminoConverter = { revisionHeight: BigInt(packet.timeout_height.revision_height || "0"), revisionNumber: BigInt(packet.timeout_height.revision_number || "0") } : undefined, - timeoutTimestamp: BigInt(packet.timeout_timestamp) + timeoutTimestamp: packet.timeout_timestamp == null ? packet.timeout_timestamp : BigInt(packet.timeout_timestamp) }, acknowledgement, proofAcked: proof_acked, diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/tx.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/tx.ts index 1ccc6579e9..b9be74e602 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/channel/v1/tx.ts @@ -438,9 +438,9 @@ export const MsgChannelOpenInit = { }, toAmino(message: MsgChannelOpenInit): MsgChannelOpenInitAmino { const obj: any = {}; - obj.port_id = message.portId; + obj.port_id = message.portId === "" ? undefined : message.portId; obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenInitAminoMsg): MsgChannelOpenInit { @@ -708,13 +708,13 @@ export const MsgChannelOpenTry = { }, toAmino(message: MsgChannelOpenTry): MsgChannelOpenTryAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.previous_channel_id = message.previousChannelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.previous_channel_id = message.previousChannelId === "" ? undefined : message.previousChannelId; obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; - obj.counterparty_version = message.counterpartyVersion; + obj.counterparty_version = message.counterpartyVersion === "" ? undefined : message.counterpartyVersion; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenTryAminoMsg): MsgChannelOpenTry { @@ -980,13 +980,13 @@ export const MsgChannelOpenAck = { }, 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.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.counterparty_channel_id = message.counterpartyChannelId === "" ? undefined : message.counterpartyChannelId; + obj.counterparty_version = message.counterpartyVersion === "" ? undefined : message.counterpartyVersion; obj.proof_try = message.proofTry ? base64FromBytes(message.proofTry) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenAckAminoMsg): MsgChannelOpenAck { @@ -1220,11 +1220,11 @@ export const MsgChannelOpenConfirm = { }, toAmino(message: MsgChannelOpenConfirm): MsgChannelOpenConfirmAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.proof_ack = message.proofAck ? base64FromBytes(message.proofAck) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenConfirmAminoMsg): MsgChannelOpenConfirm { @@ -1424,9 +1424,9 @@ export const MsgChannelCloseInit = { }, toAmino(message: MsgChannelCloseInit): MsgChannelCloseInitAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; - obj.signer = message.signer; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelCloseInitAminoMsg): MsgChannelCloseInit { @@ -1660,11 +1660,11 @@ export const MsgChannelCloseConfirm = { }, toAmino(message: MsgChannelCloseConfirm): MsgChannelCloseConfirmAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelCloseConfirmAminoMsg): MsgChannelCloseConfirm { @@ -1887,7 +1887,7 @@ export const MsgRecvPacket = { obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; obj.proof_commitment = message.proofCommitment ? base64FromBytes(message.proofCommitment) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgRecvPacketAminoMsg): MsgRecvPacket { @@ -2128,8 +2128,8 @@ export const MsgTimeout = { obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; obj.proof_unreceived = message.proofUnreceived ? base64FromBytes(message.proofUnreceived) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; - obj.signer = message.signer; + obj.next_sequence_recv = message.nextSequenceRecv !== BigInt(0) ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgTimeoutAminoMsg): MsgTimeout { @@ -2387,8 +2387,8 @@ export const MsgTimeoutOnClose = { obj.proof_unreceived = message.proofUnreceived ? base64FromBytes(message.proofUnreceived) : undefined; obj.proof_close = message.proofClose ? base64FromBytes(message.proofClose) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; - obj.signer = message.signer; + obj.next_sequence_recv = message.nextSequenceRecv !== BigInt(0) ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgTimeoutOnCloseAminoMsg): MsgTimeoutOnClose { @@ -2628,7 +2628,7 @@ export const MsgAcknowledgement = { obj.acknowledgement = message.acknowledgement ? base64FromBytes(message.acknowledgement) : undefined; obj.proof_acked = message.proofAcked ? base64FromBytes(message.proofAcked) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgAcknowledgementAminoMsg): MsgAcknowledgement { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/client.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/client.ts index 7df67ccdfb..a6e02d50d0 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/client.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/client.ts @@ -274,7 +274,7 @@ export const IdentifiedClientState = { }, toAmino(message: IdentifiedClientState): IdentifiedClientStateAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; return obj; }, @@ -506,11 +506,11 @@ export const ClientConsensusStates = { }, toAmino(message: ClientConsensusStates): ClientConsensusStatesAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.consensusStates) { obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e) : undefined); } else { - obj.consensus_states = []; + obj.consensus_states = message.consensusStates; } return obj; }, @@ -653,10 +653,10 @@ export const ClientUpdateProposal = { }, 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; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.subject_client_id = message.subjectClientId === "" ? undefined : message.subjectClientId; + obj.substitute_client_id = message.substituteClientId === "" ? undefined : message.substituteClientId; return obj; }, fromAminoMsg(object: ClientUpdateProposalAminoMsg): ClientUpdateProposal { @@ -802,8 +802,8 @@ export const UpgradeProposal = { }, toAmino(message: UpgradeProposal): UpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; return obj; @@ -915,8 +915,8 @@ export const Height = { }, 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; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: HeightAminoMsg): Height { @@ -1019,7 +1019,7 @@ export const Params = { if (message.allowedClients) { obj.allowed_clients = message.allowedClients.map(e => e); } else { - obj.allowed_clients = []; + obj.allowed_clients = message.allowedClients; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/genesis.ts index 78c6175ea0..d78d54a3fd 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/genesis.ts @@ -245,21 +245,21 @@ export const GenesisState = { if (message.clients) { obj.clients = message.clients.map(e => e ? IdentifiedClientState.toAmino(e) : undefined); } else { - obj.clients = []; + obj.clients = message.clients; } if (message.clientsConsensus) { obj.clients_consensus = message.clientsConsensus.map(e => e ? ClientConsensusStates.toAmino(e) : undefined); } else { - obj.clients_consensus = []; + obj.clients_consensus = message.clientsConsensus; } if (message.clientsMetadata) { obj.clients_metadata = message.clientsMetadata.map(e => e ? IdentifiedGenesisMetadata.toAmino(e) : undefined); } else { - obj.clients_metadata = []; + obj.clients_metadata = message.clientsMetadata; } obj.params = message.params ? Params.toAmino(message.params) : undefined; - obj.create_localhost = message.createLocalhost; - obj.next_client_sequence = message.nextClientSequence ? message.nextClientSequence.toString() : undefined; + obj.create_localhost = message.createLocalhost === false ? undefined : message.createLocalhost; + obj.next_client_sequence = message.nextClientSequence !== BigInt(0) ? message.nextClientSequence.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -486,11 +486,11 @@ export const IdentifiedGenesisMetadata = { }, toAmino(message: IdentifiedGenesisMetadata): IdentifiedGenesisMetadataAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.clientMetadata) { obj.client_metadata = message.clientMetadata.map(e => e ? GenesisMetadata.toAmino(e) : undefined); } else { - obj.client_metadata = []; + obj.client_metadata = message.clientMetadata; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/query.ts index 8f1d60ec04..facf10a215 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/query.ts @@ -398,7 +398,7 @@ export const QueryClientStateRequest = { }, toAmino(message: QueryClientStateRequest): QueryClientStateRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientStateRequestAminoMsg): QueryClientStateRequest { @@ -747,7 +747,7 @@ export const QueryClientStatesResponse = { if (message.clientStates) { obj.client_states = message.clientStates.map(e => e ? IdentifiedClientState.toAmino(e) : undefined); } else { - obj.client_states = []; + obj.client_states = message.clientStates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -895,10 +895,10 @@ export const QueryConsensusStateRequest = { }, 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; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; + obj.latest_height = message.latestHeight === false ? undefined : message.latestHeight; return obj; }, fromAminoMsg(object: QueryConsensusStateRequestAminoMsg): QueryConsensusStateRequest { @@ -1142,7 +1142,7 @@ export const QueryConsensusStatesRequest = { }, toAmino(message: QueryConsensusStatesRequest): QueryConsensusStatesRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1264,7 +1264,7 @@ export const QueryConsensusStatesResponse = { if (message.consensusStates) { obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e) : undefined); } else { - obj.consensus_states = []; + obj.consensus_states = message.consensusStates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1360,7 +1360,7 @@ export const QueryClientStatusRequest = { }, toAmino(message: QueryClientStatusRequest): QueryClientStatusRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientStatusRequestAminoMsg): QueryClientStatusRequest { @@ -1454,7 +1454,7 @@ export const QueryClientStatusResponse = { }, toAmino(message: QueryClientStatusResponse): QueryClientStatusResponseAmino { const obj: any = {}; - obj.status = message.status; + obj.status = message.status === "" ? undefined : message.status; return obj; }, fromAminoMsg(object: QueryClientStatusResponseAminoMsg): QueryClientStatusResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/tx.amino.ts index 727e135426..d4798ea877 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/tx.amino.ts @@ -80,11 +80,11 @@ export const AminoConverter = { signer }: MsgCreateClientAminoType["value"]): MsgCreateClient => { return { - clientState: { + clientState: client_state == null ? client_state : { typeUrl: client_state.type_url, value: client_state.value }, - consensusState: { + consensusState: consensus_state == null ? consensus_state : { typeUrl: consensus_state.type_url, value: consensus_state.value }, @@ -115,7 +115,7 @@ export const AminoConverter = { }: MsgUpdateClientAminoType["value"]): MsgUpdateClient => { return { clientId: client_id, - header: { + header: header == null ? header : { typeUrl: header.type_url, value: header.value }, @@ -158,11 +158,11 @@ export const AminoConverter = { }: MsgUpgradeClientAminoType["value"]): MsgUpgradeClient => { return { clientId: client_id, - clientState: { + clientState: client_state == null ? client_state : { typeUrl: client_state.type_url, value: client_state.value }, - consensusState: { + consensusState: consensus_state == null ? consensus_state : { typeUrl: consensus_state.type_url, value: consensus_state.value }, @@ -195,7 +195,7 @@ export const AminoConverter = { }: MsgSubmitMisbehaviourAminoType["value"]): MsgSubmitMisbehaviour => { return { clientId: client_id, - misbehaviour: { + misbehaviour: misbehaviour == null ? misbehaviour : { typeUrl: misbehaviour.type_url, value: misbehaviour.value }, diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/tx.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/tx.ts index 5dbf86d41e..37a65a4678 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/client/v1/tx.ts @@ -256,7 +256,7 @@ export const MsgCreateClient = { 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; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgCreateClientAminoMsg): MsgCreateClient { @@ -458,9 +458,9 @@ export const MsgUpdateClient = { }, toAmino(message: MsgUpdateClient): MsgUpdateClientAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.header = message.header ? Any.toAmino(message.header) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgUpdateClientAminoMsg): MsgUpdateClient { @@ -712,12 +712,12 @@ export const MsgUpgradeClient = { }, toAmino(message: MsgUpgradeClient): MsgUpgradeClientAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : 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 ? base64FromBytes(message.proofUpgradeClient) : undefined; obj.proof_upgrade_consensus_state = message.proofUpgradeConsensusState ? base64FromBytes(message.proofUpgradeConsensusState) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgUpgradeClientAminoMsg): MsgUpgradeClient { @@ -919,9 +919,9 @@ export const MsgSubmitMisbehaviour = { }, toAmino(message: MsgSubmitMisbehaviour): MsgSubmitMisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.misbehaviour = message.misbehaviour ? Any.toAmino(message.misbehaviour) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgSubmitMisbehaviourAminoMsg): MsgSubmitMisbehaviour { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/commitment/v1/commitment.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/commitment/v1/commitment.ts index 8f41402d5f..6cb04bf163 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/commitment/v1/commitment.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/commitment/v1/commitment.ts @@ -350,7 +350,7 @@ export const MerklePath = { if (message.keyPath) { obj.key_path = message.keyPath.map(e => e); } else { - obj.key_path = []; + obj.key_path = message.keyPath; } return obj; }, @@ -454,7 +454,7 @@ export const MerkleProof = { if (message.proofs) { obj.proofs = message.proofs.map(e => e ? CommitmentProof.toAmino(e) : undefined); } else { - obj.proofs = []; + obj.proofs = message.proofs; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/connection.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/connection.ts index d314ff02da..a0ad2cdc6e 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/connection.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/connection.ts @@ -359,7 +359,7 @@ export const ConnectionEnd = { } message.versions = object.versions?.map(e => Version.fromAmino(e)) || []; if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -371,15 +371,15 @@ export const ConnectionEnd = { }, toAmino(message: ConnectionEnd): ConnectionEndAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.versions) { obj.versions = message.versions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.versions = []; + obj.versions = message.versions; } - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; return obj; }, fromAminoMsg(object: ConnectionEndAminoMsg): ConnectionEnd { @@ -551,7 +551,7 @@ export const IdentifiedConnection = { } message.versions = object.versions?.map(e => Version.fromAmino(e)) || []; if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -563,16 +563,16 @@ export const IdentifiedConnection = { }, toAmino(message: IdentifiedConnection): IdentifiedConnectionAmino { const obj: any = {}; - obj.id = message.id; - obj.client_id = message.clientId; + obj.id = message.id === "" ? undefined : message.id; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.versions) { obj.versions = message.versions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.versions = []; + obj.versions = message.versions; } - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; return obj; }, fromAminoMsg(object: IdentifiedConnectionAminoMsg): IdentifiedConnection { @@ -700,8 +700,8 @@ export const Counterparty = { }, toAmino(message: Counterparty): CounterpartyAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.connection_id = message.connectionId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.prefix = message.prefix ? MerklePrefix.toAmino(message.prefix) : undefined; return obj; }, @@ -805,7 +805,7 @@ export const ClientPaths = { if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, @@ -922,11 +922,11 @@ export const ConnectionPaths = { }, toAmino(message: ConnectionPaths): ConnectionPathsAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, @@ -1043,11 +1043,11 @@ export const Version = { }, toAmino(message: Version): VersionAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; if (message.features) { obj.features = message.features.map(e => e); } else { - obj.features = []; + obj.features = message.features; } return obj; }, @@ -1144,7 +1144,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.max_expected_time_per_block = message.maxExpectedTimePerBlock ? message.maxExpectedTimePerBlock.toString() : undefined; + obj.max_expected_time_per_block = message.maxExpectedTimePerBlock !== BigInt(0) ? message.maxExpectedTimePerBlock.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/genesis.ts index 7f6fc315bd..bdc3b303c7 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/genesis.ts @@ -157,14 +157,14 @@ export const GenesisState = { if (message.connections) { obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e) : undefined); } else { - obj.connections = []; + obj.connections = message.connections; } if (message.clientConnectionPaths) { obj.client_connection_paths = message.clientConnectionPaths.map(e => e ? ConnectionPaths.toAmino(e) : undefined); } else { - obj.client_connection_paths = []; + obj.client_connection_paths = message.clientConnectionPaths; } - obj.next_connection_sequence = message.nextConnectionSequence ? message.nextConnectionSequence.toString() : undefined; + obj.next_connection_sequence = message.nextConnectionSequence !== BigInt(0) ? message.nextConnectionSequence.toString() : undefined; obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/query.ts index 6d3534fc5b..b43d22b7ae 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/query.ts @@ -302,7 +302,7 @@ export const QueryConnectionRequest = { }, toAmino(message: QueryConnectionRequest): QueryConnectionRequestAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromAminoMsg(object: QueryConnectionRequestAminoMsg): QueryConnectionRequest { @@ -669,7 +669,7 @@ export const QueryConnectionsResponse = { if (message.connections) { obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e) : undefined); } else { - obj.connections = []; + obj.connections = message.connections; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -766,7 +766,7 @@ export const QueryClientConnectionsRequest = { }, toAmino(message: QueryClientConnectionsRequest): QueryClientConnectionsRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientConnectionsRequestAminoMsg): QueryClientConnectionsRequest { @@ -903,7 +903,7 @@ export const QueryClientConnectionsResponse = { if (message.connectionPaths) { obj.connection_paths = message.connectionPaths.map(e => e); } else { - obj.connection_paths = []; + obj.connection_paths = message.connectionPaths; } obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; @@ -1000,7 +1000,7 @@ export const QueryConnectionClientStateRequest = { }, toAmino(message: QueryConnectionClientStateRequest): QueryConnectionClientStateRequestAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromAminoMsg(object: QueryConnectionClientStateRequestAminoMsg): QueryConnectionClientStateRequest { @@ -1262,9 +1262,9 @@ export const QueryConnectionConsensusStateRequest = { }, 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; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryConnectionConsensusStateRequestAminoMsg): QueryConnectionConsensusStateRequest { @@ -1411,7 +1411,7 @@ export const QueryConnectionConsensusStateResponse = { toAmino(message: QueryConnectionConsensusStateResponse): QueryConnectionConsensusStateResponseAmino { const obj: any = {}; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/tx.amino.ts index 53e0a3765c..9d90e69915 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/tx.amino.ts @@ -106,7 +106,7 @@ export const AminoConverter = { identifier: version.identifier, features: version.features }, - delay_period: delayPeriod.toString(), + delay_period: omitDefault(delayPeriod)?.toString?.(), signer }; }, @@ -119,18 +119,18 @@ export const AminoConverter = { }: MsgConnectionOpenInitAminoType["value"]): MsgConnectionOpenInit => { return { clientId: client_id, - counterparty: { + counterparty: counterparty == null ? counterparty : { clientId: counterparty.client_id, connectionId: counterparty.connection_id, - prefix: { + prefix: counterparty.prefix == null ? counterparty.prefix : { keyPrefix: counterparty.prefix.key_prefix } }, - version: { + version: version == null ? version : { identifier: version.identifier, features: version.features }, - delayPeriod: BigInt(delay_period), + delayPeriod: delay_period == null ? delay_period : BigInt(delay_period), signer }; } @@ -165,7 +165,7 @@ export const AminoConverter = { key_prefix: counterparty.prefix.keyPrefix } }, - delay_period: delayPeriod.toString(), + delay_period: omitDefault(delayPeriod)?.toString?.(), counterparty_versions: counterpartyVersions.map(el0 => ({ identifier: el0.identifier, features: el0.features @@ -201,19 +201,19 @@ export const AminoConverter = { return { clientId: client_id, previousConnectionId: previous_connection_id, - clientState: { + clientState: client_state == null ? client_state : { typeUrl: client_state.type_url, value: client_state.value }, - counterparty: { + counterparty: counterparty == null ? counterparty : { clientId: counterparty.client_id, connectionId: counterparty.connection_id, - prefix: { + prefix: counterparty.prefix == null ? counterparty.prefix : { keyPrefix: counterparty.prefix.key_prefix } }, - delayPeriod: BigInt(delay_period), - counterpartyVersions: counterparty_versions.map(el0 => ({ + delayPeriod: delay_period == null ? delay_period : BigInt(delay_period), + counterpartyVersions: counterparty_versions.map?.(el0 => ({ identifier: el0.identifier, features: el0.features })), @@ -286,11 +286,11 @@ export const AminoConverter = { return { connectionId: connection_id, counterpartyConnectionId: counterparty_connection_id, - version: { + version: version == null ? version : { identifier: version.identifier, features: version.features }, - clientState: { + clientState: client_state == null ? client_state : { typeUrl: client_state.type_url, value: client_state.value }, diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/tx.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/tx.ts index 76220be7c7..0448be92eb 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/connection/v1/tx.ts @@ -330,11 +330,11 @@ export const MsgConnectionOpenInit = { }, toAmino(message: MsgConnectionOpenInit): MsgConnectionOpenInitAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : 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; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenInitAminoMsg): MsgConnectionOpenInit { @@ -694,22 +694,22 @@ export const MsgConnectionOpenTry = { }, toAmino(message: MsgConnectionOpenTry): MsgConnectionOpenTryAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.previous_connection_id = message.previousConnectionId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.previous_connection_id = message.previousConnectionId === "" ? undefined : 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; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; if (message.counterpartyVersions) { obj.counterparty_versions = message.counterpartyVersions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.counterparty_versions = []; + obj.counterparty_versions = message.counterpartyVersions; } obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_client = message.proofClient ? base64FromBytes(message.proofClient) : undefined; obj.proof_consensus = message.proofConsensus ? base64FromBytes(message.proofConsensus) : undefined; obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenTryAminoMsg): MsgConnectionOpenTry { @@ -1029,8 +1029,8 @@ export const MsgConnectionOpenAck = { }, toAmino(message: MsgConnectionOpenAck): MsgConnectionOpenAckAmino { const obj: any = {}; - obj.connection_id = message.connectionId; - obj.counterparty_connection_id = message.counterpartyConnectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.counterparty_connection_id = message.counterpartyConnectionId === "" ? undefined : 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) : {}; @@ -1038,7 +1038,7 @@ export const MsgConnectionOpenAck = { obj.proof_client = message.proofClient ? base64FromBytes(message.proofClient) : undefined; obj.proof_consensus = message.proofConsensus ? base64FromBytes(message.proofConsensus) : undefined; obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenAckAminoMsg): MsgConnectionOpenAck { @@ -1256,10 +1256,10 @@ export const MsgConnectionOpenConfirm = { }, toAmino(message: MsgConnectionOpenConfirm): MsgConnectionOpenConfirmAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.proof_ack = message.proofAck ? base64FromBytes(message.proofAck) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenConfirmAminoMsg): MsgConnectionOpenConfirm { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/core/port/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/ibc/core/port/v1/query.ts index a22a3bdec4..6c07efd0d6 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/core/port/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/core/port/v1/query.ts @@ -166,7 +166,7 @@ export const QueryAppVersionRequest = { message.connectionId = object.connection_id; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -178,11 +178,11 @@ export const QueryAppVersionRequest = { }, toAmino(message: QueryAppVersionRequest): QueryAppVersionRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.connection_id = message.connectionId; - obj.ordering = message.ordering; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.ordering = message.ordering === 0 ? undefined : message.ordering; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.proposed_version = message.proposedVersion; + obj.proposed_version = message.proposedVersion === "" ? undefined : message.proposedVersion; return obj; }, fromAminoMsg(object: QueryAppVersionRequestAminoMsg): QueryAppVersionRequest { @@ -292,8 +292,8 @@ export const QueryAppVersionResponse = { }, toAmino(message: QueryAppVersionResponse): QueryAppVersionResponseAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.version = message.version; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: QueryAppVersionResponseAminoMsg): QueryAppVersionResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/localhost/v1/localhost.ts b/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/localhost/v1/localhost.ts index 373d322c0d..2fe9922ee8 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/localhost/v1/localhost.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/localhost/v1/localhost.ts @@ -111,7 +111,7 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/solomachine/v1/solomachine.ts b/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/solomachine/v1/solomachine.ts index 56bcc4333e..5248697115 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/solomachine/v1/solomachine.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/solomachine/v1/solomachine.ts @@ -559,10 +559,10 @@ export const ClientState = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.frozen_sequence = message.frozenSequence !== BigInt(0) ? message.frozenSequence.toString() : undefined; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; - obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal === false ? undefined : message.allowUpdateAfterProposal; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -693,8 +693,8 @@ export const ConsensusState = { 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; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { @@ -858,11 +858,11 @@ export const Header = { }, toAmino(message: Header): HeaderAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderAminoMsg): Header { @@ -1010,8 +1010,8 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.sequence = message.sequence !== BigInt(0) ? 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; @@ -1145,7 +1145,7 @@ export const SignatureAndData = { message.signature = bytesFromBase64(object.signature); } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1158,9 +1158,9 @@ export const SignatureAndData = { toAmino(message: SignatureAndData): SignatureAndDataAmino { const obj: any = {}; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; - obj.data_type = message.dataType; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { @@ -1273,7 +1273,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { @@ -1426,7 +1426,7 @@ export const SignBytes = { message.diversifier = object.diversifier; } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1435,10 +1435,10 @@ export const SignBytes = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1552,7 +1552,7 @@ export const HeaderData = { toAmino(message: HeaderData): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { @@ -2433,7 +2433,7 @@ export const NextSequenceRecvData = { toAmino(message: NextSequenceRecvData): NextSequenceRecvDataAmino { const obj: any = {}; obj.path = message.path ? base64FromBytes(message.path) : undefined; - obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + obj.next_seq_recv = message.nextSeqRecv !== BigInt(0) ? message.nextSeqRecv.toString() : undefined; return obj; }, fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/solomachine/v2/solomachine.ts b/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/solomachine/v2/solomachine.ts index d960b768f2..87fe47bfc0 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/solomachine/v2/solomachine.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/solomachine/v2/solomachine.ts @@ -557,10 +557,10 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.is_frozen = message.isFrozen; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.is_frozen = message.isFrozen === false ? undefined : message.isFrozen; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; - obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal === false ? undefined : message.allowUpdateAfterProposal; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -691,8 +691,8 @@ export const ConsensusState = { 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; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { @@ -856,11 +856,11 @@ export const Header = { }, toAmino(message: Header): HeaderAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderAminoMsg): Header { @@ -1008,8 +1008,8 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.sequence = message.sequence !== BigInt(0) ? 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; @@ -1143,7 +1143,7 @@ export const SignatureAndData = { message.signature = bytesFromBase64(object.signature); } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1156,9 +1156,9 @@ export const SignatureAndData = { toAmino(message: SignatureAndData): SignatureAndDataAmino { const obj: any = {}; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; - obj.data_type = message.dataType; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { @@ -1271,7 +1271,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { @@ -1424,7 +1424,7 @@ export const SignBytes = { message.diversifier = object.diversifier; } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1433,10 +1433,10 @@ export const SignBytes = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1550,7 +1550,7 @@ export const HeaderData = { toAmino(message: HeaderData): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { @@ -2431,7 +2431,7 @@ export const NextSequenceRecvData = { toAmino(message: NextSequenceRecvData): NextSequenceRecvDataAmino { const obj: any = {}; obj.path = message.path ? base64FromBytes(message.path) : undefined; - obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + obj.next_seq_recv = message.nextSeqRecv !== BigInt(0) ? message.nextSeqRecv.toString() : undefined; return obj; }, fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData { diff --git a/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/tendermint/v1/tendermint.ts b/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/tendermint/v1/tendermint.ts index c9f9afcefe..d6152bc9fa 100644 --- a/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/tendermint/v1/tendermint.ts +++ b/__fixtures__/v-next/outputinstantrpc/ibc/lightclients/tendermint/v1/tendermint.ts @@ -432,7 +432,7 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : 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; @@ -442,15 +442,15 @@ export const ClientState = { if (message.proofSpecs) { obj.proof_specs = message.proofSpecs.map(e => e ? ProofSpec.toAmino(e) : undefined); } else { - obj.proof_specs = []; + obj.proof_specs = message.proofSpecs; } if (message.upgradePath) { obj.upgrade_path = message.upgradePath.map(e => e); } else { - obj.upgrade_path = []; + obj.upgrade_path = message.upgradePath; } - obj.allow_update_after_expiry = message.allowUpdateAfterExpiry; - obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour; + obj.allow_update_after_expiry = message.allowUpdateAfterExpiry === false ? undefined : message.allowUpdateAfterExpiry; + obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour === false ? undefined : message.allowUpdateAfterMisbehaviour; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -710,7 +710,7 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.header_1 = message.header1 ? Header.toAmino(message.header1) : undefined; obj.header_2 = message.header2 ? Header.toAmino(message.header2) : undefined; return obj; @@ -979,8 +979,8 @@ export const Fraction = { }, toAmino(message: Fraction): FractionAmino { const obj: any = {}; - obj.numerator = message.numerator ? message.numerator.toString() : undefined; - obj.denominator = message.denominator ? message.denominator.toString() : undefined; + obj.numerator = message.numerator !== BigInt(0) ? message.numerator.toString() : undefined; + obj.denominator = message.denominator !== BigInt(0) ? message.denominator.toString() : undefined; return obj; }, fromAminoMsg(object: FractionAminoMsg): Fraction { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/claim.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/claim.ts index c7eae447ed..5bc987ed93 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/claim.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/claim.ts @@ -189,16 +189,16 @@ export const ClaimRecord = { }, toAmino(message: ClaimRecord): ClaimRecordAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.initialClaimableAmount) { obj.initial_claimable_amount = message.initialClaimableAmount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_claimable_amount = []; + obj.initial_claimable_amount = message.initialClaimableAmount; } if (message.actionCompleted) { obj.action_completed = message.actionCompleted.map(e => e); } else { - obj.action_completed = []; + obj.action_completed = message.actionCompleted; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/genesis.ts index 0046900270..5a1a0a2411 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/genesis.ts @@ -139,7 +139,7 @@ export const GenesisState = { if (message.claimRecords) { obj.claim_records = message.claimRecords.map(e => e ? ClaimRecord.toAmino(e) : undefined); } else { - obj.claim_records = []; + obj.claim_records = message.claimRecords; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/params.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/params.ts index d3a558fa67..71c8eb7b1d 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/params.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/params.ts @@ -146,7 +146,7 @@ export const Params = { obj.airdrop_start_time = message.airdropStartTime ? Timestamp.toAmino(toTimestamp(message.airdropStartTime)) : undefined; 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; + obj.claim_denom = message.claimDenom === "" ? undefined : message.claimDenom; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/query.ts index 59c72dbc53..760b9bf353 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/claim/v1beta1/query.ts @@ -260,7 +260,7 @@ export const QueryModuleAccountBalanceResponse = { if (message.moduleAccountBalance) { obj.moduleAccountBalance = message.moduleAccountBalance.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.moduleAccountBalance = []; + obj.moduleAccountBalance = message.moduleAccountBalance; } return obj; }, @@ -525,7 +525,7 @@ export const QueryClaimRecordRequest = { }, toAmino(message: QueryClaimRecordRequest): QueryClaimRecordRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryClaimRecordRequestAminoMsg): QueryClaimRecordRequest { @@ -725,14 +725,14 @@ export const QueryClaimableForActionRequest = { message.address = object.address; } if (object.action !== undefined && object.action !== null) { - message.action = actionFromJSON(object.action); + message.action = object.action; } return message; }, toAmino(message: QueryClaimableForActionRequest): QueryClaimableForActionRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.action = message.action; + obj.address = message.address === "" ? undefined : message.address; + obj.action = message.action === 0 ? undefined : message.action; return obj; }, fromAminoMsg(object: QueryClaimableForActionRequestAminoMsg): QueryClaimableForActionRequest { @@ -835,7 +835,7 @@ export const QueryClaimableForActionResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -930,7 +930,7 @@ export const QueryTotalClaimableRequest = { }, toAmino(message: QueryTotalClaimableRequest): QueryTotalClaimableRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryTotalClaimableRequestAminoMsg): QueryTotalClaimableRequest { @@ -1033,7 +1033,7 @@ export const QueryTotalClaimableResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/epochs/genesis.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/epochs/genesis.ts index e41039e504..b5a7cb4406 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/epochs/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/epochs/genesis.ts @@ -261,13 +261,13 @@ export const EpochInfo = { }, toAmino(message: EpochInfo): EpochInfoAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; obj.current_epoch_start_time = message.currentEpochStartTime ? Timestamp.toAmino(toTimestamp(message.currentEpochStartTime)) : undefined; - obj.epoch_counting_started = message.epochCountingStarted; - obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + obj.epoch_counting_started = message.epochCountingStarted === false ? undefined : message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight !== BigInt(0) ? message.currentEpochStartHeight.toString() : undefined; return obj; }, fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo { @@ -370,7 +370,7 @@ export const GenesisState = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/epochs/query.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/epochs/query.ts index f082f28211..ea9d933e90 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/epochs/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/epochs/query.ts @@ -190,7 +190,7 @@ export const QueryEpochsInfoResponse = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, @@ -285,7 +285,7 @@ export const QueryCurrentEpochRequest = { }, toAmino(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; return obj; }, fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest { @@ -381,7 +381,7 @@ export const QueryCurrentEpochResponse = { }, toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { const obj: any = {}; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/balancer/balancerPool.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/balancer/balancerPool.ts index d5df8c4c97..2343660f0f 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/balancer/balancerPool.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/balancer/balancerPool.ts @@ -296,12 +296,12 @@ export const SmoothWeightChangeParams = { if (message.initialPoolWeights) { obj.initial_pool_weights = message.initialPoolWeights.map(e => e ? PoolAsset.toAmino(e) : undefined); } else { - obj.initial_pool_weights = []; + obj.initial_pool_weights = message.initialPoolWeights; } if (message.targetPoolWeights) { obj.target_pool_weights = message.targetPoolWeights.map(e => e ? PoolAsset.toAmino(e) : undefined); } else { - obj.target_pool_weights = []; + obj.target_pool_weights = message.targetPoolWeights; } return obj; }, @@ -430,8 +430,8 @@ export const PoolParams = { }, toAmino(message: PoolParams): PoolParamsAmino { const obj: any = {}; - obj.swap_fee = message.swapFee; - obj.exit_fee = message.exitFee; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; + obj.exit_fee = message.exitFee === "" ? undefined : message.exitFee; obj.smooth_weight_change_params = message.smoothWeightChangeParams ? SmoothWeightChangeParams.toAmino(message.smoothWeightChangeParams) : undefined; return obj; }, @@ -545,7 +545,7 @@ export const PoolAsset = { toAmino(message: PoolAsset): PoolAssetAmino { const obj: any = {}; obj.token = message.token ? Coin.toAmino(message.token) : undefined; - obj.weight = message.weight; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: PoolAssetAminoMsg): PoolAsset { @@ -747,17 +747,17 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.address = message.address; - obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : 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.pool_assets = message.poolAssets; } - obj.total_weight = message.totalWeight; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/balancer/tx/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/balancer/tx/tx.amino.ts index e481a8e582..e028c4b738 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/balancer/tx/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/balancer/tx/tx.amino.ts @@ -94,24 +94,24 @@ export const AminoConverter = { }: MsgCreateBalancerPoolAminoType["value"]): MsgCreateBalancerPool => { return { sender, - poolParams: { + poolParams: pool_params == null ? pool_params : { swapFee: pool_params.swap_fee, exitFee: pool_params.exit_fee, - smoothWeightChangeParams: { + smoothWeightChangeParams: pool_params.smooth_weight_change_params == null ? pool_params.smooth_weight_change_params : { startTime: pool_params.smooth_weight_change_params.start_time, - duration: { + duration: pool_params.smooth_weight_change_params.duration == null ? pool_params.smooth_weight_change_params.duration : { seconds: BigInt(Math.floor(parseInt(pool_params.smooth_weight_change_params.duration) / 1_000_000_000)), nanos: parseInt(pool_params.smooth_weight_change_params.duration) % 1_000_000_000 }, - initialPoolWeights: pool_params.smooth_weight_change_params.initial_pool_weights.map(el2 => ({ - token: { + initialPoolWeights: pool_params.smooth_weight_change_params.initial_pool_weights.map?.(el2 => ({ + token: el2.token == null ? el2.token : { denom: el2.token.denom, amount: el2.token.amount }, weight: el2.weight })), - targetPoolWeights: pool_params.smooth_weight_change_params.target_pool_weights.map(el2 => ({ - token: { + targetPoolWeights: pool_params.smooth_weight_change_params.target_pool_weights.map?.(el2 => ({ + token: el2.token == null ? el2.token : { denom: el2.token.denom, amount: el2.token.amount }, @@ -119,8 +119,8 @@ export const AminoConverter = { })) } }, - poolAssets: pool_assets.map(el0 => ({ - token: { + poolAssets: pool_assets.map?.(el0 => ({ + token: el0.token == null ? el0.token : { denom: el0.token.denom, amount: el0.token.amount }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/balancer/tx/tx.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/balancer/tx/tx.ts index a063e5c721..f7ac466bd8 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/balancer/tx/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/balancer/tx/tx.ts @@ -157,14 +157,14 @@ export const MsgCreateBalancerPool = { }, toAmino(message: MsgCreateBalancerPool): MsgCreateBalancerPoolAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : 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.pool_assets = message.poolAssets; } - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; return obj; }, fromAminoMsg(object: MsgCreateBalancerPoolAminoMsg): MsgCreateBalancerPool { @@ -260,7 +260,7 @@ export const MsgCreateBalancerPoolResponse = { }, toAmino(message: MsgCreateBalancerPoolResponse): MsgCreateBalancerPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateBalancerPoolResponseAminoMsg): MsgCreateBalancerPoolResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts index 4e992c0f61..52dd53a9d3 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts @@ -152,8 +152,8 @@ export const PoolParams = { }, toAmino(message: PoolParams): PoolParamsAmino { const obj: any = {}; - obj.swap_fee = message.swapFee; - obj.exit_fee = message.exitFee; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; + obj.exit_fee = message.exitFee === "" ? undefined : message.exitFee; return obj; }, fromAminoMsg(object: PoolParamsAminoMsg): PoolParams { @@ -386,22 +386,22 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.address = message.address; - obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : 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 = []; + obj.pool_liquidity = message.poolLiquidity; } if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } - obj.scaling_factor_controller = message.scalingFactorController; + obj.scaling_factor_controller = message.scalingFactorController === "" ? undefined : message.scalingFactorController; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/stableswap/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/stableswap/tx.amino.ts index 7811c40f43..165f81a64a 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/stableswap/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/stableswap/tx.amino.ts @@ -2,6 +2,7 @@ import { PoolParams, PoolParamsSDKType } from "./stableswap_pool"; import { Coin, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; import { AminoMsg } from "@cosmjs/amino"; +import { omitDefault } from "../../../../helpers"; import { MsgCreateStableswapPool, MsgCreateStableswapPoolSDKType, MsgStableSwapAdjustScalingFactors, MsgStableSwapAdjustScalingFactorsSDKType } from "./tx"; export interface MsgCreateStableswapPoolAminoType extends AminoMsg { type: "osmosis/gamm/create-stableswap-pool"; @@ -64,15 +65,15 @@ export const AminoConverter = { }: MsgCreateStableswapPoolAminoType["value"]): MsgCreateStableswapPool => { return { sender, - poolParams: { + poolParams: pool_params == null ? pool_params : { swapFee: pool_params.swap_fee, exitFee: pool_params.exit_fee }, - initialPoolLiquidity: initial_pool_liquidity.map(el0 => ({ + initialPoolLiquidity: initial_pool_liquidity.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })), - scalingFactors: scaling_factors.map(el0 => BigInt(el0)), + scalingFactors: scaling_factors.map?.(el0 => BigInt(el0)), futurePoolGovernor: future_pool_governor, scalingFactorController: scaling_factor_controller }; @@ -87,7 +88,7 @@ export const AminoConverter = { }: MsgStableSwapAdjustScalingFactors): MsgStableSwapAdjustScalingFactorsAminoType["value"] => { return { sender, - pool_id: poolId.toString(), + pool_id: omitDefault(poolId)?.toString?.(), scaling_factors: scalingFactors.map(el0 => el0.toString()) }; }, @@ -98,8 +99,8 @@ export const AminoConverter = { }: MsgStableSwapAdjustScalingFactorsAminoType["value"]): MsgStableSwapAdjustScalingFactors => { return { sender, - poolId: BigInt(pool_id), - scalingFactors: scaling_factors.map(el0 => BigInt(el0)) + poolId: pool_id == null ? pool_id : BigInt(pool_id), + scalingFactors: scaling_factors.map?.(el0 => BigInt(el0)) }; } } diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/stableswap/tx.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/stableswap/tx.ts index 6bcbe85987..54cebe6395 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/stableswap/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/pool-models/stableswap/tx.ts @@ -237,20 +237,20 @@ export const MsgCreateStableswapPool = { }, toAmino(message: MsgCreateStableswapPool): MsgCreateStableswapPoolAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : 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 = []; + obj.initial_pool_liquidity = message.initialPoolLiquidity; } if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } - obj.future_pool_governor = message.futurePoolGovernor; - obj.scaling_factor_controller = message.scalingFactorController; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; + obj.scaling_factor_controller = message.scalingFactorController === "" ? undefined : message.scalingFactorController; return obj; }, fromAminoMsg(object: MsgCreateStableswapPoolAminoMsg): MsgCreateStableswapPool { @@ -346,7 +346,7 @@ export const MsgCreateStableswapPoolResponse = { }, toAmino(message: MsgCreateStableswapPoolResponse): MsgCreateStableswapPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateStableswapPoolResponseAminoMsg): MsgCreateStableswapPoolResponse { @@ -489,12 +489,12 @@ export const MsgStableSwapAdjustScalingFactors = { }, toAmino(message: MsgStableSwapAdjustScalingFactors): MsgStableSwapAdjustScalingFactorsAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/genesis.ts index e8c5b774a0..bf076f10b6 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/genesis.ts @@ -110,7 +110,7 @@ export const Params = { if (message.poolCreationFee) { obj.pool_creation_fee = message.poolCreationFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.pool_creation_fee = []; + obj.pool_creation_fee = message.poolCreationFee; } return obj; }, @@ -250,9 +250,9 @@ export const GenesisState = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } - obj.next_pool_number = message.nextPoolNumber ? message.nextPoolNumber.toString() : undefined; + obj.next_pool_number = message.nextPoolNumber !== BigInt(0) ? message.nextPoolNumber.toString() : undefined; obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/query.ts index d52f44c604..6157ab7910 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/query.ts @@ -452,7 +452,7 @@ export const QueryPoolRequest = { }, toAmino(message: QueryPoolRequest): QueryPoolRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolRequestAminoMsg): QueryPoolRequest { @@ -765,7 +765,7 @@ export const QueryPoolsResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -937,7 +937,7 @@ export const QueryNumPoolsResponse = { }, toAmino(message: QueryNumPoolsResponse): QueryNumPoolsResponseAmino { const obj: any = {}; - obj.num_pools = message.numPools ? message.numPools.toString() : undefined; + obj.num_pools = message.numPools !== BigInt(0) ? message.numPools.toString() : undefined; return obj; }, fromAminoMsg(object: QueryNumPoolsResponseAminoMsg): QueryNumPoolsResponse { @@ -1033,7 +1033,7 @@ export const QueryPoolTypeRequest = { }, toAmino(message: QueryPoolTypeRequest): QueryPoolTypeRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolTypeRequestAminoMsg): QueryPoolTypeRequest { @@ -1127,7 +1127,7 @@ export const QueryPoolTypeResponse = { }, toAmino(message: QueryPoolTypeResponse): QueryPoolTypeResponseAmino { const obj: any = {}; - obj.pool_type = message.poolType; + obj.pool_type = message.poolType === "" ? undefined : message.poolType; return obj; }, fromAminoMsg(object: QueryPoolTypeResponseAminoMsg): QueryPoolTypeResponse { @@ -1245,11 +1245,11 @@ export const QueryCalcJoinPoolSharesRequest = { }, toAmino(message: QueryCalcJoinPoolSharesRequest): QueryCalcJoinPoolSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.tokensIn) { obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_in = []; + obj.tokens_in = message.tokensIn; } return obj; }, @@ -1366,11 +1366,11 @@ export const QueryCalcJoinPoolSharesResponse = { }, toAmino(message: QueryCalcJoinPoolSharesResponse): QueryCalcJoinPoolSharesResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } return obj; }, @@ -1483,8 +1483,8 @@ export const QueryCalcExitPoolCoinsFromSharesRequest = { }, toAmino(message: QueryCalcExitPoolCoinsFromSharesRequest): QueryCalcExitPoolCoinsFromSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.share_in_amount = message.shareInAmount; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; return obj; }, fromAminoMsg(object: QueryCalcExitPoolCoinsFromSharesRequestAminoMsg): QueryCalcExitPoolCoinsFromSharesRequest { @@ -1587,7 +1587,7 @@ export const QueryCalcExitPoolCoinsFromSharesResponse = { if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } return obj; }, @@ -1684,7 +1684,7 @@ export const QueryPoolParamsRequest = { }, toAmino(message: QueryPoolParamsRequest): QueryPoolParamsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolParamsRequestAminoMsg): QueryPoolParamsRequest { @@ -1876,7 +1876,7 @@ export const QueryTotalPoolLiquidityRequest = { }, toAmino(message: QueryTotalPoolLiquidityRequest): QueryTotalPoolLiquidityRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTotalPoolLiquidityRequestAminoMsg): QueryTotalPoolLiquidityRequest { @@ -1979,7 +1979,7 @@ export const QueryTotalPoolLiquidityResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, @@ -2076,7 +2076,7 @@ export const QueryTotalSharesRequest = { }, toAmino(message: QueryTotalSharesRequest): QueryTotalSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTotalSharesRequestAminoMsg): QueryTotalSharesRequest { @@ -2290,11 +2290,11 @@ export const QueryCalcJoinPoolNoSwapSharesRequest = { }, toAmino(message: QueryCalcJoinPoolNoSwapSharesRequest): QueryCalcJoinPoolNoSwapSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.tokensIn) { obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_in = []; + obj.tokens_in = message.tokensIn; } return obj; }, @@ -2414,9 +2414,9 @@ export const QueryCalcJoinPoolNoSwapSharesResponse = { if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } - obj.shares_out = message.sharesOut; + obj.shares_out = message.sharesOut === "" ? undefined : message.sharesOut; return obj; }, fromAminoMsg(object: QueryCalcJoinPoolNoSwapSharesResponseAminoMsg): QueryCalcJoinPoolNoSwapSharesResponse { @@ -2544,9 +2544,9 @@ export const QuerySpotPriceRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest { @@ -2683,9 +2683,9 @@ export const QueryPoolsWithFilterRequest = { if (message.minLiquidity) { obj.min_liquidity = message.minLiquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_liquidity = []; + obj.min_liquidity = message.minLiquidity; } - obj.pool_type = message.poolType; + obj.pool_type = message.poolType === "" ? undefined : message.poolType; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2807,7 +2807,7 @@ export const QueryPoolsWithFilterResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2903,7 +2903,7 @@ export const QuerySpotPriceResponse = { }, toAmino(message: QuerySpotPriceResponse): QuerySpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse { @@ -3053,13 +3053,13 @@ export const QuerySwapExactAmountInRequest = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn === "" ? undefined : message.tokenIn; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } return obj; }, @@ -3154,7 +3154,7 @@ export const QuerySwapExactAmountInResponse = { }, toAmino(message: QuerySwapExactAmountInResponse): QuerySwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: QuerySwapExactAmountInResponseAminoMsg): QuerySwapExactAmountInResponse { @@ -3304,14 +3304,14 @@ export const QuerySwapExactAmountOutRequest = { }, toAmino(message: QuerySwapExactAmountOutRequest): QuerySwapExactAmountOutRequestAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_out = message.tokenOut; + obj.token_out = message.tokenOut === "" ? undefined : message.tokenOut; return obj; }, fromAminoMsg(object: QuerySwapExactAmountOutRequestAminoMsg): QuerySwapExactAmountOutRequest { @@ -3405,7 +3405,7 @@ export const QuerySwapExactAmountOutResponse = { }, toAmino(message: QuerySwapExactAmountOutResponse): QuerySwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: QuerySwapExactAmountOutResponseAminoMsg): QuerySwapExactAmountOutResponse { @@ -3582,7 +3582,7 @@ export const QueryTotalLiquidityResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/tx.amino.ts index e82624ab3d..a511ea2294 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/tx.amino.ts @@ -1,6 +1,7 @@ //@ts-nocheck import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { AminoMsg } from "@cosmjs/amino"; +import { omitDefault } from "../../../helpers"; import { SwapAmountInRoute, SwapAmountInRouteSDKType, SwapAmountOutRoute, SwapAmountOutRouteSDKType, MsgJoinPool, MsgJoinPoolSDKType, MsgExitPool, MsgExitPoolSDKType, MsgSwapExactAmountIn, MsgSwapExactAmountInSDKType, MsgSwapExactAmountOut, MsgSwapExactAmountOutSDKType, MsgJoinSwapExternAmountIn, MsgJoinSwapExternAmountInSDKType, MsgJoinSwapShareAmountOut, MsgJoinSwapShareAmountOutSDKType, MsgExitSwapExternAmountOut, MsgExitSwapExternAmountOutSDKType, MsgExitSwapShareAmountIn, MsgExitSwapShareAmountInSDKType } from "./tx"; export interface MsgJoinPoolAminoType extends AminoMsg { type: "osmosis/gamm/join-pool"; @@ -111,7 +112,7 @@ export const AminoConverter = { }: MsgJoinPool): MsgJoinPoolAminoType["value"] => { return { sender, - pool_id: poolId.toString(), + pool_id: omitDefault(poolId)?.toString?.(), share_out_amount: shareOutAmount, token_in_maxs: tokenInMaxs.map(el0 => ({ denom: el0.denom, @@ -127,9 +128,9 @@ export const AminoConverter = { }: MsgJoinPoolAminoType["value"]): MsgJoinPool => { return { sender, - poolId: BigInt(pool_id), + poolId: pool_id == null ? pool_id : BigInt(pool_id), shareOutAmount: share_out_amount, - tokenInMaxs: token_in_maxs.map(el0 => ({ + tokenInMaxs: token_in_maxs.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })) @@ -146,7 +147,7 @@ export const AminoConverter = { }: MsgExitPool): MsgExitPoolAminoType["value"] => { return { sender, - pool_id: poolId.toString(), + pool_id: omitDefault(poolId)?.toString?.(), share_in_amount: shareInAmount, token_out_mins: tokenOutMins.map(el0 => ({ denom: el0.denom, @@ -162,9 +163,9 @@ export const AminoConverter = { }: MsgExitPoolAminoType["value"]): MsgExitPool => { return { sender, - poolId: BigInt(pool_id), + poolId: pool_id == null ? pool_id : BigInt(pool_id), shareInAmount: share_in_amount, - tokenOutMins: token_out_mins.map(el0 => ({ + tokenOutMins: token_out_mins.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })) @@ -182,7 +183,7 @@ export const AminoConverter = { return { sender, routes: routes.map(el0 => ({ - pool_id: el0.poolId.toString(), + pool_id: omitDefault(el0.poolId)?.toString?.(), token_out_denom: el0.tokenOutDenom })), token_in: { @@ -200,11 +201,11 @@ export const AminoConverter = { }: MsgSwapExactAmountInAminoType["value"]): MsgSwapExactAmountIn => { return { sender, - routes: routes.map(el0 => ({ - poolId: BigInt(el0.pool_id), + routes: routes.map?.(el0 => ({ + poolId: el0.pool_id == null ? el0.pool_id : BigInt(el0.pool_id), tokenOutDenom: el0.token_out_denom })), - tokenIn: { + tokenIn: token_in == null ? token_in : { denom: token_in.denom, amount: token_in.amount }, @@ -223,7 +224,7 @@ export const AminoConverter = { return { sender, routes: routes.map(el0 => ({ - pool_id: el0.poolId.toString(), + pool_id: omitDefault(el0.poolId)?.toString?.(), token_in_denom: el0.tokenInDenom })), token_in_max_amount: tokenInMaxAmount, @@ -241,12 +242,12 @@ export const AminoConverter = { }: MsgSwapExactAmountOutAminoType["value"]): MsgSwapExactAmountOut => { return { sender, - routes: routes.map(el0 => ({ - poolId: BigInt(el0.pool_id), + routes: routes.map?.(el0 => ({ + poolId: el0.pool_id == null ? el0.pool_id : BigInt(el0.pool_id), tokenInDenom: el0.token_in_denom })), tokenInMaxAmount: token_in_max_amount, - tokenOut: { + tokenOut: token_out == null ? token_out : { denom: token_out.denom, amount: token_out.amount } @@ -263,7 +264,7 @@ export const AminoConverter = { }: MsgJoinSwapExternAmountIn): MsgJoinSwapExternAmountInAminoType["value"] => { return { sender, - pool_id: poolId.toString(), + pool_id: omitDefault(poolId)?.toString?.(), token_in: { denom: tokenIn.denom, amount: tokenIn.amount @@ -279,8 +280,8 @@ export const AminoConverter = { }: MsgJoinSwapExternAmountInAminoType["value"]): MsgJoinSwapExternAmountIn => { return { sender, - poolId: BigInt(pool_id), - tokenIn: { + poolId: pool_id == null ? pool_id : BigInt(pool_id), + tokenIn: token_in == null ? token_in : { denom: token_in.denom, amount: token_in.amount }, @@ -299,7 +300,7 @@ export const AminoConverter = { }: MsgJoinSwapShareAmountOut): MsgJoinSwapShareAmountOutAminoType["value"] => { return { sender, - pool_id: poolId.toString(), + pool_id: omitDefault(poolId)?.toString?.(), token_in_denom: tokenInDenom, share_out_amount: shareOutAmount, token_in_max_amount: tokenInMaxAmount @@ -314,7 +315,7 @@ export const AminoConverter = { }: MsgJoinSwapShareAmountOutAminoType["value"]): MsgJoinSwapShareAmountOut => { return { sender, - poolId: BigInt(pool_id), + poolId: pool_id == null ? pool_id : BigInt(pool_id), tokenInDenom: token_in_denom, shareOutAmount: share_out_amount, tokenInMaxAmount: token_in_max_amount @@ -331,7 +332,7 @@ export const AminoConverter = { }: MsgExitSwapExternAmountOut): MsgExitSwapExternAmountOutAminoType["value"] => { return { sender, - pool_id: poolId.toString(), + pool_id: omitDefault(poolId)?.toString?.(), token_out: { denom: tokenOut.denom, amount: tokenOut.amount @@ -347,8 +348,8 @@ export const AminoConverter = { }: MsgExitSwapExternAmountOutAminoType["value"]): MsgExitSwapExternAmountOut => { return { sender, - poolId: BigInt(pool_id), - tokenOut: { + poolId: pool_id == null ? pool_id : BigInt(pool_id), + tokenOut: token_out == null ? token_out : { denom: token_out.denom, amount: token_out.amount }, @@ -367,7 +368,7 @@ export const AminoConverter = { }: MsgExitSwapShareAmountIn): MsgExitSwapShareAmountInAminoType["value"] => { return { sender, - pool_id: poolId.toString(), + pool_id: omitDefault(poolId)?.toString?.(), token_out_denom: tokenOutDenom, share_in_amount: shareInAmount, token_out_min_amount: tokenOutMinAmount @@ -382,7 +383,7 @@ export const AminoConverter = { }: MsgExitSwapShareAmountInAminoType["value"]): MsgExitSwapShareAmountIn => { return { sender, - poolId: BigInt(pool_id), + poolId: pool_id == null ? pool_id : BigInt(pool_id), tokenOutDenom: token_out_denom, shareInAmount: share_in_amount, tokenOutMinAmount: token_out_min_amount diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/tx.ts index f22c1c47f7..cc37726c6d 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v1beta1/tx.ts @@ -393,13 +393,13 @@ export const MsgJoinPool = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenInMaxs) { obj.token_in_maxs = message.tokenInMaxs.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_in_maxs = []; + obj.token_in_maxs = message.tokenInMaxs; } return obj; }, @@ -516,11 +516,11 @@ export const MsgJoinPoolResponse = { }, toAmino(message: MsgJoinPoolResponse): MsgJoinPoolResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenIn) { obj.token_in = message.tokenIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_in = []; + obj.token_in = message.tokenIn; } return obj; }, @@ -671,13 +671,13 @@ export const MsgExitPool = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; if (message.tokenOutMins) { obj.token_out_mins = message.tokenOutMins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_out_mins = []; + obj.token_out_mins = message.tokenOutMins; } return obj; }, @@ -781,7 +781,7 @@ export const MsgExitPoolResponse = { if (message.tokenOut) { obj.token_out = message.tokenOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_out = []; + obj.token_out = message.tokenOut; } return obj; }, @@ -894,8 +894,8 @@ export const SwapAmountInRoute = { }, toAmino(message: SwapAmountInRoute): SwapAmountInRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_out_denom = message.tokenOutDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; return obj; }, fromAminoMsg(object: SwapAmountInRouteAminoMsg): SwapAmountInRoute { @@ -1045,14 +1045,14 @@ export const MsgSwapExactAmountIn = { }, toAmino(message: MsgSwapExactAmountIn): MsgSwapExactAmountInAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; - obj.token_out_min_amount = message.tokenOutMinAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInAminoMsg): MsgSwapExactAmountIn { @@ -1146,7 +1146,7 @@ export const MsgSwapExactAmountInResponse = { }, toAmino(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInResponseAminoMsg): MsgSwapExactAmountInResponse { @@ -1258,8 +1258,8 @@ export const SwapAmountOutRoute = { }, toAmino(message: SwapAmountOutRoute): SwapAmountOutRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_in_denom = message.tokenInDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; return obj; }, fromAminoMsg(object: SwapAmountOutRouteAminoMsg): SwapAmountOutRoute { @@ -1409,13 +1409,13 @@ export const MsgSwapExactAmountOut = { }, toAmino(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_in_max_amount = message.tokenInMaxAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; return obj; }, @@ -1510,7 +1510,7 @@ export const MsgSwapExactAmountOutResponse = { }, toAmino(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountOutResponseAminoMsg): MsgSwapExactAmountOutResponse { @@ -1656,10 +1656,10 @@ export const MsgJoinSwapExternAmountIn = { }, toAmino(message: MsgJoinSwapExternAmountIn): MsgJoinSwapExternAmountInAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; - obj.share_out_min_amount = message.shareOutMinAmount; + obj.share_out_min_amount = message.shareOutMinAmount === "" ? undefined : message.shareOutMinAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapExternAmountInAminoMsg): MsgJoinSwapExternAmountIn { @@ -1753,7 +1753,7 @@ export const MsgJoinSwapExternAmountInResponse = { }, toAmino(message: MsgJoinSwapExternAmountInResponse): MsgJoinSwapExternAmountInResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapExternAmountInResponseAminoMsg): MsgJoinSwapExternAmountInResponse { @@ -1913,11 +1913,11 @@ export const MsgJoinSwapShareAmountOut = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapShareAmountOutAminoMsg): MsgJoinSwapShareAmountOut { @@ -2011,7 +2011,7 @@ export const MsgJoinSwapShareAmountOutResponse = { }, toAmino(message: MsgJoinSwapShareAmountOutResponse): MsgJoinSwapShareAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapShareAmountOutResponseAminoMsg): MsgJoinSwapShareAmountOutResponse { @@ -2171,11 +2171,11 @@ export const MsgExitSwapShareAmountIn = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromAminoMsg(object: MsgExitSwapShareAmountInAminoMsg): MsgExitSwapShareAmountIn { @@ -2269,7 +2269,7 @@ export const MsgExitSwapShareAmountInResponse = { }, toAmino(message: MsgExitSwapShareAmountInResponse): MsgExitSwapShareAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: MsgExitSwapShareAmountInResponseAminoMsg): MsgExitSwapShareAmountInResponse { @@ -2415,10 +2415,10 @@ export const MsgExitSwapExternAmountOut = { }, toAmino(message: MsgExitSwapExternAmountOut): MsgExitSwapExternAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; - obj.share_in_max_amount = message.shareInMaxAmount; + obj.share_in_max_amount = message.shareInMaxAmount === "" ? undefined : message.shareInMaxAmount; return obj; }, fromAminoMsg(object: MsgExitSwapExternAmountOutAminoMsg): MsgExitSwapExternAmountOut { @@ -2512,7 +2512,7 @@ export const MsgExitSwapExternAmountOutResponse = { }, toAmino(message: MsgExitSwapExternAmountOutResponse): MsgExitSwapExternAmountOutResponseAmino { const obj: any = {}; - obj.share_in_amount = message.shareInAmount; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; return obj; }, fromAminoMsg(object: MsgExitSwapExternAmountOutResponseAminoMsg): MsgExitSwapExternAmountOutResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v2/query.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v2/query.ts index 1d0fdc8495..69c0eb93a8 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v2/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/gamm/v2/query.ts @@ -145,9 +145,9 @@ export const QuerySpotPriceRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest { @@ -241,7 +241,7 @@ export const QuerySpotPriceResponse = { }, toAmino(message: QuerySpotPriceResponse): QuerySpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/ibc-rate-limit/v1beta1/params.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/ibc-rate-limit/v1beta1/params.ts index c24264e4f9..0988ddc5f2 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/ibc-rate-limit/v1beta1/params.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/ibc-rate-limit/v1beta1/params.ts @@ -82,7 +82,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/gauge.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/gauge.ts index baddae7a6b..9eb54c3651 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/gauge.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/gauge.ts @@ -277,21 +277,21 @@ export const Gauge = { }, toAmino(message: Gauge): GaugeAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.is_perpetual = message.isPerpetual; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.is_perpetual = message.isPerpetual === false ? undefined : 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.coins = message.coins; } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; - obj.filled_epochs = message.filledEpochs ? message.filledEpochs.toString() : undefined; + obj.num_epochs_paid_over = message.numEpochsPaidOver !== BigInt(0) ? message.numEpochsPaidOver.toString() : undefined; + obj.filled_epochs = message.filledEpochs !== BigInt(0) ? message.filledEpochs.toString() : undefined; if (message.distributedCoins) { obj.distributed_coins = message.distributedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.distributed_coins = []; + obj.distributed_coins = message.distributedCoins; } return obj; }, @@ -395,7 +395,7 @@ export const LockableDurationsInfo = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/genesis.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/genesis.ts index f4c27851fc..8fca4595f6 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/genesis.ts @@ -175,14 +175,14 @@ export const GenesisState = { if (message.gauges) { obj.gauges = message.gauges.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.gauges = []; + obj.gauges = message.gauges; } if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } - obj.last_gauge_id = message.lastGaugeId ? message.lastGaugeId.toString() : undefined; + obj.last_gauge_id = message.lastGaugeId !== BigInt(0) ? message.lastGaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/params.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/params.ts index 0f7917d5bd..8a9358b50c 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/params.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/params.ts @@ -86,7 +86,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.distr_epoch_identifier = message.distrEpochIdentifier; + obj.distr_epoch_identifier = message.distrEpochIdentifier === "" ? undefined : message.distrEpochIdentifier; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/query.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/query.ts index ba82d0e35c..c78c530b74 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/query.ts @@ -378,7 +378,7 @@ export const ModuleToDistributeCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -475,7 +475,7 @@ export const GaugeByIDRequest = { }, toAmino(message: GaugeByIDRequest): GaugeByIDRequestAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; return obj; }, fromAminoMsg(object: GaugeByIDRequestAminoMsg): GaugeByIDRequest { @@ -788,7 +788,7 @@ export const GaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1007,7 +1007,7 @@ export const ActiveGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1121,7 +1121,7 @@ export const ActiveGaugesPerDenomRequest = { }, toAmino(message: ActiveGaugesPerDenomRequest): ActiveGaugesPerDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1243,7 +1243,7 @@ export const ActiveGaugesPerDenomResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1462,7 +1462,7 @@ export const UpcomingGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1576,7 +1576,7 @@ export const UpcomingGaugesPerDenomRequest = { }, toAmino(message: UpcomingGaugesPerDenomRequest): UpcomingGaugesPerDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1698,7 +1698,7 @@ export const UpcomingGaugesPerDenomResponse = { if (message.upcomingGauges) { obj.upcoming_gauges = message.upcomingGauges.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.upcoming_gauges = []; + obj.upcoming_gauges = message.upcomingGauges; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1843,13 +1843,13 @@ export const RewardsEstRequest = { }, toAmino(message: RewardsEstRequest): RewardsEstRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; if (message.lockIds) { obj.lock_ids = message.lockIds.map(e => e.toString()); } else { - obj.lock_ids = []; + obj.lock_ids = message.lockIds; } - obj.end_epoch = message.endEpoch ? message.endEpoch.toString() : undefined; + obj.end_epoch = message.endEpoch !== BigInt(0) ? message.endEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: RewardsEstRequestAminoMsg): RewardsEstRequest { @@ -1952,7 +1952,7 @@ export const RewardsEstResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -2130,7 +2130,7 @@ export const QueryLockableDurationsResponse = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/tx.amino.ts index fc284ed915..8c8c011103 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/tx.amino.ts @@ -3,6 +3,7 @@ import { QueryCondition, QueryConditionSDKType, lockQueryTypeFromJSON } from ".. import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; import { Timestamp, TimestampSDKType } from "../../google/protobuf/timestamp"; import { AminoMsg } from "@cosmjs/amino"; +import { omitDefault } from "../../helpers"; import { Duration, DurationSDKType } from "../../google/protobuf/duration"; import { MsgCreateGauge, MsgCreateGaugeSDKType, MsgAddToGauge, MsgAddToGaugeSDKType } from "./tx"; export interface MsgCreateGaugeAminoType extends AminoMsg { @@ -50,7 +51,7 @@ export const AminoConverter = { numEpochsPaidOver }: MsgCreateGauge): MsgCreateGaugeAminoType["value"] => { return { - is_perpetual: isPerpetual, + is_perpetual: omitDefault(isPerpetual), owner, distribute_to: { lock_query_type: distributeTo.lockQueryType, @@ -63,7 +64,7 @@ export const AminoConverter = { amount: el0.amount })), start_time: startTime, - num_epochs_paid_over: numEpochsPaidOver.toString() + num_epochs_paid_over: omitDefault(numEpochsPaidOver)?.toString?.() }; }, fromAmino: ({ @@ -77,21 +78,21 @@ export const AminoConverter = { return { isPerpetual: is_perpetual, owner, - distributeTo: { - lockQueryType: lockQueryTypeFromJSON(distribute_to.lock_query_type), + distributeTo: distribute_to == null ? distribute_to : { + lockQueryType: distribute_to.lock_query_type == null ? distribute_to.lock_query_type : lockQueryTypeFromJSON(distribute_to.lock_query_type), denom: distribute_to.denom, - duration: { + duration: distribute_to.duration == null ? distribute_to.duration : { seconds: BigInt(Math.floor(parseInt(distribute_to.duration) / 1_000_000_000)), nanos: parseInt(distribute_to.duration) % 1_000_000_000 }, timestamp: distribute_to.timestamp }, - coins: coins.map(el0 => ({ + coins: coins.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })), startTime: start_time, - numEpochsPaidOver: BigInt(num_epochs_paid_over) + numEpochsPaidOver: num_epochs_paid_over == null ? num_epochs_paid_over : BigInt(num_epochs_paid_over) }; } }, @@ -104,7 +105,7 @@ export const AminoConverter = { }: MsgAddToGauge): MsgAddToGaugeAminoType["value"] => { return { owner, - gauge_id: gaugeId.toString(), + gauge_id: omitDefault(gaugeId)?.toString?.(), rewards: rewards.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -118,8 +119,8 @@ export const AminoConverter = { }: MsgAddToGaugeAminoType["value"]): MsgAddToGauge => { return { owner, - gaugeId: BigInt(gauge_id), - rewards: rewards.map(el0 => ({ + gaugeId: gauge_id == null ? gauge_id : BigInt(gauge_id), + rewards: rewards.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })) diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/tx.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/tx.ts index 2413baf192..6fb60a8117 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/incentives/tx.ts @@ -234,16 +234,16 @@ export const MsgCreateGauge = { }, toAmino(message: MsgCreateGauge): MsgCreateGaugeAmino { const obj: any = {}; - obj.is_perpetual = message.isPerpetual; - obj.owner = message.owner; + obj.is_perpetual = message.isPerpetual === false ? undefined : message.isPerpetual; + obj.owner = message.owner === "" ? undefined : 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.coins = message.coins; } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; + obj.num_epochs_paid_over = message.numEpochsPaidOver !== BigInt(0) ? message.numEpochsPaidOver.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateGaugeAminoMsg): MsgCreateGauge { @@ -451,12 +451,12 @@ export const MsgAddToGauge = { }, toAmino(message: MsgAddToGauge): MsgAddToGaugeAmino { const obj: any = {}; - obj.owner = message.owner; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; if (message.rewards) { obj.rewards = message.rewards.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/genesis.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/genesis.ts index a5912d2253..fa76db0580 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/genesis.ts @@ -133,16 +133,16 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.last_lock_id = message.lastLockId ? message.lastLockId.toString() : undefined; + obj.last_lock_id = message.lastLockId !== BigInt(0) ? message.lastLockId.toString() : undefined; if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/lock.ts index bd0078925f..0b299f3be4 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/lock.ts @@ -315,14 +315,14 @@ export const PeriodLock = { }, toAmino(message: PeriodLock): PeriodLockAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; - obj.owner = message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -452,7 +452,7 @@ export const QueryCondition = { fromAmino(object: QueryConditionAmino): QueryCondition { const message = createBaseQueryCondition(); if (object.lock_query_type !== undefined && object.lock_query_type !== null) { - message.lockQueryType = lockQueryTypeFromJSON(object.lock_query_type); + message.lockQueryType = object.lock_query_type; } if (object.denom !== undefined && object.denom !== null) { message.denom = object.denom; @@ -467,8 +467,8 @@ export const QueryCondition = { }, toAmino(message: QueryCondition): QueryConditionAmino { const obj: any = {}; - obj.lock_query_type = message.lockQueryType; - obj.denom = message.denom; + obj.lock_query_type = message.lockQueryType === 0 ? undefined : message.lockQueryType; + obj.denom = message.denom === "" ? undefined : message.denom; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; @@ -616,8 +616,8 @@ export const SyntheticLock = { }, toAmino(message: SyntheticLock): SyntheticLockAmino { const obj: any = {}; - obj.underlying_lock_id = message.underlyingLockId ? message.underlyingLockId.toString() : undefined; - obj.synth_denom = message.synthDenom; + obj.underlying_lock_id = message.underlyingLockId !== BigInt(0) ? message.underlyingLockId.toString() : undefined; + obj.synth_denom = message.synthDenom === "" ? undefined : message.synthDenom; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/params.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/params.ts index 6688646110..76927d2be8 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/params.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/params.ts @@ -89,7 +89,7 @@ export const Params = { if (message.forceUnlockAllowedAddresses) { obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses.map(e => e); } else { - obj.force_unlock_allowed_addresses = []; + obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/query.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/query.ts index 8d5341ea32..610bbb6503 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/query.ts @@ -508,7 +508,7 @@ export const ModuleBalanceResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -686,7 +686,7 @@ export const ModuleLockedAmountResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -781,7 +781,7 @@ export const AccountUnlockableCoinsRequest = { }, toAmino(message: AccountUnlockableCoinsRequest): AccountUnlockableCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountUnlockableCoinsRequestAminoMsg): AccountUnlockableCoinsRequest { @@ -884,7 +884,7 @@ export const AccountUnlockableCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -979,7 +979,7 @@ export const AccountUnlockingCoinsRequest = { }, toAmino(message: AccountUnlockingCoinsRequest): AccountUnlockingCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountUnlockingCoinsRequestAminoMsg): AccountUnlockingCoinsRequest { @@ -1082,7 +1082,7 @@ export const AccountUnlockingCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1177,7 +1177,7 @@ export const AccountLockedCoinsRequest = { }, toAmino(message: AccountLockedCoinsRequest): AccountLockedCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountLockedCoinsRequestAminoMsg): AccountLockedCoinsRequest { @@ -1280,7 +1280,7 @@ export const AccountLockedCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1391,7 +1391,7 @@ export const AccountLockedPastTimeRequest = { }, toAmino(message: AccountLockedPastTimeRequest): AccountLockedPastTimeRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1495,7 +1495,7 @@ export const AccountLockedPastTimeResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1606,7 +1606,7 @@ export const AccountLockedPastTimeNotUnlockingOnlyRequest = { }, toAmino(message: AccountLockedPastTimeNotUnlockingOnlyRequest): AccountLockedPastTimeNotUnlockingOnlyRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1710,7 +1710,7 @@ export const AccountLockedPastTimeNotUnlockingOnlyResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1821,7 +1821,7 @@ export const AccountUnlockedBeforeTimeRequest = { }, toAmino(message: AccountUnlockedBeforeTimeRequest): AccountUnlockedBeforeTimeRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1925,7 +1925,7 @@ export const AccountUnlockedBeforeTimeResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2052,9 +2052,9 @@ export const AccountLockedPastTimeDenomRequest = { }, toAmino(message: AccountLockedPastTimeDenomRequest): AccountLockedPastTimeDenomRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AccountLockedPastTimeDenomRequestAminoMsg): AccountLockedPastTimeDenomRequest { @@ -2157,7 +2157,7 @@ export const AccountLockedPastTimeDenomResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2270,7 +2270,7 @@ export const LockedDenomRequest = { }, toAmino(message: LockedDenomRequest): LockedDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -2365,7 +2365,7 @@ export const LockedDenomResponse = { }, toAmino(message: LockedDenomResponse): LockedDenomResponseAmino { const obj: any = {}; - obj.amount = message.amount; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: LockedDenomResponseAminoMsg): LockedDenomResponse { @@ -2461,7 +2461,7 @@ export const LockedRequest = { }, toAmino(message: LockedRequest): LockedRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: LockedRequestAminoMsg): LockedRequest { @@ -2653,7 +2653,7 @@ export const SyntheticLockupsByLockupIDRequest = { }, toAmino(message: SyntheticLockupsByLockupIDRequest): SyntheticLockupsByLockupIDRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: SyntheticLockupsByLockupIDRequestAminoMsg): SyntheticLockupsByLockupIDRequest { @@ -2756,7 +2756,7 @@ export const SyntheticLockupsByLockupIDResponse = { if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, @@ -2869,7 +2869,7 @@ export const AccountLockedLongerDurationRequest = { }, toAmino(message: AccountLockedLongerDurationRequest): AccountLockedLongerDurationRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -2973,7 +2973,7 @@ export const AccountLockedLongerDurationResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3086,7 +3086,7 @@ export const AccountLockedDurationRequest = { }, toAmino(message: AccountLockedDurationRequest): AccountLockedDurationRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -3190,7 +3190,7 @@ export const AccountLockedDurationResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3303,7 +3303,7 @@ export const AccountLockedLongerDurationNotUnlockingOnlyRequest = { }, toAmino(message: AccountLockedLongerDurationNotUnlockingOnlyRequest): AccountLockedLongerDurationNotUnlockingOnlyRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -3407,7 +3407,7 @@ export const AccountLockedLongerDurationNotUnlockingOnlyResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3536,9 +3536,9 @@ export const AccountLockedLongerDurationDenomRequest = { }, toAmino(message: AccountLockedLongerDurationDenomRequest): AccountLockedLongerDurationDenomRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AccountLockedLongerDurationDenomRequestAminoMsg): AccountLockedLongerDurationDenomRequest { @@ -3641,7 +3641,7 @@ export const AccountLockedLongerDurationDenomResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.amino.ts index 5a645daaa7..33e2ea5c7a 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.amino.ts @@ -3,6 +3,7 @@ import { Duration, DurationSDKType } from "../../google/protobuf/duration"; import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; import { PeriodLock, PeriodLockSDKType } from "./lock"; import { AminoMsg } from "@cosmjs/amino"; +import { omitDefault } from "../../helpers"; import { MsgLockTokens, MsgLockTokensSDKType, MsgBeginUnlockingAll, MsgBeginUnlockingAllSDKType, MsgBeginUnlocking, MsgBeginUnlockingSDKType, MsgExtendLockup, MsgExtendLockupSDKType, MsgForceUnlock, MsgForceUnlockSDKType } from "./tx"; export interface MsgLockTokensAminoType extends AminoMsg { type: "osmosis/lockup/lock-tokens"; @@ -81,11 +82,11 @@ export const AminoConverter = { }: MsgLockTokensAminoType["value"]): MsgLockTokens => { return { owner, - duration: { + duration: duration == null ? duration : { seconds: BigInt(Math.floor(parseInt(duration) / 1_000_000_000)), nanos: parseInt(duration) % 1_000_000_000 }, - coins: coins.map(el0 => ({ + coins: coins.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })) @@ -118,7 +119,7 @@ export const AminoConverter = { }: MsgBeginUnlocking): MsgBeginUnlockingAminoType["value"] => { return { owner, - ID: ID.toString(), + ID: omitDefault(ID)?.toString?.(), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -132,8 +133,8 @@ export const AminoConverter = { }: MsgBeginUnlockingAminoType["value"]): MsgBeginUnlocking => { return { owner, - ID: BigInt(ID), - coins: coins.map(el0 => ({ + ID: ID == null ? ID : BigInt(ID), + coins: coins.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })) @@ -149,7 +150,7 @@ export const AminoConverter = { }: MsgExtendLockup): MsgExtendLockupAminoType["value"] => { return { owner, - ID: ID.toString(), + ID: omitDefault(ID)?.toString?.(), duration: (duration * 1_000_000_000).toString() }; }, @@ -160,8 +161,8 @@ export const AminoConverter = { }: MsgExtendLockupAminoType["value"]): MsgExtendLockup => { return { owner, - ID: BigInt(ID), - duration: { + ID: ID == null ? ID : BigInt(ID), + duration: duration == null ? duration : { seconds: BigInt(Math.floor(parseInt(duration) / 1_000_000_000)), nanos: parseInt(duration) % 1_000_000_000 } @@ -177,7 +178,7 @@ export const AminoConverter = { }: MsgForceUnlock): MsgForceUnlockAminoType["value"] => { return { owner, - ID: ID.toString(), + ID: omitDefault(ID)?.toString?.(), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -191,8 +192,8 @@ export const AminoConverter = { }: MsgForceUnlockAminoType["value"]): MsgForceUnlock => { return { owner, - ID: BigInt(ID), - coins: coins.map(el0 => ({ + ID: ID == null ? ID : BigInt(ID), + coins: coins.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })) diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.ts index 345bd2487e..12fe8486f3 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.ts @@ -251,12 +251,12 @@ export const MsgLockTokens = { }, toAmino(message: MsgLockTokens): MsgLockTokensAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : 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 = []; + obj.coins = message.coins; } return obj; }, @@ -353,7 +353,7 @@ export const MsgLockTokensResponse = { }, toAmino(message: MsgLockTokensResponse): MsgLockTokensResponseAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockTokensResponseAminoMsg): MsgLockTokensResponse { @@ -447,7 +447,7 @@ export const MsgBeginUnlockingAll = { }, toAmino(message: MsgBeginUnlockingAll): MsgBeginUnlockingAllAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: MsgBeginUnlockingAllAminoMsg): MsgBeginUnlockingAll { @@ -550,7 +550,7 @@ export const MsgBeginUnlockingAllResponse = { if (message.unlocks) { obj.unlocks = message.unlocks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.unlocks = []; + obj.unlocks = message.unlocks; } return obj; }, @@ -685,12 +685,12 @@ export const MsgBeginUnlocking = { }, toAmino(message: MsgBeginUnlocking): MsgBeginUnlockingAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -785,7 +785,7 @@ export const MsgBeginUnlockingResponse = { }, toAmino(message: MsgBeginUnlockingResponse): MsgBeginUnlockingResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgBeginUnlockingResponseAminoMsg): MsgBeginUnlockingResponse { @@ -915,8 +915,8 @@ export const MsgExtendLockup = { }, toAmino(message: MsgExtendLockup): MsgExtendLockupAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -1011,7 +1011,7 @@ export const MsgExtendLockupResponse = { }, toAmino(message: MsgExtendLockupResponse): MsgExtendLockupResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgExtendLockupResponseAminoMsg): MsgExtendLockupResponse { @@ -1145,12 +1145,12 @@ export const MsgForceUnlock = { }, toAmino(message: MsgForceUnlock): MsgForceUnlockAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1245,7 +1245,7 @@ export const MsgForceUnlockResponse = { }, toAmino(message: MsgForceUnlockResponse): MsgForceUnlockResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgForceUnlockResponseAminoMsg): MsgForceUnlockResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/mint/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/mint/v1beta1/genesis.ts index e2474a70b7..366c3b7419 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/mint/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/mint/v1beta1/genesis.ts @@ -133,7 +133,7 @@ export const GenesisState = { 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; + obj.reduction_started_epoch = message.reductionStartedEpoch !== BigInt(0) ? message.reductionStartedEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/mint/v1beta1/mint.ts index 34351fddb5..8b83124382 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/mint/v1beta1/mint.ts @@ -200,7 +200,7 @@ export const Minter = { }, toAmino(message: Minter): MinterAmino { const obj: any = {}; - obj.epoch_provisions = message.epochProvisions; + obj.epoch_provisions = message.epochProvisions === "" ? undefined : message.epochProvisions; return obj; }, fromAminoMsg(object: MinterAminoMsg): Minter { @@ -310,8 +310,8 @@ export const WeightedAddress = { }, toAmino(message: WeightedAddress): WeightedAddressAmino { const obj: any = {}; - obj.address = message.address; - obj.weight = message.weight; + obj.address = message.address === "" ? undefined : message.address; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedAddressAminoMsg): WeightedAddress { @@ -453,10 +453,10 @@ export const DistributionProportions = { }, 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; + obj.staking = message.staking === "" ? undefined : message.staking; + obj.pool_incentives = message.poolIncentives === "" ? undefined : message.poolIncentives; + obj.developer_rewards = message.developerRewards === "" ? undefined : message.developerRewards; + obj.community_pool = message.communityPool === "" ? undefined : message.communityPool; return obj; }, fromAminoMsg(object: DistributionProportionsAminoMsg): DistributionProportions { @@ -674,18 +674,18 @@ export const Params = { }, 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.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; + obj.genesis_epoch_provisions = message.genesisEpochProvisions === "" ? undefined : message.genesisEpochProvisions; + obj.epoch_identifier = message.epochIdentifier === "" ? undefined : message.epochIdentifier; + obj.reduction_period_in_epochs = message.reductionPeriodInEpochs !== BigInt(0) ? message.reductionPeriodInEpochs.toString() : undefined; + obj.reduction_factor = message.reductionFactor === "" ? undefined : 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.weighted_developer_rewards_receivers = message.weightedDeveloperRewardsReceivers; } - obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; + obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch !== BigInt(0) ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/genesis.ts index b29808c96d..0315f713e4 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/genesis.ts @@ -155,7 +155,7 @@ export const GenesisState = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } obj.distr_info = message.distrInfo ? DistrInfo.toAmino(message.distrInfo) : undefined; obj.pool_to_gauges = message.poolToGauges ? PoolToGauges.toAmino(message.poolToGauges) : undefined; diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/gov.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/gov.ts index 009320c035..ed45704525 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/gov.ts @@ -173,12 +173,12 @@ export const ReplacePoolIncentivesProposal = { }, toAmino(message: ReplacePoolIncentivesProposal): ReplacePoolIncentivesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, @@ -311,12 +311,12 @@ export const UpdatePoolIncentivesProposal = { }, toAmino(message: UpdatePoolIncentivesProposal): UpdatePoolIncentivesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/incentives.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/incentives.ts index 66e9c871b4..437da4cd52 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/incentives.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/incentives.ts @@ -145,7 +145,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.minted_denom = message.mintedDenom; + obj.minted_denom = message.mintedDenom === "" ? undefined : message.mintedDenom; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -248,7 +248,7 @@ export const LockableDurationsInfo = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, @@ -365,11 +365,11 @@ export const DistrInfo = { }, toAmino(message: DistrInfo): DistrInfoAmino { const obj: any = {}; - obj.total_weight = message.totalWeight; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, @@ -482,8 +482,8 @@ export const DistrRecord = { }, toAmino(message: DistrRecord): DistrRecordAmino { const obj: any = {}; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; - obj.weight = message.weight; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: DistrRecordAminoMsg): DistrRecord { @@ -615,8 +615,8 @@ export const PoolToGauge = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -720,7 +720,7 @@ export const PoolToGauges = { if (message.poolToGauge) { obj.pool_to_gauge = message.poolToGauge.map(e => e ? PoolToGauge.toAmino(e) : undefined); } else { - obj.pool_to_gauge = []; + obj.pool_to_gauge = message.poolToGauge; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/query.ts index e554c3684a..87d6b46376 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/pool-incentives/v1beta1/query.ts @@ -203,7 +203,7 @@ export const QueryGaugeIdsRequest = { }, toAmino(message: QueryGaugeIdsRequest): QueryGaugeIdsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGaugeIdsRequestAminoMsg): QueryGaugeIdsRequest { @@ -306,7 +306,7 @@ export const QueryGaugeIdsResponse = { if (message.gaugeIdsWithDuration) { obj.gauge_ids_with_duration = message.gaugeIdsWithDuration.map(e => e ? QueryGaugeIdsResponse_GaugeIdWithDuration.toAmino(e) : undefined); } else { - obj.gauge_ids_with_duration = []; + obj.gauge_ids_with_duration = message.gaugeIdsWithDuration; } return obj; }, @@ -437,9 +437,9 @@ export const QueryGaugeIdsResponse_GaugeIdWithDuration = { }, toAmino(message: QueryGaugeIdsResponse_GaugeIdWithDuration): QueryGaugeIdsResponse_GaugeIdWithDurationAmino { const obj: any = {}; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.gauge_incentive_percentage = message.gaugeIncentivePercentage; + obj.gauge_incentive_percentage = message.gaugeIncentivePercentage === "" ? undefined : message.gaugeIncentivePercentage; return obj; }, fromAminoMsg(object: QueryGaugeIdsResponse_GaugeIdWithDurationAminoMsg): QueryGaugeIdsResponse_GaugeIdWithDuration { @@ -956,7 +956,7 @@ export const QueryLockableDurationsResponse = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, @@ -1163,9 +1163,9 @@ export const IncentivizedPool = { }, toAmino(message: IncentivizedPool): IncentivizedPoolAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.lockable_duration = message.lockableDuration ? Duration.toAmino(message.lockableDuration) : undefined; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: IncentivizedPoolAminoMsg): IncentivizedPool { @@ -1268,7 +1268,7 @@ export const QueryIncentivizedPoolsResponse = { if (message.incentivizedPools) { obj.incentivized_pools = message.incentivizedPools.map(e => e ? IncentivizedPool.toAmino(e) : undefined); } else { - obj.incentivized_pools = []; + obj.incentivized_pools = message.incentivizedPools; } return obj; }, @@ -1446,7 +1446,7 @@ export const QueryExternalIncentiveGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/sumtree/v1beta1/tree.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/sumtree/v1beta1/tree.ts index a5d833729c..e87e04aa8f 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/sumtree/v1beta1/tree.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/sumtree/v1beta1/tree.ts @@ -111,7 +111,7 @@ export const Node = { if (message.children) { obj.children = message.children.map(e => e ? Child.toAmino(e) : undefined); } else { - obj.children = []; + obj.children = message.children; } return obj; }, @@ -223,7 +223,7 @@ export const Child = { toAmino(message: Child): ChildAmino { const obj: any = {}; obj.index = message.index ? base64FromBytes(message.index) : undefined; - obj.accumulation = message.accumulation; + obj.accumulation = message.accumulation === "" ? undefined : message.accumulation; return obj; }, fromAminoMsg(object: ChildAminoMsg): Child { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/genesis.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/genesis.ts index 6dfe23c838..1d4e6d244a 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/genesis.ts @@ -198,22 +198,22 @@ export const GenesisState = { if (message.superfluidAssets) { obj.superfluid_assets = message.superfluidAssets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.superfluid_assets = []; + obj.superfluid_assets = message.superfluidAssets; } if (message.osmoEquivalentMultipliers) { obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers.map(e => e ? OsmoEquivalentMultiplierRecord.toAmino(e) : undefined); } else { - obj.osmo_equivalent_multipliers = []; + obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers; } if (message.intermediaryAccounts) { obj.intermediary_accounts = message.intermediaryAccounts.map(e => e ? SuperfluidIntermediaryAccount.toAmino(e) : undefined); } else { - obj.intermediary_accounts = []; + obj.intermediary_accounts = message.intermediaryAccounts; } if (message.intemediaryAccountConnections) { obj.intemediary_account_connections = message.intemediaryAccountConnections.map(e => e ? LockIdIntermediaryAccountConnection.toAmino(e) : undefined); } else { - obj.intemediary_account_connections = []; + obj.intemediary_account_connections = message.intemediaryAccountConnections; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/params.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/params.ts index 7b829e49cf..e81b77734c 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/params.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/params.ts @@ -89,7 +89,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.minimum_risk_factor = message.minimumRiskFactor; + obj.minimum_risk_factor = message.minimumRiskFactor === "" ? undefined : message.minimumRiskFactor; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/query.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/query.ts index 87395eb2cc..d0655c731c 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/query.ts @@ -587,7 +587,7 @@ export const AssetTypeRequest = { }, toAmino(message: AssetTypeRequest): AssetTypeRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AssetTypeRequestAminoMsg): AssetTypeRequest { @@ -675,13 +675,13 @@ export const AssetTypeResponse = { fromAmino(object: AssetTypeResponseAmino): AssetTypeResponse { const message = createBaseAssetTypeResponse(); if (object.asset_type !== undefined && object.asset_type !== null) { - message.assetType = superfluidAssetTypeFromJSON(object.asset_type); + message.assetType = object.asset_type; } return message; }, toAmino(message: AssetTypeResponse): AssetTypeResponseAmino { const obj: any = {}; - obj.asset_type = message.assetType; + obj.asset_type = message.assetType === 0 ? undefined : message.assetType; return obj; }, fromAminoMsg(object: AssetTypeResponseAminoMsg): AssetTypeResponse { @@ -858,7 +858,7 @@ export const AllAssetsResponse = { if (message.assets) { obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -953,7 +953,7 @@ export const AssetMultiplierRequest = { }, toAmino(message: AssetMultiplierRequest): AssetMultiplierRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AssetMultiplierRequestAminoMsg): AssetMultiplierRequest { @@ -1193,10 +1193,10 @@ export const SuperfluidIntermediaryAccountInfo = { }, 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; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: SuperfluidIntermediaryAccountInfoAminoMsg): SuperfluidIntermediaryAccountInfo { @@ -1413,7 +1413,7 @@ export const AllIntermediaryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? SuperfluidIntermediaryAccountInfo.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1511,7 +1511,7 @@ export const ConnectedIntermediaryAccountRequest = { }, toAmino(message: ConnectedIntermediaryAccountRequest): ConnectedIntermediaryAccountRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: ConnectedIntermediaryAccountRequestAminoMsg): ConnectedIntermediaryAccountRequest { @@ -1701,7 +1701,7 @@ export const QueryTotalDelegationByValidatorForDenomRequest = { }, toAmino(message: QueryTotalDelegationByValidatorForDenomRequest): QueryTotalDelegationByValidatorForDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryTotalDelegationByValidatorForDenomRequestAminoMsg): QueryTotalDelegationByValidatorForDenomRequest { @@ -1804,7 +1804,7 @@ export const QueryTotalDelegationByValidatorForDenomResponse = { if (message.assets) { obj.assets = message.assets.map(e => e ? Delegations.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -1931,9 +1931,9 @@ export const Delegations = { }, toAmino(message: Delegations): DelegationsAmino { const obj: any = {}; - obj.val_addr = message.valAddr; - obj.amount_sfsd = message.amountSfsd; - obj.osmo_equivalent = message.osmoEquivalent; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.amount_sfsd = message.amountSfsd === "" ? undefined : message.amountSfsd; + obj.osmo_equivalent = message.osmoEquivalent === "" ? undefined : message.osmoEquivalent; return obj; }, fromAminoMsg(object: DelegationsAminoMsg): Delegations { @@ -2101,7 +2101,7 @@ export const TotalSuperfluidDelegationsResponse = { }, toAmino(message: TotalSuperfluidDelegationsResponse): TotalSuperfluidDelegationsResponseAmino { const obj: any = {}; - obj.total_delegations = message.totalDelegations; + obj.total_delegations = message.totalDelegations === "" ? undefined : message.totalDelegations; return obj; }, fromAminoMsg(object: TotalSuperfluidDelegationsResponseAminoMsg): TotalSuperfluidDelegationsResponse { @@ -2227,9 +2227,9 @@ export const SuperfluidDelegationAmountRequest = { }, toAmino(message: SuperfluidDelegationAmountRequest): SuperfluidDelegationAmountRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidDelegationAmountRequestAminoMsg): SuperfluidDelegationAmountRequest { @@ -2332,7 +2332,7 @@ export const SuperfluidDelegationAmountResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -2427,7 +2427,7 @@ export const SuperfluidDelegationsByDelegatorRequest = { }, toAmino(message: SuperfluidDelegationsByDelegatorRequest): SuperfluidDelegationsByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: SuperfluidDelegationsByDelegatorRequestAminoMsg): SuperfluidDelegationsByDelegatorRequest { @@ -2570,12 +2570,12 @@ export const SuperfluidDelegationsByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined; return obj; @@ -2687,8 +2687,8 @@ export const SuperfluidUndelegationsByDelegatorRequest = { }, toAmino(message: SuperfluidUndelegationsByDelegatorRequest): SuperfluidUndelegationsByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.denom = message.denom; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidUndelegationsByDelegatorRequestAminoMsg): SuperfluidUndelegationsByDelegatorRequest { @@ -2835,17 +2835,17 @@ export const SuperfluidUndelegationsByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.totalUndelegatedCoins) { obj.total_undelegated_coins = message.totalUndelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_undelegated_coins = []; + obj.total_undelegated_coins = message.totalUndelegatedCoins; } if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, @@ -2956,8 +2956,8 @@ export const SuperfluidDelegationsByValidatorDenomRequest = { }, toAmino(message: SuperfluidDelegationsByValidatorDenomRequest): SuperfluidDelegationsByValidatorDenomRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidDelegationsByValidatorDenomRequestAminoMsg): SuperfluidDelegationsByValidatorDenomRequest { @@ -3060,7 +3060,7 @@ export const SuperfluidDelegationsByValidatorDenomResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } return obj; }, @@ -3171,8 +3171,8 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomRequest = { }, toAmino(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest): EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAminoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomRequest { @@ -3275,7 +3275,7 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomResponse = { if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } return obj; }, @@ -3370,7 +3370,7 @@ export const QueryTotalDelegationByDelegatorRequest = { }, toAmino(message: QueryTotalDelegationByDelegatorRequest): QueryTotalDelegationByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryTotalDelegationByDelegatorRequestAminoMsg): QueryTotalDelegationByDelegatorRequest { @@ -3535,17 +3535,17 @@ export const QueryTotalDelegationByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.delegationResponse) { obj.delegation_response = message.delegationResponse.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_response = []; + obj.delegation_response = message.delegationResponse; } if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined; return obj; @@ -3733,7 +3733,7 @@ export const QueryUnpoolWhitelistResponse = { if (message.poolIds) { obj.pool_ids = message.poolIds.map(e => e.toString()); } else { - obj.pool_ids = []; + obj.pool_ids = message.poolIds; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/superfluid.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/superfluid.ts index 16a32e5381..598fda8724 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/superfluid.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/superfluid.ts @@ -250,14 +250,14 @@ export const SuperfluidAsset = { message.denom = object.denom; } if (object.asset_type !== undefined && object.asset_type !== null) { - message.assetType = superfluidAssetTypeFromJSON(object.asset_type); + message.assetType = object.asset_type; } return message; }, toAmino(message: SuperfluidAsset): SuperfluidAssetAmino { const obj: any = {}; - obj.denom = message.denom; - obj.asset_type = message.assetType; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.asset_type = message.assetType === 0 ? undefined : message.assetType; return obj; }, fromAminoMsg(object: SuperfluidAssetAminoMsg): SuperfluidAsset { @@ -385,9 +385,9 @@ export const SuperfluidIntermediaryAccount = { }, 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; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: SuperfluidIntermediaryAccountAminoMsg): SuperfluidIntermediaryAccount { @@ -515,9 +515,9 @@ export const OsmoEquivalentMultiplierRecord = { }, toAmino(message: OsmoEquivalentMultiplierRecord): OsmoEquivalentMultiplierRecordAmino { const obj: any = {}; - obj.epoch_number = message.epochNumber ? message.epochNumber.toString() : undefined; - obj.denom = message.denom; - obj.multiplier = message.multiplier; + obj.epoch_number = message.epochNumber !== BigInt(0) ? message.epochNumber.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.multiplier = message.multiplier === "" ? undefined : message.multiplier; return obj; }, fromAminoMsg(object: OsmoEquivalentMultiplierRecordAminoMsg): OsmoEquivalentMultiplierRecord { @@ -663,8 +663,8 @@ export const SuperfluidDelegationRecord = { }, toAmino(message: SuperfluidDelegationRecord): SuperfluidDelegationRecordAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : 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; @@ -778,8 +778,8 @@ export const LockIdIntermediaryAccountConnection = { }, toAmino(message: LockIdIntermediaryAccountConnection): LockIdIntermediaryAccountConnectionAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; - obj.intermediary_account = message.intermediaryAccount; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; + obj.intermediary_account = message.intermediaryAccount === "" ? undefined : message.intermediaryAccount; return obj; }, fromAminoMsg(object: LockIdIntermediaryAccountConnectionAminoMsg): LockIdIntermediaryAccountConnection { @@ -891,7 +891,7 @@ export const UnpoolWhitelistedPools = { if (message.ids) { obj.ids = message.ids.map(e => e.toString()); } else { - obj.ids = []; + obj.ids = message.ids; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/tx.amino.ts index ab182966bc..91f77305ba 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/tx.amino.ts @@ -1,6 +1,7 @@ //@ts-nocheck import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; import { AminoMsg } from "@cosmjs/amino"; +import { omitDefault } from "../../helpers"; import { MsgSuperfluidDelegate, MsgSuperfluidDelegateSDKType, MsgSuperfluidUndelegate, MsgSuperfluidUndelegateSDKType, MsgSuperfluidUnbondLock, MsgSuperfluidUnbondLockSDKType, MsgLockAndSuperfluidDelegate, MsgLockAndSuperfluidDelegateSDKType, MsgUnPoolWhitelistedPool, MsgUnPoolWhitelistedPoolSDKType } from "./tx"; export interface MsgSuperfluidDelegateAminoType extends AminoMsg { type: "osmosis/superfluid-delegate"; @@ -52,7 +53,7 @@ export const AminoConverter = { }: MsgSuperfluidDelegate): MsgSuperfluidDelegateAminoType["value"] => { return { sender, - lock_id: lockId.toString(), + lock_id: omitDefault(lockId)?.toString?.(), val_addr: valAddr }; }, @@ -63,7 +64,7 @@ export const AminoConverter = { }: MsgSuperfluidDelegateAminoType["value"]): MsgSuperfluidDelegate => { return { sender, - lockId: BigInt(lock_id), + lockId: lock_id == null ? lock_id : BigInt(lock_id), valAddr: val_addr }; } @@ -76,7 +77,7 @@ export const AminoConverter = { }: MsgSuperfluidUndelegate): MsgSuperfluidUndelegateAminoType["value"] => { return { sender, - lock_id: lockId.toString() + lock_id: omitDefault(lockId)?.toString?.() }; }, fromAmino: ({ @@ -85,7 +86,7 @@ export const AminoConverter = { }: MsgSuperfluidUndelegateAminoType["value"]): MsgSuperfluidUndelegate => { return { sender, - lockId: BigInt(lock_id) + lockId: lock_id == null ? lock_id : BigInt(lock_id) }; } }, @@ -97,7 +98,7 @@ export const AminoConverter = { }: MsgSuperfluidUnbondLock): MsgSuperfluidUnbondLockAminoType["value"] => { return { sender, - lock_id: lockId.toString() + lock_id: omitDefault(lockId)?.toString?.() }; }, fromAmino: ({ @@ -106,7 +107,7 @@ export const AminoConverter = { }: MsgSuperfluidUnbondLockAminoType["value"]): MsgSuperfluidUnbondLock => { return { sender, - lockId: BigInt(lock_id) + lockId: lock_id == null ? lock_id : BigInt(lock_id) }; } }, @@ -133,7 +134,7 @@ export const AminoConverter = { }: MsgLockAndSuperfluidDelegateAminoType["value"]): MsgLockAndSuperfluidDelegate => { return { sender, - coins: coins.map(el0 => ({ + coins: coins.map?.(el0 => ({ denom: el0.denom, amount: el0.amount })), @@ -149,7 +150,7 @@ export const AminoConverter = { }: MsgUnPoolWhitelistedPool): MsgUnPoolWhitelistedPoolAminoType["value"] => { return { sender, - pool_id: poolId.toString() + pool_id: omitDefault(poolId)?.toString?.() }; }, fromAmino: ({ @@ -158,7 +159,7 @@ export const AminoConverter = { }: MsgUnPoolWhitelistedPoolAminoType["value"]): MsgUnPoolWhitelistedPool => { return { sender, - poolId: BigInt(pool_id) + poolId: pool_id == null ? pool_id : BigInt(pool_id) }; } } diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/tx.ts index d6c8ecdf48..0930d7ecab 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/tx.ts @@ -237,9 +237,9 @@ export const MsgSuperfluidDelegate = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; return obj; }, fromAminoMsg(object: MsgSuperfluidDelegateAminoMsg): MsgSuperfluidDelegate { @@ -425,8 +425,8 @@ export const MsgSuperfluidUndelegate = { }, toAmino(message: MsgSuperfluidUndelegate): MsgSuperfluidUndelegateAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSuperfluidUndelegateAminoMsg): MsgSuperfluidUndelegate { @@ -612,8 +612,8 @@ export const MsgSuperfluidUnbondLock = { }, toAmino(message: MsgSuperfluidUnbondLock): MsgSuperfluidUnbondLockAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSuperfluidUnbondLockAminoMsg): MsgSuperfluidUnbondLock { @@ -819,13 +819,13 @@ export const MsgLockAndSuperfluidDelegate = { }, toAmino(message: MsgLockAndSuperfluidDelegate): MsgLockAndSuperfluidDelegateAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } - obj.val_addr = message.valAddr; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateAminoMsg): MsgLockAndSuperfluidDelegate { @@ -921,7 +921,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, toAmino(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateResponseAminoMsg): MsgLockAndSuperfluidDelegateResponse { @@ -1033,8 +1033,8 @@ export const MsgUnPoolWhitelistedPool = { }, toAmino(message: MsgUnPoolWhitelistedPool): MsgUnPoolWhitelistedPoolAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgUnPoolWhitelistedPoolAminoMsg): MsgUnPoolWhitelistedPool { @@ -1146,7 +1146,7 @@ export const MsgUnPoolWhitelistedPoolResponse = { if (message.exitedLockIds) { obj.exited_lock_ids = message.exitedLockIds.map(e => e.toString()); } else { - obj.exited_lock_ids = []; + obj.exited_lock_ids = message.exitedLockIds; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/v1beta1/gov.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/v1beta1/gov.ts index ef1303f875..bd15a1eac4 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/v1beta1/gov.ts @@ -177,12 +177,12 @@ export const SetSuperfluidAssetsProposal = { }, toAmino(message: SetSuperfluidAssetsProposal): SetSuperfluidAssetsProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.assets) { obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -315,12 +315,12 @@ export const RemoveSuperfluidAssetsProposal = { }, toAmino(message: RemoveSuperfluidAssetsProposal): RemoveSuperfluidAssetsProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.superfluidAssetDenoms) { obj.superfluid_asset_denoms = message.superfluidAssetDenoms.map(e => e); } else { - obj.superfluid_asset_denoms = []; + obj.superfluid_asset_denoms = message.superfluidAssetDenoms; } return obj; }, @@ -478,14 +478,14 @@ export const UpdateUnpoolWhiteListProposal = { }, toAmino(message: UpdateUnpoolWhiteListProposal): UpdateUnpoolWhiteListProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.ids) { obj.ids = message.ids.map(e => e.toString()); } else { - obj.ids = []; + obj.ids = message.ids; } - obj.is_overwrite = message.isOverwrite; + obj.is_overwrite = message.isOverwrite === false ? undefined : message.isOverwrite; return obj; }, fromAminoMsg(object: UpdateUnpoolWhiteListProposalAminoMsg): UpdateUnpoolWhiteListProposal { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/authorityMetadata.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/authorityMetadata.ts index d845692338..05d6c404d5 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/authorityMetadata.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/authorityMetadata.ts @@ -91,7 +91,7 @@ export const DenomAuthorityMetadata = { }, toAmino(message: DenomAuthorityMetadata): DenomAuthorityMetadataAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; return obj; }, fromAminoMsg(object: DenomAuthorityMetadataAminoMsg): DenomAuthorityMetadata { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/genesis.ts index a32614c5f2..37b436e896 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/genesis.ts @@ -137,7 +137,7 @@ export const GenesisState = { if (message.factoryDenoms) { obj.factory_denoms = message.factoryDenoms.map(e => e ? GenesisDenom.toAmino(e) : undefined); } else { - obj.factory_denoms = []; + obj.factory_denoms = message.factoryDenoms; } return obj; }, @@ -250,7 +250,7 @@ export const GenesisDenom = { }, toAmino(message: GenesisDenom): GenesisDenomAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.authority_metadata = message.authorityMetadata ? DenomAuthorityMetadata.toAmino(message.authorityMetadata) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/params.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/params.ts index 7deb5a8423..ec74dead0e 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/params.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/params.ts @@ -92,7 +92,7 @@ export const Params = { if (message.denomCreationFee) { obj.denom_creation_fee = message.denomCreationFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.denom_creation_fee = []; + obj.denom_creation_fee = message.denomCreationFee; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/query.ts index 0312760e4e..c1efa97f11 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/query.ts @@ -335,7 +335,7 @@ export const QueryDenomAuthorityMetadataRequest = { }, toAmino(message: QueryDenomAuthorityMetadataRequest): QueryDenomAuthorityMetadataRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomAuthorityMetadataRequestAminoMsg): QueryDenomAuthorityMetadataRequest { @@ -525,7 +525,7 @@ export const QueryDenomsFromCreatorRequest = { }, toAmino(message: QueryDenomsFromCreatorRequest): QueryDenomsFromCreatorRequestAmino { const obj: any = {}; - obj.creator = message.creator; + obj.creator = message.creator === "" ? undefined : message.creator; return obj; }, fromAminoMsg(object: QueryDenomsFromCreatorRequestAminoMsg): QueryDenomsFromCreatorRequest { @@ -628,7 +628,7 @@ export const QueryDenomsFromCreatorResponse = { if (message.denoms) { obj.denoms = message.denoms.map(e => e); } else { - obj.denoms = []; + obj.denoms = message.denoms; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/tx.amino.ts index 6ac7848d13..0e3da3e533 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/tx.amino.ts @@ -2,6 +2,7 @@ import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { Metadata, MetadataSDKType, DenomUnit, DenomUnitSDKType } from "../../../cosmos/bank/v1beta1/bank"; import { AminoMsg } from "@cosmjs/amino"; +import { omitDefault } from "../../../helpers"; import { MsgCreateDenom, MsgCreateDenomSDKType, MsgMint, MsgMintSDKType, MsgBurn, MsgBurnSDKType, MsgChangeAdmin, MsgChangeAdminSDKType, MsgSetDenomMetadata, MsgSetDenomMetadataSDKType } from "./tx"; export interface MsgCreateDenomAminoType extends AminoMsg { type: "osmosis/tokenfactory/create-denom"; @@ -100,7 +101,7 @@ export const AminoConverter = { }: MsgMintAminoType["value"]): MsgMint => { return { sender, - amount: { + amount: amount == null ? amount : { denom: amount.denom, amount: amount.amount } @@ -127,7 +128,7 @@ export const AminoConverter = { }: MsgBurnAminoType["value"]): MsgBurn => { return { sender, - amount: { + amount: amount == null ? amount : { denom: amount.denom, amount: amount.amount } @@ -171,7 +172,7 @@ export const AminoConverter = { description: metadata.description, denom_units: metadata.denomUnits.map(el0 => ({ denom: el0.denom, - exponent: el0.exponent, + exponent: omitDefault(el0.exponent), aliases: el0.aliases })), base: metadata.base, @@ -189,9 +190,9 @@ export const AminoConverter = { }: MsgSetDenomMetadataAminoType["value"]): MsgSetDenomMetadata => { return { sender, - metadata: { + metadata: metadata == null ? metadata : { description: metadata.description, - denomUnits: metadata.denom_units.map(el1 => ({ + denomUnits: metadata.denom_units.map?.(el1 => ({ denom: el1.denom, exponent: el1.exponent, aliases: el1.aliases diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/tx.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/tx.ts index dafe17af1f..1d5e1ca9f6 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/tokenfactory/v1beta1/tx.ts @@ -263,8 +263,8 @@ export const MsgCreateDenom = { }, toAmino(message: MsgCreateDenom): MsgCreateDenomAmino { const obj: any = {}; - obj.sender = message.sender; - obj.subdenom = message.subdenom; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.subdenom = message.subdenom === "" ? undefined : message.subdenom; return obj; }, fromAminoMsg(object: MsgCreateDenomAminoMsg): MsgCreateDenom { @@ -358,7 +358,7 @@ export const MsgCreateDenomResponse = { }, toAmino(message: MsgCreateDenomResponse): MsgCreateDenomResponseAmino { const obj: any = {}; - obj.new_token_denom = message.newTokenDenom; + obj.new_token_denom = message.newTokenDenom === "" ? undefined : message.newTokenDenom; return obj; }, fromAminoMsg(object: MsgCreateDenomResponseAminoMsg): MsgCreateDenomResponse { @@ -470,7 +470,7 @@ export const MsgMint = { }, toAmino(message: MsgMint): MsgMintAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -657,7 +657,7 @@ export const MsgBurn = { }, toAmino(message: MsgBurn): MsgBurnAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -858,9 +858,9 @@ export const MsgChangeAdmin = { }, toAmino(message: MsgChangeAdmin): MsgChangeAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.denom = message.denom; - obj.new_admin = message.newAdmin; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgChangeAdminAminoMsg): MsgChangeAdmin { @@ -1046,7 +1046,7 @@ export const MsgSetDenomMetadata = { }, toAmino(message: MsgSetDenomMetadata): MsgSetDenomMetadataAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/twap/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/twap/v1beta1/genesis.ts index 56fd519109..6a972ec472 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/twap/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/twap/v1beta1/genesis.ts @@ -120,7 +120,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.prune_epoch_identifier = message.pruneEpochIdentifier; + obj.prune_epoch_identifier = message.pruneEpochIdentifier === "" ? undefined : message.pruneEpochIdentifier; obj.record_history_keep_period = message.recordHistoryKeepPeriod ? Duration.toAmino(message.recordHistoryKeepPeriod) : undefined; return obj; }, @@ -242,7 +242,7 @@ export const GenesisState = { if (message.twaps) { obj.twaps = message.twaps.map(e => e ? TwapRecord.toAmino(e) : undefined); } else { - obj.twaps = []; + obj.twaps = message.twaps; } obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/twap/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/twap/v1beta1/query.ts index 2cce0d9899..16342b7412 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/twap/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/twap/v1beta1/query.ts @@ -209,9 +209,9 @@ export const ArithmeticTwapRequest = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset === "" ? undefined : message.baseAsset; + obj.quote_asset = message.quoteAsset === "" ? undefined : message.quoteAsset; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; return obj; @@ -307,7 +307,7 @@ export const ArithmeticTwapResponse = { }, toAmino(message: ArithmeticTwapResponse): ArithmeticTwapResponseAmino { const obj: any = {}; - obj.arithmetic_twap = message.arithmeticTwap; + obj.arithmetic_twap = message.arithmeticTwap === "" ? undefined : message.arithmeticTwap; return obj; }, fromAminoMsg(object: ArithmeticTwapResponseAminoMsg): ArithmeticTwapResponse { @@ -451,9 +451,9 @@ export const ArithmeticTwapToNowRequest = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset === "" ? undefined : message.baseAsset; + obj.quote_asset = message.quoteAsset === "" ? undefined : message.quoteAsset; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, @@ -548,7 +548,7 @@ export const ArithmeticTwapToNowResponse = { }, toAmino(message: ArithmeticTwapToNowResponse): ArithmeticTwapToNowResponseAmino { const obj: any = {}; - obj.arithmetic_twap = message.arithmeticTwap; + obj.arithmetic_twap = message.arithmeticTwap === "" ? undefined : message.arithmeticTwap; return obj; }, fromAminoMsg(object: ArithmeticTwapToNowResponseAminoMsg): ArithmeticTwapToNowResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/twap/v1beta1/twap_record.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/twap/v1beta1/twap_record.ts index 4ea22c0220..00fa424091 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/twap/v1beta1/twap_record.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/twap/v1beta1/twap_record.ts @@ -282,15 +282,15 @@ export const TwapRecord = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.asset0_denom = message.asset0Denom === "" ? undefined : message.asset0Denom; + obj.asset1_denom = message.asset1Denom === "" ? undefined : message.asset1Denom; + obj.height = message.height ? message.height.toString() : "0"; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - 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.p0_last_spot_price = message.p0LastSpotPrice === "" ? undefined : message.p0LastSpotPrice; + obj.p1_last_spot_price = message.p1LastSpotPrice === "" ? undefined : message.p1LastSpotPrice; + obj.p0_arithmetic_twap_accumulator = message.p0ArithmeticTwapAccumulator === "" ? undefined : message.p0ArithmeticTwapAccumulator; + obj.p1_arithmetic_twap_accumulator = message.p1ArithmeticTwapAccumulator === "" ? undefined : message.p1ArithmeticTwapAccumulator; obj.last_error_time = message.lastErrorTime ? Timestamp.toAmino(toTimestamp(message.lastErrorTime)) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/feetoken.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/feetoken.ts index 93458496b4..1bdf14c875 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/feetoken.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/feetoken.ts @@ -112,8 +112,8 @@ export const FeeToken = { }, toAmino(message: FeeToken): FeeTokenAmino { const obj: any = {}; - obj.denom = message.denom; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; return obj; }, fromAminoMsg(object: FeeTokenAminoMsg): FeeToken { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/genesis.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/genesis.ts index 4769542628..871256595a 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/genesis.ts @@ -107,11 +107,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.basedenom = message.basedenom; + obj.basedenom = message.basedenom === "" ? undefined : message.basedenom; if (message.feetokens) { obj.feetokens = message.feetokens.map(e => e ? FeeToken.toAmino(e) : undefined); } else { - obj.feetokens = []; + obj.feetokens = message.feetokens; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/gov.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/gov.ts index 4fc390a412..7dcaf01d98 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/gov.ts @@ -133,8 +133,8 @@ export const UpdateFeeTokenProposal = { }, toAmino(message: UpdateFeeTokenProposal): UpdateFeeTokenProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.feetoken = message.feetoken ? FeeToken.toAmino(message.feetoken) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/query.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/query.ts index be26f613a7..610d234fc1 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/txfees/v1beta1/query.ts @@ -245,7 +245,7 @@ export const QueryFeeTokensResponse = { if (message.feeTokens) { obj.fee_tokens = message.feeTokens.map(e => e ? FeeToken.toAmino(e) : undefined); } else { - obj.fee_tokens = []; + obj.fee_tokens = message.feeTokens; } return obj; }, @@ -340,7 +340,7 @@ export const QueryDenomSpotPriceRequest = { }, toAmino(message: QueryDenomSpotPriceRequest): QueryDenomSpotPriceRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomSpotPriceRequestAminoMsg): QueryDenomSpotPriceRequest { @@ -452,8 +452,8 @@ export const QueryDenomSpotPriceResponse = { }, toAmino(message: QueryDenomSpotPriceResponse): QueryDenomSpotPriceResponseAmino { const obj: any = {}; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; - obj.spot_price = message.spotPrice; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QueryDenomSpotPriceResponseAminoMsg): QueryDenomSpotPriceResponse { @@ -547,7 +547,7 @@ export const QueryDenomPoolIdRequest = { }, toAmino(message: QueryDenomPoolIdRequest): QueryDenomPoolIdRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomPoolIdRequestAminoMsg): QueryDenomPoolIdRequest { @@ -643,7 +643,7 @@ export const QueryDenomPoolIdResponse = { }, toAmino(message: QueryDenomPoolIdResponse): QueryDenomPoolIdResponseAmino { const obj: any = {}; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; return obj; }, fromAminoMsg(object: QueryDenomPoolIdResponseAminoMsg): QueryDenomPoolIdResponse { @@ -811,7 +811,7 @@ export const QueryBaseDenomResponse = { }, toAmino(message: QueryBaseDenomResponse): QueryBaseDenomResponseAmino { const obj: any = {}; - obj.base_denom = message.baseDenom; + obj.base_denom = message.baseDenom === "" ? undefined : message.baseDenom; return obj; }, fromAminoMsg(object: QueryBaseDenomResponseAminoMsg): QueryBaseDenomResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/tendermint/abci/types.ts b/__fixtures__/v-next/outputinstantrpc/tendermint/abci/types.ts index 6909c97119..bde3491e77 100644 --- a/__fixtures__/v-next/outputinstantrpc/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputinstantrpc/tendermint/abci/types.ts @@ -1342,7 +1342,7 @@ export const RequestEcho = { }, toAmino(message: RequestEcho): RequestEchoAmino { const obj: any = {}; - obj.message = message.message; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: RequestEchoAminoMsg): RequestEcho { @@ -1534,9 +1534,9 @@ export const RequestInfo = { }, 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; + obj.version = message.version === "" ? undefined : message.version; + obj.block_version = message.blockVersion !== BigInt(0) ? message.blockVersion.toString() : undefined; + obj.p2p_version = message.p2pVersion !== BigInt(0) ? message.p2pVersion.toString() : undefined; return obj; }, fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo { @@ -1640,8 +1640,8 @@ export const RequestSetOption = { }, toAmino(message: RequestSetOption): RequestSetOptionAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: RequestSetOptionAminoMsg): RequestSetOption { @@ -1820,15 +1820,15 @@ export const RequestInitChain = { toAmino(message: RequestInitChain): RequestInitChainAmino { const obj: any = {}; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : 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.validators = message.validators; } obj.app_state_bytes = message.appStateBytes ? base64FromBytes(message.appStateBytes) : undefined; - obj.initial_height = message.initialHeight ? message.initialHeight.toString() : undefined; + obj.initial_height = message.initialHeight !== BigInt(0) ? message.initialHeight.toString() : undefined; return obj; }, fromAminoMsg(object: RequestInitChainAminoMsg): RequestInitChain { @@ -1967,9 +1967,9 @@ export const RequestQuery = { toAmino(message: RequestQuery): RequestQueryAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.path = message.path; - obj.height = message.height ? message.height.toString() : undefined; - obj.prove = message.prove; + obj.path = message.path === "" ? undefined : message.path; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.prove = message.prove === false ? undefined : message.prove; return obj; }, fromAminoMsg(object: RequestQueryAminoMsg): RequestQuery { @@ -2121,7 +2121,7 @@ export const RequestBeginBlock = { if (message.byzantineValidators) { obj.byzantine_validators = message.byzantineValidators.map(e => e ? Evidence.toAmino(e) : undefined); } else { - obj.byzantine_validators = []; + obj.byzantine_validators = message.byzantineValidators; } return obj; }, @@ -2220,14 +2220,14 @@ export const RequestCheckTx = { message.tx = bytesFromBase64(object.tx); } if (object.type !== undefined && object.type !== null) { - message.type = checkTxTypeFromJSON(object.type); + message.type = object.type; } return message; }, toAmino(message: RequestCheckTx): RequestCheckTxAmino { const obj: any = {}; obj.tx = message.tx ? base64FromBytes(message.tx) : undefined; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; return obj; }, fromAminoMsg(object: RequestCheckTxAminoMsg): RequestCheckTx { @@ -2405,7 +2405,7 @@ export const RequestEndBlock = { }, toAmino(message: RequestEndBlock): RequestEndBlockAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: RequestEndBlockAminoMsg): RequestEndBlock { @@ -2770,9 +2770,9 @@ export const RequestLoadSnapshotChunk = { }, toAmino(message: RequestLoadSnapshotChunk): RequestLoadSnapshotChunkAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunk = message.chunk; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunk = message.chunk === 0 ? undefined : message.chunk; return obj; }, fromAminoMsg(object: RequestLoadSnapshotChunkAminoMsg): RequestLoadSnapshotChunk { @@ -2892,9 +2892,9 @@ export const RequestApplySnapshotChunk = { }, toAmino(message: RequestApplySnapshotChunk): RequestApplySnapshotChunkAmino { const obj: any = {}; - obj.index = message.index; + obj.index = message.index === 0 ? undefined : message.index; obj.chunk = message.chunk ? base64FromBytes(message.chunk) : undefined; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: RequestApplySnapshotChunkAminoMsg): RequestApplySnapshotChunk { @@ -3357,7 +3357,7 @@ export const ResponseException = { }, toAmino(message: ResponseException): ResponseExceptionAmino { const obj: any = {}; - obj.error = message.error; + obj.error = message.error === "" ? undefined : message.error; return obj; }, fromAminoMsg(object: ResponseExceptionAminoMsg): ResponseException { @@ -3445,7 +3445,7 @@ export const ResponseEcho = { }, toAmino(message: ResponseEcho): ResponseEchoAmino { const obj: any = {}; - obj.message = message.message; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: ResponseEchoAminoMsg): ResponseEcho { @@ -3669,10 +3669,10 @@ export const ResponseInfo = { }, 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.data = message.data === "" ? undefined : message.data; + obj.version = message.version === "" ? undefined : message.version; + obj.app_version = message.appVersion !== BigInt(0) ? message.appVersion.toString() : undefined; + obj.last_block_height = message.lastBlockHeight !== BigInt(0) ? message.lastBlockHeight.toString() : undefined; obj.last_block_app_hash = message.lastBlockAppHash ? base64FromBytes(message.lastBlockAppHash) : undefined; return obj; }, @@ -3793,9 +3793,9 @@ export const ResponseSetOption = { }, toAmino(message: ResponseSetOption): ResponseSetOptionAmino { const obj: any = {}; - obj.code = message.code; - obj.log = message.log; - obj.info = message.info; + obj.code = message.code === 0 ? undefined : message.code; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; return obj; }, fromAminoMsg(object: ResponseSetOptionAminoMsg): ResponseSetOption { @@ -3927,7 +3927,7 @@ export const ResponseInitChain = { if (message.validators) { obj.validators = message.validators.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.app_hash = message.appHash ? base64FromBytes(message.appHash) : undefined; return obj; @@ -4151,15 +4151,15 @@ export const ResponseQuery = { }, 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.code = message.code === 0 ? undefined : message.code; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; obj.proof_ops = message.proofOps ? ProofOps.toAmino(message.proofOps) : undefined; - obj.height = message.height ? message.height.toString() : undefined; - obj.codespace = message.codespace; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseQueryAminoMsg): ResponseQuery { @@ -4256,7 +4256,7 @@ export const ResponseBeginBlock = { if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -4467,18 +4467,18 @@ export const ResponseCheckTx = { }, toAmino(message: ResponseCheckTx): ResponseCheckTxAmino { const obj: any = {}; - obj.code = message.code; + obj.code = message.code === 0 ? undefined : message.code; obj.data = message.data ? base64FromBytes(message.data) : undefined; - 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; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } - obj.codespace = message.codespace; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseCheckTxAminoMsg): ResponseCheckTx { @@ -4688,18 +4688,18 @@ export const ResponseDeliverTx = { }, toAmino(message: ResponseDeliverTx): ResponseDeliverTxAmino { const obj: any = {}; - obj.code = message.code; + obj.code = message.code === 0 ? undefined : message.code; obj.data = message.data ? base64FromBytes(message.data) : undefined; - 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; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } - obj.codespace = message.codespace; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseDeliverTxAminoMsg): ResponseDeliverTx { @@ -4836,13 +4836,13 @@ export const ResponseEndBlock = { if (message.validatorUpdates) { obj.validator_updates = message.validatorUpdates.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); } else { - obj.validator_updates = []; + obj.validator_updates = message.validatorUpdates; } 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 = []; + obj.events = message.events; } return obj; }, @@ -4950,7 +4950,7 @@ export const ResponseCommit = { toAmino(message: ResponseCommit): ResponseCommitAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.retain_height = message.retainHeight ? message.retainHeight.toString() : undefined; + obj.retain_height = message.retainHeight !== BigInt(0) ? message.retainHeight.toString() : undefined; return obj; }, fromAminoMsg(object: ResponseCommitAminoMsg): ResponseCommit { @@ -5047,7 +5047,7 @@ export const ResponseListSnapshots = { if (message.snapshots) { obj.snapshots = message.snapshots.map(e => e ? Snapshot.toAmino(e) : undefined); } else { - obj.snapshots = []; + obj.snapshots = message.snapshots; } return obj; }, @@ -5130,13 +5130,13 @@ export const ResponseOfferSnapshot = { fromAmino(object: ResponseOfferSnapshotAmino): ResponseOfferSnapshot { const message = createBaseResponseOfferSnapshot(); if (object.result !== undefined && object.result !== null) { - message.result = responseOfferSnapshot_ResultFromJSON(object.result); + message.result = object.result; } return message; }, toAmino(message: ResponseOfferSnapshot): ResponseOfferSnapshotAmino { const obj: any = {}; - obj.result = message.result; + obj.result = message.result === 0 ? undefined : message.result; return obj; }, fromAminoMsg(object: ResponseOfferSnapshotAminoMsg): ResponseOfferSnapshot { @@ -5357,7 +5357,7 @@ export const ResponseApplySnapshotChunk = { fromAmino(object: ResponseApplySnapshotChunkAmino): ResponseApplySnapshotChunk { const message = createBaseResponseApplySnapshotChunk(); if (object.result !== undefined && object.result !== null) { - message.result = responseApplySnapshotChunk_ResultFromJSON(object.result); + message.result = object.result; } message.refetchChunks = object.refetch_chunks?.map(e => e) || []; message.rejectSenders = object.reject_senders?.map(e => e) || []; @@ -5365,16 +5365,16 @@ export const ResponseApplySnapshotChunk = { }, toAmino(message: ResponseApplySnapshotChunk): ResponseApplySnapshotChunkAmino { const obj: any = {}; - obj.result = message.result; + obj.result = message.result === 0 ? undefined : message.result; if (message.refetchChunks) { obj.refetch_chunks = message.refetchChunks.map(e => e); } else { - obj.refetch_chunks = []; + obj.refetch_chunks = message.refetchChunks; } if (message.rejectSenders) { obj.reject_senders = message.rejectSenders.map(e => e); } else { - obj.reject_senders = []; + obj.reject_senders = message.rejectSenders; } return obj; }, @@ -5630,8 +5630,8 @@ export const BlockParams = { }, 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.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas !== BigInt(0) ? message.maxGas.toString() : undefined; return obj; }, fromAminoMsg(object: BlockParamsAminoMsg): BlockParams { @@ -5741,11 +5741,11 @@ export const LastCommitInfo = { }, toAmino(message: LastCommitInfo): LastCommitInfoAmino { const obj: any = {}; - obj.round = message.round; + obj.round = message.round === 0 ? undefined : message.round; if (message.votes) { obj.votes = message.votes.map(e => e ? VoteInfo.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } return obj; }, @@ -5856,11 +5856,11 @@ export const Event = { }, toAmino(message: Event): EventAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? EventAttribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -5983,7 +5983,7 @@ export const EventAttribute = { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; - obj.index = message.index; + obj.index = message.index === false ? undefined : message.index; return obj; }, fromAminoMsg(object: EventAttributeAminoMsg): EventAttribute { @@ -6123,8 +6123,8 @@ export const TxResult = { }, toAmino(message: TxResult): TxResultAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.index = message.index; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.index = message.index === 0 ? undefined : message.index; obj.tx = message.tx ? base64FromBytes(message.tx) : undefined; obj.result = message.result ? ResponseDeliverTx.toAmino(message.result) : undefined; return obj; @@ -6233,7 +6233,7 @@ export const Validator = { toAmino(message: Validator): ValidatorAmino { const obj: any = {}; obj.address = message.address ? base64FromBytes(message.address) : undefined; - obj.power = message.power ? message.power.toString() : undefined; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -6342,7 +6342,7 @@ export const ValidatorUpdate = { 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; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorUpdateAminoMsg): ValidatorUpdate { @@ -6449,7 +6449,7 @@ export const VoteInfo = { toAmino(message: VoteInfo): VoteInfoAmino { const obj: any = {}; obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; - obj.signed_last_block = message.signedLastBlock; + obj.signed_last_block = message.signedLastBlock === false ? undefined : message.signedLastBlock; return obj; }, fromAminoMsg(object: VoteInfoAminoMsg): VoteInfo { @@ -6589,7 +6589,7 @@ export const Evidence = { fromAmino(object: EvidenceAmino): Evidence { const message = createBaseEvidence(); if (object.type !== undefined && object.type !== null) { - message.type = evidenceTypeFromJSON(object.type); + message.type = object.type; } if (object.validator !== undefined && object.validator !== null) { message.validator = Validator.fromAmino(object.validator); @@ -6607,11 +6607,11 @@ export const Evidence = { }, toAmino(message: Evidence): EvidenceAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; return obj; }, fromAminoMsg(object: EvidenceAminoMsg): Evidence { @@ -6765,9 +6765,9 @@ export const Snapshot = { }, toAmino(message: Snapshot): SnapshotAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunks = message.chunks; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunks = message.chunks === 0 ? undefined : message.chunks; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; obj.metadata = message.metadata ? base64FromBytes(message.metadata) : undefined; return obj; diff --git a/__fixtures__/v-next/outputinstantrpc/tendermint/crypto/proof.ts b/__fixtures__/v-next/outputinstantrpc/tendermint/crypto/proof.ts index 8cdc44a66c..eb3082cbcd 100644 --- a/__fixtures__/v-next/outputinstantrpc/tendermint/crypto/proof.ts +++ b/__fixtures__/v-next/outputinstantrpc/tendermint/crypto/proof.ts @@ -208,13 +208,13 @@ export const Proof = { }, toAmino(message: Proof): ProofAmino { const obj: any = {}; - obj.total = message.total ? message.total.toString() : undefined; - obj.index = message.index ? message.index.toString() : undefined; + obj.total = message.total !== BigInt(0) ? message.total.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.leaf_hash = message.leafHash ? base64FromBytes(message.leafHash) : undefined; if (message.aunts) { obj.aunts = message.aunts.map(e => base64FromBytes(e)); } else { - obj.aunts = []; + obj.aunts = message.aunts; } return obj; }, @@ -442,9 +442,9 @@ export const DominoOp = { }, toAmino(message: DominoOp): DominoOpAmino { const obj: any = {}; - obj.key = message.key; - obj.input = message.input; - obj.output = message.output; + obj.key = message.key === "" ? undefined : message.key; + obj.input = message.input === "" ? undefined : message.input; + obj.output = message.output === "" ? undefined : message.output; return obj; }, fromAminoMsg(object: DominoOpAminoMsg): DominoOp { @@ -564,7 +564,7 @@ export const ProofOp = { }, toAmino(message: ProofOp): ProofOpAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; @@ -663,7 +663,7 @@ export const ProofOps = { if (message.ops) { obj.ops = message.ops.map(e => e ? ProofOp.toAmino(e) : undefined); } else { - obj.ops = []; + obj.ops = message.ops; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/tendermint/libs/bits/types.ts b/__fixtures__/v-next/outputinstantrpc/tendermint/libs/bits/types.ts index b54daacdb2..b824c36692 100644 --- a/__fixtures__/v-next/outputinstantrpc/tendermint/libs/bits/types.ts +++ b/__fixtures__/v-next/outputinstantrpc/tendermint/libs/bits/types.ts @@ -115,11 +115,11 @@ export const BitArray = { }, toAmino(message: BitArray): BitArrayAmino { const obj: any = {}; - obj.bits = message.bits ? message.bits.toString() : undefined; + obj.bits = message.bits !== BigInt(0) ? message.bits.toString() : undefined; if (message.elems) { obj.elems = message.elems.map(e => e.toString()); } else { - obj.elems = []; + obj.elems = message.elems; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/tendermint/p2p/types.ts b/__fixtures__/v-next/outputinstantrpc/tendermint/p2p/types.ts index 87704a15a3..1c24960afa 100644 --- a/__fixtures__/v-next/outputinstantrpc/tendermint/p2p/types.ts +++ b/__fixtures__/v-next/outputinstantrpc/tendermint/p2p/types.ts @@ -189,9 +189,9 @@ export const ProtocolVersion = { }, 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; + obj.p2p = message.p2p !== BigInt(0) ? message.p2p.toString() : undefined; + obj.block = message.block !== BigInt(0) ? message.block.toString() : undefined; + obj.app = message.app !== BigInt(0) ? message.app.toString() : undefined; return obj; }, fromAminoMsg(object: ProtocolVersionAminoMsg): ProtocolVersion { @@ -396,12 +396,12 @@ export const NodeInfo = { 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.node_id = message.nodeId === "" ? undefined : message.nodeId; + obj.listen_addr = message.listenAddr === "" ? undefined : message.listenAddr; + obj.network = message.network === "" ? undefined : message.network; + obj.version = message.version === "" ? undefined : message.version; obj.channels = message.channels ? base64FromBytes(message.channels) : undefined; - obj.moniker = message.moniker; + obj.moniker = message.moniker === "" ? undefined : message.moniker; obj.other = message.other ? NodeInfoOther.toAmino(message.other) : undefined; return obj; }, @@ -506,8 +506,8 @@ export const NodeInfoOther = { }, toAmino(message: NodeInfoOther): NodeInfoOtherAmino { const obj: any = {}; - obj.tx_index = message.txIndex; - obj.rpc_address = message.rpcAddress; + obj.tx_index = message.txIndex === "" ? undefined : message.txIndex; + obj.rpc_address = message.rpcAddress === "" ? undefined : message.rpcAddress; return obj; }, fromAminoMsg(object: NodeInfoOtherAminoMsg): NodeInfoOther { @@ -633,11 +633,11 @@ export const PeerInfo = { }, toAmino(message: PeerInfo): PeerInfoAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; if (message.addressInfo) { obj.address_info = message.addressInfo.map(e => e ? PeerAddressInfo.toAmino(e) : undefined); } else { - obj.address_info = []; + obj.address_info = message.addressInfo; } obj.last_connected = message.lastConnected ? Timestamp.toAmino(toTimestamp(message.lastConnected)) : undefined; return obj; @@ -775,10 +775,10 @@ export const PeerAddressInfo = { }, toAmino(message: PeerAddressInfo): PeerAddressInfoAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.last_dial_success = message.lastDialSuccess ? Timestamp.toAmino(toTimestamp(message.lastDialSuccess)) : undefined; obj.last_dial_failure = message.lastDialFailure ? Timestamp.toAmino(toTimestamp(message.lastDialFailure)) : undefined; - obj.dial_failures = message.dialFailures; + obj.dial_failures = message.dialFailures === 0 ? undefined : message.dialFailures; return obj; }, fromAminoMsg(object: PeerAddressInfoAminoMsg): PeerAddressInfo { diff --git a/__fixtures__/v-next/outputinstantrpc/tendermint/types/evidence.ts b/__fixtures__/v-next/outputinstantrpc/tendermint/types/evidence.ts index a9ad7c29eb..06bf9dba0a 100644 --- a/__fixtures__/v-next/outputinstantrpc/tendermint/types/evidence.ts +++ b/__fixtures__/v-next/outputinstantrpc/tendermint/types/evidence.ts @@ -318,8 +318,8 @@ export const DuplicateVoteEvidence = { 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.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; + obj.validator_power = message.validatorPower !== BigInt(0) ? message.validatorPower.toString() : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -485,13 +485,13 @@ export const LightClientAttackEvidence = { 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; + obj.common_height = message.commonHeight !== BigInt(0) ? message.commonHeight.toString() : undefined; if (message.byzantineValidators) { obj.byzantine_validators = message.byzantineValidators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.byzantine_validators = []; + obj.byzantine_validators = message.byzantineValidators; } - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -589,7 +589,7 @@ export const EvidenceList = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Evidence.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } return obj; }, diff --git a/__fixtures__/v-next/outputinstantrpc/tendermint/types/params.ts b/__fixtures__/v-next/outputinstantrpc/tendermint/types/params.ts index 57564d97f6..5c31de35d1 100644 --- a/__fixtures__/v-next/outputinstantrpc/tendermint/types/params.ts +++ b/__fixtures__/v-next/outputinstantrpc/tendermint/types/params.ts @@ -396,9 +396,9 @@ export const BlockParams = { }, 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; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas !== BigInt(0) ? message.maxGas.toString() : undefined; + obj.time_iota_ms = message.timeIotaMs !== BigInt(0) ? message.timeIotaMs.toString() : undefined; return obj; }, fromAminoMsg(object: BlockParamsAminoMsg): BlockParams { @@ -524,9 +524,9 @@ export const EvidenceParams = { }, toAmino(message: EvidenceParams): EvidenceParamsAmino { const obj: any = {}; - obj.max_age_num_blocks = message.maxAgeNumBlocks ? message.maxAgeNumBlocks.toString() : undefined; + obj.max_age_num_blocks = message.maxAgeNumBlocks !== BigInt(0) ? message.maxAgeNumBlocks.toString() : undefined; obj.max_age_duration = message.maxAgeDuration ? Duration.toAmino(message.maxAgeDuration) : undefined; - obj.max_bytes = message.maxBytes ? message.maxBytes.toString() : undefined; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; return obj; }, fromAminoMsg(object: EvidenceParamsAminoMsg): EvidenceParams { @@ -623,7 +623,7 @@ export const ValidatorParams = { if (message.pubKeyTypes) { obj.pub_key_types = message.pubKeyTypes.map(e => e); } else { - obj.pub_key_types = []; + obj.pub_key_types = message.pubKeyTypes; } return obj; }, @@ -714,7 +714,7 @@ export const VersionParams = { }, toAmino(message: VersionParams): VersionParamsAmino { const obj: any = {}; - obj.app_version = message.appVersion ? message.appVersion.toString() : undefined; + obj.app_version = message.appVersion !== BigInt(0) ? message.appVersion.toString() : undefined; return obj; }, fromAminoMsg(object: VersionParamsAminoMsg): VersionParams { @@ -822,8 +822,8 @@ export const HashedParams = { }, 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; + obj.block_max_bytes = message.blockMaxBytes !== BigInt(0) ? message.blockMaxBytes.toString() : undefined; + obj.block_max_gas = message.blockMaxGas !== BigInt(0) ? message.blockMaxGas.toString() : undefined; return obj; }, fromAminoMsg(object: HashedParamsAminoMsg): HashedParams { diff --git a/__fixtures__/v-next/outputinstantrpc/tendermint/types/types.ts b/__fixtures__/v-next/outputinstantrpc/tendermint/types/types.ts index 2579f14e55..62180c51dc 100644 --- a/__fixtures__/v-next/outputinstantrpc/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputinstantrpc/tendermint/types/types.ts @@ -433,7 +433,7 @@ export const PartSetHeader = { }, toAmino(message: PartSetHeader): PartSetHeaderAmino { const obj: any = {}; - obj.total = message.total; + obj.total = message.total === 0 ? undefined : message.total; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; return obj; }, @@ -556,7 +556,7 @@ export const Part = { }, toAmino(message: Part): PartAmino { const obj: any = {}; - obj.index = message.index; + obj.index = message.index === 0 ? undefined : message.index; obj.bytes = message.bytes ? base64FromBytes(message.bytes) : undefined; obj.proof = message.proof ? Proof.toAmino(message.proof) : undefined; return obj; @@ -968,8 +968,8 @@ export const Header = { 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.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; obj.last_block_id = message.lastBlockId ? BlockID.toAmino(message.lastBlockId) : undefined; obj.last_commit_hash = message.lastCommitHash ? base64FromBytes(message.lastCommitHash) : undefined; @@ -1077,7 +1077,7 @@ export const Data = { if (message.txs) { obj.txs = message.txs.map(e => base64FromBytes(e)); } else { - obj.txs = []; + obj.txs = message.txs; } return obj; }, @@ -1255,7 +1255,7 @@ export const Vote = { fromAmino(object: VoteAmino): Vote { const message = createBaseVote(); if (object.type !== undefined && object.type !== null) { - message.type = signedMsgTypeFromJSON(object.type); + message.type = object.type; } if (object.height !== undefined && object.height !== null) { message.height = BigInt(object.height); @@ -1282,13 +1282,13 @@ export const Vote = { }, toAmino(message: Vote): VoteAmino { const obj: any = {}; - obj.type = message.type; - obj.height = message.height ? message.height.toString() : undefined; - obj.round = message.round; + obj.type = message.type === 0 ? undefined : message.type; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.validator_address = message.validatorAddress ? base64FromBytes(message.validatorAddress) : undefined; - obj.validator_index = message.validatorIndex; + obj.validator_index = message.validatorIndex === 0 ? undefined : message.validatorIndex; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; return obj; }, @@ -1435,13 +1435,13 @@ export const Commit = { }, toAmino(message: Commit): CommitAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.round = message.round; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : 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 = []; + obj.signatures = message.signatures; } return obj; }, @@ -1563,7 +1563,7 @@ export const CommitSig = { fromAmino(object: CommitSigAmino): CommitSig { const message = createBaseCommitSig(); if (object.block_id_flag !== undefined && object.block_id_flag !== null) { - message.blockIdFlag = blockIDFlagFromJSON(object.block_id_flag); + message.blockIdFlag = object.block_id_flag; } if (object.validator_address !== undefined && object.validator_address !== null) { message.validatorAddress = bytesFromBase64(object.validator_address); @@ -1578,7 +1578,7 @@ export const CommitSig = { }, toAmino(message: CommitSig): CommitSigAmino { const obj: any = {}; - obj.block_id_flag = message.blockIdFlag; + obj.block_id_flag = message.blockIdFlag === 0 ? undefined : message.blockIdFlag; obj.validator_address = message.validatorAddress ? base64FromBytes(message.validatorAddress) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; @@ -1745,7 +1745,7 @@ export const Proposal = { fromAmino(object: ProposalAmino): Proposal { const message = createBaseProposal(); if (object.type !== undefined && object.type !== null) { - message.type = signedMsgTypeFromJSON(object.type); + message.type = object.type; } if (object.height !== undefined && object.height !== null) { message.height = BigInt(object.height); @@ -1769,10 +1769,10 @@ export const Proposal = { }, 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.type = message.type === 0 ? undefined : message.type; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; + obj.pol_round = message.polRound === 0 ? undefined : message.polRound; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; @@ -2138,9 +2138,9 @@ export const BlockMeta = { 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.block_size = message.blockSize !== BigInt(0) ? message.blockSize.toString() : undefined; obj.header = message.header ? Header.toAmino(message.header) : undefined; - obj.num_txs = message.numTxs ? message.numTxs.toString() : undefined; + obj.num_txs = message.numTxs !== BigInt(0) ? message.numTxs.toString() : undefined; return obj; }, fromAminoMsg(object: BlockMetaAminoMsg): BlockMeta { diff --git a/__fixtures__/v-next/outputinstantrpc/tendermint/types/validator.ts b/__fixtures__/v-next/outputinstantrpc/tendermint/types/validator.ts index 104304adf3..cd32dbc43c 100644 --- a/__fixtures__/v-next/outputinstantrpc/tendermint/types/validator.ts +++ b/__fixtures__/v-next/outputinstantrpc/tendermint/types/validator.ts @@ -158,10 +158,10 @@ export const ValidatorSet = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.proposer = message.proposer ? Validator.toAmino(message.proposer) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorSetAminoMsg): ValidatorSet { @@ -305,8 +305,8 @@ export const Validator = { const obj: any = {}; obj.address = message.address ? base64FromBytes(message.address) : undefined; 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority !== BigInt(0) ? message.proposerPriority.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -415,7 +415,7 @@ export const SimpleValidator = { 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; return obj; }, fromAminoMsg(object: SimpleValidatorAminoMsg): SimpleValidator { diff --git a/__fixtures__/v-next/outputinstantrpc/tendermint/version/types.ts b/__fixtures__/v-next/outputinstantrpc/tendermint/version/types.ts index b2fe2649bc..1f1933a734 100644 --- a/__fixtures__/v-next/outputinstantrpc/tendermint/version/types.ts +++ b/__fixtures__/v-next/outputinstantrpc/tendermint/version/types.ts @@ -132,8 +132,8 @@ export const App = { }, toAmino(message: App): AppAmino { const obj: any = {}; - obj.protocol = message.protocol ? message.protocol.toString() : undefined; - obj.software = message.software; + obj.protocol = message.protocol !== BigInt(0) ? message.protocol.toString() : undefined; + obj.software = message.software === "" ? undefined : message.software; return obj; }, fromAminoMsg(object: AppAminoMsg): App { @@ -241,8 +241,8 @@ export const Consensus = { }, toAmino(message: Consensus): ConsensusAmino { const obj: any = {}; - obj.block = message.block ? message.block.toString() : undefined; - obj.app = message.app ? message.app.toString() : undefined; + obj.block = message.block !== BigInt(0) ? message.block.toString() : undefined; + obj.app = message.app !== BigInt(0) ? message.app.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusAminoMsg): Consensus { diff --git a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta1/audit.ts b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta1/audit.ts index c4405f81d9..18dc4fccfd 100644 --- a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta1/audit.ts +++ b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta1/audit.ts @@ -215,12 +215,12 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -353,12 +353,12 @@ export const AuditedAttributes = { }, toAmino(message: AuditedAttributes): AuditedAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -462,7 +462,7 @@ export const AttributesResponse = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -588,12 +588,12 @@ export const AttributesFilters = { if (message.auditors) { obj.auditors = message.auditors.map(e => e); } else { - obj.auditors = []; + obj.auditors = message.auditors; } if (message.owners) { obj.owners = message.owners.map(e => e); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, @@ -726,12 +726,12 @@ export const MsgSignProviderAttributes = { }, toAmino(message: MsgSignProviderAttributes): MsgSignProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -937,12 +937,12 @@ export const MsgDeleteProviderAttributes = { }, toAmino(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/audit.ts b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/audit.ts index f092bcfdcf..fbfdbaa250 100644 --- a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/audit.ts +++ b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/audit.ts @@ -215,12 +215,12 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -353,12 +353,12 @@ export const AuditedAttributes = { }, toAmino(message: AuditedAttributes): AuditedAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -462,7 +462,7 @@ export const AttributesResponse = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -588,12 +588,12 @@ export const AttributesFilters = { if (message.auditors) { obj.auditors = message.auditors.map(e => e); } else { - obj.auditors = []; + obj.auditors = message.auditors; } if (message.owners) { obj.owners = message.owners.map(e => e); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, @@ -726,12 +726,12 @@ export const MsgSignProviderAttributes = { }, toAmino(message: MsgSignProviderAttributes): MsgSignProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -937,12 +937,12 @@ export const MsgDeleteProviderAttributes = { }, toAmino(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/genesis.ts index f0afd85003..5f7090e58c 100644 --- a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/query.ts b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/query.ts index 9757213752..0dcb3cfe9c 100644 --- a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/query.ts @@ -179,7 +179,7 @@ export const QueryProvidersResponse = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -291,8 +291,8 @@ export const QueryProviderRequest = { }, toAmino(message: QueryProviderRequest): QueryProviderRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; - obj.owner = message.owner; + obj.auditor = message.auditor === "" ? undefined : message.auditor; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest { @@ -496,7 +496,7 @@ export const QueryProviderAttributesRequest = { }, toAmino(message: QueryProviderAttributesRequest): QueryProviderAttributesRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -607,8 +607,8 @@ export const QueryProviderAuditorRequest = { }, toAmino(message: QueryProviderAuditorRequest): QueryProviderAuditorRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; - obj.owner = message.owner; + obj.auditor = message.auditor === "" ? undefined : message.auditor; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderAuditorRequestAminoMsg): QueryProviderAuditorRequest { @@ -718,7 +718,7 @@ export const QueryAuditorAttributesRequest = { }, toAmino(message: QueryAuditorAttributesRequest): QueryAuditorAttributesRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; + obj.auditor = message.auditor === "" ? undefined : message.auditor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/attribute.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/attribute.ts index 404bc221d2..0405c8ca0c 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/attribute.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/attribute.ts @@ -142,8 +142,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -268,12 +268,12 @@ export const SignedBy = { if (message.allOf) { obj.all_of = message.allOf.map(e => e); } else { - obj.all_of = []; + obj.all_of = message.allOf; } if (message.anyOf) { obj.any_of = message.anyOf.map(e => e); } else { - obj.any_of = []; + obj.any_of = message.anyOf; } return obj; }, @@ -390,11 +390,11 @@ export const PlacementRequirements = { }, toAmino(message: PlacementRequirements): PlacementRequirementsAmino { const obj: any = {}; - obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : undefined; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : SignedBy.toAmino(SignedBy.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/endpoint.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/endpoint.ts index 9d6f9caefd..744cdaea28 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/endpoint.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/endpoint.ts @@ -110,13 +110,13 @@ export const Endpoint = { fromAmino(object: EndpointAmino): Endpoint { const message = createBaseEndpoint(); if (object.kind !== undefined && object.kind !== null) { - message.kind = endpoint_KindFromJSON(object.kind); + message.kind = object.kind; } return message; }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.kind = message.kind; + obj.kind = message.kind === 0 ? undefined : message.kind; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/resource.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/resource.ts index e7194bd44d..3e6be68b63 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/resource.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/resource.ts @@ -165,7 +165,7 @@ export const CPU = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -282,11 +282,11 @@ export const Memory = { }, toAmino(message: Memory): MemoryAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -403,11 +403,11 @@ export const Storage = { }, toAmino(message: Storage): StorageAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -562,7 +562,7 @@ export const ResourceUnits = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/attribute.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/attribute.ts index 8de9071428..dada7de403 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/attribute.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/attribute.ts @@ -142,8 +142,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -268,12 +268,12 @@ export const SignedBy = { if (message.allOf) { obj.all_of = message.allOf.map(e => e); } else { - obj.all_of = []; + obj.all_of = message.allOf; } if (message.anyOf) { obj.any_of = message.anyOf.map(e => e); } else { - obj.any_of = []; + obj.any_of = message.anyOf; } return obj; }, @@ -390,11 +390,11 @@ export const PlacementRequirements = { }, toAmino(message: PlacementRequirements): PlacementRequirementsAmino { const obj: any = {}; - obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : undefined; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : SignedBy.toAmino(SignedBy.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/endpoint.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/endpoint.ts index 7e96c32156..be419c7c7e 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/endpoint.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/endpoint.ts @@ -132,7 +132,7 @@ export const Endpoint = { fromAmino(object: EndpointAmino): Endpoint { const message = createBaseEndpoint(); if (object.kind !== undefined && object.kind !== null) { - message.kind = endpoint_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.sequence_number !== undefined && object.sequence_number !== null) { message.sequenceNumber = object.sequence_number; @@ -141,8 +141,8 @@ export const Endpoint = { }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.kind = message.kind; - obj.sequence_number = message.sequenceNumber; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.sequence_number = message.sequenceNumber ?? 0; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resource.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resource.ts index a9ab0ef5ee..5b41690d9f 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resource.ts @@ -142,7 +142,7 @@ export const CPU = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -259,11 +259,11 @@ export const Memory = { }, toAmino(message: Memory): MemoryAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -396,12 +396,12 @@ export const Storage = { }, toAmino(message: Storage): StorageAmino { const obj: any = {}; - obj.name = message.name; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.name = message.name ?? ""; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resourceunits.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resourceunits.ts index d25b492f16..50f5eed058 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resourceunits.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resourceunits.ts @@ -161,12 +161,12 @@ export const ResourceUnits = { if (message.storage) { obj.storage = message.storage.map(e => e ? Storage.toAmino(e) : undefined); } else { - obj.storage = []; + obj.storage = message.storage; } if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/cert.ts b/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/cert.ts index 250955318a..857bcd76c6 100644 --- a/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/cert.ts +++ b/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/cert.ts @@ -217,8 +217,8 @@ export const CertificateID = { }, toAmino(message: CertificateID): CertificateIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.serial = message.serial; + obj.owner = message.owner ?? ""; + obj.serial = message.serial ?? ""; return obj; }, fromAminoMsg(object: CertificateIDAminoMsg): CertificateID { @@ -332,7 +332,7 @@ export const Certificate = { fromAmino(object: CertificateAmino): Certificate { const message = createBaseCertificate(); if (object.state !== undefined && object.state !== null) { - message.state = certificate_StateFromJSON(object.state); + message.state = object.state; } if (object.cert !== undefined && object.cert !== null) { message.cert = bytesFromBase64(object.cert); @@ -344,9 +344,9 @@ export const Certificate = { }, toAmino(message: Certificate): CertificateAmino { const obj: any = {}; - obj.state = message.state; - obj.cert = message.cert ? base64FromBytes(message.cert) : undefined; - obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : undefined; + obj.state = message.state ?? 0; + obj.cert = message.cert ? base64FromBytes(message.cert) : ""; + obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : ""; return obj; }, fromAminoMsg(object: CertificateAminoMsg): Certificate { @@ -472,9 +472,9 @@ export const CertificateFilter = { }, toAmino(message: CertificateFilter): CertificateFilterAmino { const obj: any = {}; - obj.owner = message.owner; - obj.serial = message.serial; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.serial = message.serial ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: CertificateFilterAminoMsg): CertificateFilter { @@ -600,9 +600,9 @@ export const MsgCreateCertificate = { }, toAmino(message: MsgCreateCertificate): MsgCreateCertificateAmino { const obj: any = {}; - obj.owner = message.owner; - obj.cert = message.cert ? base64FromBytes(message.cert) : undefined; - obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : undefined; + obj.owner = message.owner ?? ""; + obj.cert = message.cert ? base64FromBytes(message.cert) : ""; + obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : ""; return obj; }, fromAminoMsg(object: MsgCreateCertificateAminoMsg): MsgCreateCertificate { @@ -769,7 +769,7 @@ export const MsgRevokeCertificate = { }, toAmino(message: MsgRevokeCertificate): MsgRevokeCertificateAmino { const obj: any = {}; - obj.id = message.id ? CertificateID.toAmino(message.id) : undefined; + obj.id = message.id ? CertificateID.toAmino(message.id) : CertificateID.toAmino(CertificateID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgRevokeCertificateAminoMsg): MsgRevokeCertificate { diff --git a/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/genesis.ts index 212362519c..195a8987cf 100644 --- a/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/genesis.ts @@ -113,8 +113,8 @@ export const GenesisCertificate = { }, toAmino(message: GenesisCertificate): GenesisCertificateAmino { const obj: any = {}; - obj.owner = message.owner; - obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined; + obj.owner = message.owner ?? ""; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : Certificate.toAmino(Certificate.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisCertificateAminoMsg): GenesisCertificate { @@ -217,7 +217,7 @@ export const GenesisState = { if (message.certificates) { obj.certificates = message.certificates.map(e => e ? GenesisCertificate.toAmino(e) : undefined); } else { - obj.certificates = []; + obj.certificates = message.certificates; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/query.ts b/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/query.ts index 1392ab89c7..9908e7b4bd 100644 --- a/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/query.ts @@ -130,8 +130,8 @@ export const CertificateResponse = { }, toAmino(message: CertificateResponse): CertificateResponseAmino { const obj: any = {}; - obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined; - obj.serial = message.serial; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : Certificate.toAmino(Certificate.fromPartial({})); + obj.serial = message.serial ?? ""; return obj; }, fromAminoMsg(object: CertificateResponseAminoMsg): CertificateResponse { @@ -361,7 +361,7 @@ export const QueryCertificatesResponse = { if (message.certificates) { obj.certificates = message.certificates.map(e => e ? CertificateResponse.toAmino(e) : undefined); } else { - obj.certificates = []; + obj.certificates = message.certificates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/authz.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/authz.ts index 478b587e04..3559e1b744 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/authz.ts @@ -93,7 +93,7 @@ export const DepositDeploymentAuthorization = { }, toAmino(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAmino { const obj: any = {}; - obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/deployment.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/deployment.ts index bf8c02bf15..940ff40e54 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/deployment.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/deployment.ts @@ -309,14 +309,14 @@ export const MsgCreateDeployment = { }, toAmino(message: MsgCreateDeployment): MsgCreateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment { @@ -499,8 +499,8 @@ export const MsgDepositDeployment = { }, 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.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.amount = message.amount ? Coin.toAmino(message.amount) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment { @@ -705,13 +705,13 @@ export const MsgUpdateDeployment = { }, toAmino(message: MsgUpdateDeployment): MsgUpdateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; + obj.version = message.version ? base64FromBytes(message.version) : ""; return obj; }, fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment { @@ -878,7 +878,7 @@ export const MsgCloseDeployment = { }, toAmino(message: MsgCloseDeployment): MsgCloseDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment { @@ -1061,8 +1061,8 @@ export const DeploymentID = { }, toAmino(message: DeploymentID): DeploymentIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; return obj; }, fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID { @@ -1192,7 +1192,7 @@ export const Deployment = { message.deploymentId = DeploymentID.fromAmino(object.deployment_id); } if (object.state !== undefined && object.state !== null) { - message.state = deployment_StateFromJSON(object.state); + message.state = object.state; } if (object.version !== undefined && object.version !== null) { message.version = bytesFromBase64(object.version); @@ -1204,10 +1204,10 @@ export const Deployment = { }, 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 ? base64FromBytes(message.version) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.state = message.state ?? 0; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: DeploymentAminoMsg): Deployment { @@ -1333,9 +1333,9 @@ export const DeploymentFilters = { }, toAmino(message: DeploymentFilters): DeploymentFiltersAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/genesis.ts index 131e5a7fdc..066e8e409b 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/genesis.ts @@ -123,11 +123,11 @@ export const GenesisDeployment = { }, toAmino(message: GenesisDeployment): GenesisDeploymentAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } return obj; }, @@ -247,9 +247,9 @@ export const GenesisState = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/group.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/group.ts index c2ce5835ee..7468b3dff2 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/group.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/group.ts @@ -254,7 +254,7 @@ export const MsgCloseGroup = { }, toAmino(message: MsgCloseGroup): MsgCloseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup { @@ -421,7 +421,7 @@ export const MsgPauseGroup = { }, toAmino(message: MsgPauseGroup): MsgPauseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup { @@ -588,7 +588,7 @@ export const MsgStartGroup = { }, toAmino(message: MsgStartGroup): MsgStartGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup { @@ -787,9 +787,9 @@ export const GroupID = { }, toAmino(message: GroupID): GroupIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.gseq = message.gseq; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; return obj; }, fromAminoMsg(object: GroupIDAminoMsg): GroupID { @@ -921,12 +921,12 @@ export const GroupSpec = { }, toAmino(message: GroupSpec): GroupSpecAmino { const obj: any = {}; - obj.name = message.name; - obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : undefined; + obj.name = message.name ?? ""; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : PlacementRequirements.toAmino(PlacementRequirements.fromPartial({})); if (message.resources) { obj.resources = message.resources.map(e => e ? Resource.toAmino(e) : undefined); } else { - obj.resources = []; + obj.resources = message.resources; } return obj; }, @@ -1057,7 +1057,7 @@ export const Group = { message.groupId = GroupID.fromAmino(object.group_id); } if (object.state !== undefined && object.state !== null) { - message.state = group_StateFromJSON(object.state); + message.state = object.state; } if (object.group_spec !== undefined && object.group_spec !== null) { message.groupSpec = GroupSpec.fromAmino(object.group_spec); @@ -1069,10 +1069,10 @@ export const Group = { }, 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; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId) : GroupID.toAmino(GroupID.fromPartial({})); + obj.state = message.state ?? 0; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: GroupAminoMsg): Group { @@ -1198,9 +1198,9 @@ export const Resource = { }, 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; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources) : ResourceUnits.toAmino(ResourceUnits.fromPartial({})); + obj.count = message.count ?? 0; + obj.price = message.price ? Coin.toAmino(message.price) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ResourceAminoMsg): Resource { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/params.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/params.ts index f73b7ec130..c9b28304ca 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/params.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/params.ts @@ -83,7 +83,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/query.ts index 7670915a11..b10eaf1a91 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/query.ts @@ -291,7 +291,7 @@ export const QueryDeploymentsResponse = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -519,11 +519,11 @@ export const QueryDeploymentResponse = { }, toAmino(message: QueryDeploymentResponse): QueryDeploymentResponseAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/authz.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/authz.ts index cf9918c322..af82c5c9c4 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/authz.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/authz.ts @@ -93,7 +93,7 @@ export const DepositDeploymentAuthorization = { }, toAmino(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAmino { const obj: any = {}; - obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deployment.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deployment.ts index b4d06796cf..6527471172 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deployment.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deployment.ts @@ -175,8 +175,8 @@ export const DeploymentID = { }, toAmino(message: DeploymentID): DeploymentIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; return obj; }, fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID { @@ -306,7 +306,7 @@ export const Deployment = { message.deploymentId = DeploymentID.fromAmino(object.deployment_id); } if (object.state !== undefined && object.state !== null) { - message.state = deployment_StateFromJSON(object.state); + message.state = object.state; } if (object.version !== undefined && object.version !== null) { message.version = bytesFromBase64(object.version); @@ -318,10 +318,10 @@ export const Deployment = { }, 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 ? base64FromBytes(message.version) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.state = message.state ?? 0; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: DeploymentAminoMsg): Deployment { @@ -447,9 +447,9 @@ export const DeploymentFilters = { }, toAmino(message: DeploymentFilters): DeploymentFiltersAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deploymentmsg.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deploymentmsg.ts index 655ea1d188..2628ed0754 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deploymentmsg.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deploymentmsg.ts @@ -239,15 +239,15 @@ export const MsgCreateDeployment = { }, toAmino(message: MsgCreateDeployment): MsgCreateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined; - obj.depositor = message.depositor; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); + obj.depositor = message.depositor ?? ""; return obj; }, fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment { @@ -446,9 +446,9 @@ export const MsgDepositDeployment = { }, 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; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.amount = message.amount ? Coin.toAmino(message.amount) : Coin.toAmino(Coin.fromPartial({})); + obj.depositor = message.depositor ?? ""; return obj; }, fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment { @@ -631,8 +631,8 @@ export const MsgUpdateDeployment = { }, toAmino(message: MsgUpdateDeployment): MsgUpdateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; - obj.version = message.version ? base64FromBytes(message.version) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.version = message.version ? base64FromBytes(message.version) : ""; return obj; }, fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment { @@ -799,7 +799,7 @@ export const MsgCloseDeployment = { }, toAmino(message: MsgCloseDeployment): MsgCloseDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/genesis.ts index de6bc5c7e6..81683d56f5 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/genesis.ts @@ -123,11 +123,11 @@ export const GenesisDeployment = { }, toAmino(message: GenesisDeployment): GenesisDeploymentAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } return obj; }, @@ -247,9 +247,9 @@ export const GenesisState = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/group.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/group.ts index 10c7931921..eac0bd777b 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/group.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/group.ts @@ -181,7 +181,7 @@ export const Group = { message.groupId = GroupID.fromAmino(object.group_id); } if (object.state !== undefined && object.state !== null) { - message.state = group_StateFromJSON(object.state); + message.state = object.state; } if (object.group_spec !== undefined && object.group_spec !== null) { message.groupSpec = GroupSpec.fromAmino(object.group_spec); @@ -193,10 +193,10 @@ export const Group = { }, 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; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId) : GroupID.toAmino(GroupID.fromPartial({})); + obj.state = message.state ?? 0; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: GroupAminoMsg): Group { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupid.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupid.ts index 71a788dcf8..fd457a41ef 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupid.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupid.ts @@ -118,9 +118,9 @@ export const GroupID = { }, toAmino(message: GroupID): GroupIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.gseq = message.gseq; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; return obj; }, fromAminoMsg(object: GroupIDAminoMsg): GroupID { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupmsg.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupmsg.ts index d21048cbc6..7cb6bd0e2b 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupmsg.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupmsg.ts @@ -131,7 +131,7 @@ export const MsgCloseGroup = { }, toAmino(message: MsgCloseGroup): MsgCloseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup { @@ -298,7 +298,7 @@ export const MsgPauseGroup = { }, toAmino(message: MsgPauseGroup): MsgPauseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup { @@ -465,7 +465,7 @@ export const MsgStartGroup = { }, toAmino(message: MsgStartGroup): MsgStartGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupspec.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupspec.ts index bb14fc045a..82b174d5d3 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupspec.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupspec.ts @@ -126,12 +126,12 @@ export const GroupSpec = { }, toAmino(message: GroupSpec): GroupSpecAmino { const obj: any = {}; - obj.name = message.name; - obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : undefined; + obj.name = message.name ?? ""; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : PlacementRequirements.toAmino(PlacementRequirements.fromPartial({})); if (message.resources) { obj.resources = message.resources.map(e => e ? Resource.toAmino(e) : undefined); } else { - obj.resources = []; + obj.resources = message.resources; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/params.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/params.ts index 002d051ea0..205cb61597 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/params.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/params.ts @@ -83,7 +83,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/query.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/query.ts index 95a6e4a95e..ec7efeaff6 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/query.ts @@ -291,7 +291,7 @@ export const QueryDeploymentsResponse = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -519,11 +519,11 @@ export const QueryDeploymentResponse = { }, toAmino(message: QueryDeploymentResponse): QueryDeploymentResponseAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/resource.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/resource.ts index c94bd89c88..68882c0e85 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/resource.ts @@ -120,9 +120,9 @@ export const Resource = { }, 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; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources) : ResourceUnits.toAmino(ResourceUnits.fromPartial({})); + obj.count = message.count ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); return obj; }, fromAminoMsg(object: ResourceAminoMsg): Resource { diff --git a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/genesis.ts index 2139e1f100..38a1b97539 100644 --- a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/genesis.ts @@ -116,12 +116,12 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } if (message.payments) { obj.payments = message.payments.map(e => e ? Payment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/query.ts index c5e8418c5e..aaf8022b3c 100644 --- a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/query.ts @@ -206,10 +206,10 @@ export const QueryAccountsRequest = { }, toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; - obj.owner = message.owner; - obj.state = message.state; + obj.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -329,7 +329,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -505,11 +505,11 @@ export const QueryPaymentsRequest = { }, 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.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -629,7 +629,7 @@ export const QueryPaymentsResponse = { if (message.payments) { obj.payments = message.payments.map(e => e ? Payment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/types.ts b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/types.ts index 69d39c3c57..86bee0581b 100644 --- a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/types.ts +++ b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/types.ts @@ -249,8 +249,8 @@ export const AccountID = { }, toAmino(message: AccountID): AccountIDAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; + obj.scope = message.scope ?? ""; + obj.xid = message.xid ?? ""; return obj; }, fromAminoMsg(object: AccountIDAminoMsg): AccountID { @@ -409,7 +409,7 @@ export const Account = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = account_StateFromJSON(object.state); + message.state = object.state; } if (object.balance !== undefined && object.balance !== null) { message.balance = Coin.fromAmino(object.balance); @@ -424,12 +424,12 @@ export const Account = { }, 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; + obj.id = message.id ? AccountID.toAmino(message.id) : AccountID.toAmino(AccountID.fromPartial({})); + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.balance = message.balance ? Coin.toAmino(message.balance) : Coin.toAmino(Coin.fromPartial({})); + obj.transferred = message.transferred ? Coin.toAmino(message.transferred) : Coin.toAmino(Coin.fromPartial({})); + obj.settled_at = message.settledAt ? message.settledAt.toString() : "0"; return obj; }, fromAminoMsg(object: AccountAminoMsg): Account { @@ -604,7 +604,7 @@ export const Payment = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = payment_StateFromJSON(object.state); + message.state = object.state; } if (object.rate !== undefined && object.rate !== null) { message.rate = Coin.fromAmino(object.rate); @@ -619,13 +619,13 @@ export const Payment = { }, 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; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId) : AccountID.toAmino(AccountID.fromPartial({})); + obj.payment_id = message.paymentId ?? ""; + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.rate = message.rate ? Coin.toAmino(message.rate) : Coin.toAmino(Coin.fromPartial({})); + obj.balance = message.balance ? Coin.toAmino(message.balance) : Coin.toAmino(Coin.fromPartial({})); + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: PaymentAminoMsg): Payment { diff --git a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/genesis.ts index 9966056a31..424a9090f7 100644 --- a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/genesis.ts @@ -116,12 +116,12 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } if (message.payments) { obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/query.ts b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/query.ts index 7cec099483..f1e15c34e3 100644 --- a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/query.ts @@ -206,10 +206,10 @@ export const QueryAccountsRequest = { }, toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; - obj.owner = message.owner; - obj.state = message.state; + obj.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -329,7 +329,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -505,11 +505,11 @@ export const QueryPaymentsRequest = { }, 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.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -629,7 +629,7 @@ export const QueryPaymentsResponse = { if (message.payments) { obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/types.ts b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/types.ts index 6fe0f6b412..387ff89a2d 100644 --- a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/types.ts +++ b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/types.ts @@ -262,8 +262,8 @@ export const AccountID = { }, toAmino(message: AccountID): AccountIDAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; + obj.scope = message.scope ?? ""; + obj.xid = message.xid ?? ""; return obj; }, fromAminoMsg(object: AccountIDAminoMsg): AccountID { @@ -448,7 +448,7 @@ export const Account = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = account_StateFromJSON(object.state); + message.state = object.state; } if (object.balance !== undefined && object.balance !== null) { message.balance = DecCoin.fromAmino(object.balance); @@ -469,14 +469,14 @@ export const Account = { }, 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; + obj.id = message.id ? AccountID.toAmino(message.id) : AccountID.toAmino(AccountID.fromPartial({})); + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.balance = message.balance ? DecCoin.toAmino(message.balance) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.transferred = message.transferred ? DecCoin.toAmino(message.transferred) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.settled_at = message.settledAt ? message.settledAt.toString() : "0"; + obj.depositor = message.depositor ?? ""; + obj.funds = message.funds ? DecCoin.toAmino(message.funds) : DecCoin.toAmino(DecCoin.fromPartial({})); return obj; }, fromAminoMsg(object: AccountAminoMsg): Account { @@ -651,7 +651,7 @@ export const FractionalPayment = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = fractionalPayment_StateFromJSON(object.state); + message.state = object.state; } if (object.rate !== undefined && object.rate !== null) { message.rate = DecCoin.fromAmino(object.rate); @@ -666,13 +666,13 @@ export const FractionalPayment = { }, 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; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId) : AccountID.toAmino(AccountID.fromPartial({})); + obj.payment_id = message.paymentId ?? ""; + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.rate = message.rate ? DecCoin.toAmino(message.rate) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.balance = message.balance ? DecCoin.toAmino(message.balance) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: FractionalPaymentAminoMsg): FractionalPayment { diff --git a/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/genesis.ts index 717ec30d0e..c783bcf04c 100644 --- a/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/genesis.ts @@ -83,7 +83,7 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/params.ts b/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/params.ts index 183ef35824..a54259dd14 100644 --- a/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/params.ts +++ b/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/params.ts @@ -128,9 +128,9 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.inflation_decay_factor = message.inflationDecayFactor; - obj.initial_inflation = message.initialInflation; - obj.variance = message.variance; + obj.inflation_decay_factor = message.inflationDecayFactor ?? ""; + obj.initial_inflation = message.initialInflation ?? ""; + obj.variance = message.variance ?? ""; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/bid.ts b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/bid.ts index 5fac9751de..51429f4e41 100644 --- a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/bid.ts +++ b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/bid.ts @@ -287,10 +287,10 @@ export const MsgCreateBid = { }, 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; + obj.order = message.order ? OrderID.toAmino(message.order) : OrderID.toAmino(OrderID.fromPartial({})); + obj.provider = message.provider ?? ""; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateBidAminoMsg): MsgCreateBid { @@ -457,7 +457,7 @@ export const MsgCloseBid = { }, toAmino(message: MsgCloseBid): MsgCloseBidAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseBidAminoMsg): MsgCloseBid { @@ -688,11 +688,11 @@ export const BidID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; return obj; }, fromAminoMsg(object: BidIDAminoMsg): BidID { @@ -822,7 +822,7 @@ export const Bid = { message.bidId = BidID.fromAmino(object.bid_id); } if (object.state !== undefined && object.state !== null) { - message.state = bid_StateFromJSON(object.state); + message.state = object.state; } if (object.price !== undefined && object.price !== null) { message.price = DecCoin.fromAmino(object.price); @@ -834,10 +834,10 @@ export const Bid = { }, 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; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); + obj.state = message.state ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: BidAminoMsg): Bid { @@ -1011,12 +1011,12 @@ export const BidFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: BidFiltersAminoMsg): BidFilters { diff --git a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/genesis.ts index 8783bb2a27..238f4ffc8c 100644 --- a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/genesis.ts @@ -136,14 +136,14 @@ export const GenesisState = { if (message.orders) { obj.orders = message.orders.map(e => e ? Order.toAmino(e) : undefined); } else { - obj.orders = []; + obj.orders = message.orders; } if (message.leases) { obj.leases = message.leases.map(e => e ? Lease.toAmino(e) : undefined); } else { - obj.leases = []; + obj.leases = message.leases; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/lease.ts b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/lease.ts index cf021e329f..13a4261809 100644 --- a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/lease.ts +++ b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/lease.ts @@ -306,11 +306,11 @@ export const LeaseID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; return obj; }, fromAminoMsg(object: LeaseIDAminoMsg): LeaseID { @@ -453,7 +453,7 @@ export const Lease = { message.leaseId = LeaseID.fromAmino(object.lease_id); } if (object.state !== undefined && object.state !== null) { - message.state = lease_StateFromJSON(object.state); + message.state = object.state; } if (object.price !== undefined && object.price !== null) { message.price = DecCoin.fromAmino(object.price); @@ -468,11 +468,11 @@ export const Lease = { }, 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; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : LeaseID.toAmino(LeaseID.fromPartial({})); + obj.state = message.state ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; + obj.closed_on = message.closedOn !== BigInt(0) ? message.closedOn.toString() : undefined; return obj; }, fromAminoMsg(object: LeaseAminoMsg): Lease { @@ -646,12 +646,12 @@ export const LeaseFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: LeaseFiltersAminoMsg): LeaseFilters { @@ -745,7 +745,7 @@ export const MsgCreateLease = { }, toAmino(message: MsgCreateLease): MsgCreateLeaseAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateLeaseAminoMsg): MsgCreateLease { @@ -912,7 +912,7 @@ export const MsgWithdrawLease = { }, toAmino(message: MsgWithdrawLease): MsgWithdrawLeaseAmino { const obj: any = {}; - obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId) : LeaseID.toAmino(LeaseID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgWithdrawLeaseAminoMsg): MsgWithdrawLease { @@ -1079,7 +1079,7 @@ export const MsgCloseLease = { }, toAmino(message: MsgCloseLease): MsgCloseLeaseAmino { const obj: any = {}; - obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : undefined; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : LeaseID.toAmino(LeaseID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseLeaseAminoMsg): MsgCloseLease { diff --git a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/order.ts b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/order.ts index c4573d2938..e4cb15d7e3 100644 --- a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/order.ts +++ b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/order.ts @@ -223,10 +223,10 @@ export const OrderID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; return obj; }, fromAminoMsg(object: OrderIDAminoMsg): OrderID { @@ -356,7 +356,7 @@ export const Order = { message.orderId = OrderID.fromAmino(object.order_id); } if (object.state !== undefined && object.state !== null) { - message.state = order_StateFromJSON(object.state); + message.state = object.state; } if (object.spec !== undefined && object.spec !== null) { message.spec = GroupSpec.fromAmino(object.spec); @@ -368,10 +368,10 @@ export const Order = { }, 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; + obj.order_id = message.orderId ? OrderID.toAmino(message.orderId) : OrderID.toAmino(OrderID.fromPartial({})); + obj.state = message.state ?? 0; + obj.spec = message.spec ? GroupSpec.toAmino(message.spec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: OrderAminoMsg): Order { @@ -529,11 +529,11 @@ export const OrderFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: OrderFiltersAminoMsg): OrderFilters { diff --git a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/params.ts b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/params.ts index fe08d612a3..9f336ccde1 100644 --- a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/params.ts +++ b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/params.ts @@ -101,8 +101,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit) : undefined; - obj.order_max_bids = message.orderMaxBids; + obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit) : Coin.toAmino(Coin.fromPartial({})); + obj.order_max_bids = message.orderMaxBids ?? 0; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/query.ts b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/query.ts index ee55c69319..1d2312f1e6 100644 --- a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/query.ts @@ -371,7 +371,7 @@ export const QueryOrdersResponse = { if (message.orders) { obj.orders = message.orders.map(e => e ? Order.toAmino(e) : undefined); } else { - obj.orders = []; + obj.orders = message.orders; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -791,7 +791,7 @@ export const QueryBidsResponse = { if (message.bids) { obj.bids = message.bids.map(e => e ? QueryBidResponse.toAmino(e) : undefined); } else { - obj.bids = []; + obj.bids = message.bids; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1228,7 +1228,7 @@ export const QueryLeasesResponse = { if (message.leases) { obj.leases = message.leases.map(e => e ? QueryLeaseResponse.toAmino(e) : undefined); } else { - obj.leases = []; + obj.leases = message.leases; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta1/provider.ts b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta1/provider.ts index 2e5804f24d..571d017d5f 100644 --- a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta1/provider.ts +++ b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta1/provider.ts @@ -191,8 +191,8 @@ export const ProviderInfo = { }, toAmino(message: ProviderInfo): ProviderInfoAmino { const obj: any = {}; - obj.email = message.email; - obj.website = message.website; + obj.email = message.email ?? ""; + obj.website = message.website ?? ""; return obj; }, fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo { @@ -340,14 +340,14 @@ export const MsgCreateProvider = { }, toAmino(message: MsgCreateProvider): MsgCreateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider { @@ -568,14 +568,14 @@ export const MsgUpdateProvider = { }, toAmino(message: MsgUpdateProvider): MsgUpdateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider { @@ -742,7 +742,7 @@ export const MsgDeleteProvider = { }, toAmino(message: MsgDeleteProvider): MsgDeleteProviderAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner ?? ""; return obj; }, fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider { @@ -963,14 +963,14 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: ProviderAminoMsg): Provider { diff --git a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/genesis.ts index 7506e24013..68c52ba5d5 100644 --- a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/provider.ts b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/provider.ts index c1a7b90a9c..113e5c3a21 100644 --- a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/provider.ts +++ b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/provider.ts @@ -191,8 +191,8 @@ export const ProviderInfo = { }, toAmino(message: ProviderInfo): ProviderInfoAmino { const obj: any = {}; - obj.email = message.email; - obj.website = message.website; + obj.email = message.email ?? ""; + obj.website = message.website ?? ""; return obj; }, fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo { @@ -340,14 +340,14 @@ export const MsgCreateProvider = { }, toAmino(message: MsgCreateProvider): MsgCreateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider { @@ -568,14 +568,14 @@ export const MsgUpdateProvider = { }, toAmino(message: MsgUpdateProvider): MsgUpdateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider { @@ -742,7 +742,7 @@ export const MsgDeleteProvider = { }, toAmino(message: MsgDeleteProvider): MsgDeleteProviderAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner ?? ""; return obj; }, fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider { @@ -963,14 +963,14 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: ProviderAminoMsg): Provider { diff --git a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/query.ts b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/query.ts index db1fa51da3..14ff7180dc 100644 --- a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/query.ts @@ -241,7 +241,7 @@ export const QueryProvidersResponse = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -337,7 +337,7 @@ export const QueryProviderRequest = { }, toAmino(message: QueryProviderRequest): QueryProviderRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest { diff --git a/__fixtures__/v-next/outputosmojs/capability/v1/capability.ts b/__fixtures__/v-next/outputosmojs/capability/v1/capability.ts index 952db83385..82e57bc128 100644 --- a/__fixtures__/v-next/outputosmojs/capability/v1/capability.ts +++ b/__fixtures__/v-next/outputosmojs/capability/v1/capability.ts @@ -126,7 +126,7 @@ export const Capability = { }, toAmino(message: Capability): CapabilityAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; return obj; }, fromAminoMsg(object: CapabilityAminoMsg): Capability { @@ -230,8 +230,8 @@ export const Owner = { }, toAmino(message: Owner): OwnerAmino { const obj: any = {}; - obj.module = message.module; - obj.name = message.name; + obj.module = message.module === "" ? undefined : message.module; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: OwnerAminoMsg): Owner { @@ -328,7 +328,7 @@ export const CapabilityOwners = { if (message.owners) { obj.owners = message.owners.map(e => e ? Owner.toAmino(e) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/capability/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/capability/v1/genesis.ts index 3436536c8d..38c7e1de99 100644 --- a/__fixtures__/v-next/outputosmojs/capability/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/capability/v1/genesis.ts @@ -122,8 +122,8 @@ export const GenesisOwners = { }, toAmino(message: GenesisOwners): GenesisOwnersAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; - obj.index_owners = message.indexOwners ? CapabilityOwners.toAmino(message.indexOwners) : CapabilityOwners.fromPartial({}); + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; + obj.index_owners = message.indexOwners ? CapabilityOwners.toAmino(message.indexOwners) : CapabilityOwners.toAmino(CapabilityOwners.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisOwnersAminoMsg): GenesisOwners { @@ -233,11 +233,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; if (message.owners) { obj.owners = message.owners.map(e => e ? GenesisOwners.toAmino(e) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/confio/proofs.ts b/__fixtures__/v-next/outputosmojs/confio/proofs.ts index bbd95ebbf5..9924a42c98 100644 --- a/__fixtures__/v-next/outputosmojs/confio/proofs.ts +++ b/__fixtures__/v-next/outputosmojs/confio/proofs.ts @@ -655,7 +655,7 @@ export const ExistenceProof = { if (message.path) { obj.path = message.path.map(e => e ? InnerOp.toAmino(e) : undefined); } else { - obj.path = []; + obj.path = message.path; } return obj; }, @@ -1051,16 +1051,16 @@ export const LeafOp = { fromAmino(object: LeafOpAmino): LeafOp { const message = createBaseLeafOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prehash_key !== undefined && object.prehash_key !== null) { - message.prehashKey = hashOpFromJSON(object.prehash_key); + message.prehashKey = object.prehash_key; } if (object.prehash_value !== undefined && object.prehash_value !== null) { - message.prehashValue = hashOpFromJSON(object.prehash_value); + message.prehashValue = object.prehash_value; } if (object.length !== undefined && object.length !== null) { - message.length = lengthOpFromJSON(object.length); + message.length = object.length; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1069,10 +1069,10 @@ export const LeafOp = { }, 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.hash = message.hash === 0 ? undefined : message.hash; + obj.prehash_key = message.prehashKey === 0 ? undefined : message.prehashKey; + obj.prehash_value = message.prehashValue === 0 ? undefined : message.prehashValue; + obj.length = message.length === 0 ? undefined : message.length; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; }, @@ -1181,7 +1181,7 @@ export const InnerOp = { fromAmino(object: InnerOpAmino): InnerOp { const message = createBaseInnerOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1193,7 +1193,7 @@ export const InnerOp = { }, toAmino(message: InnerOp): InnerOpAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; obj.suffix = message.suffix ? base64FromBytes(message.suffix) : undefined; return obj; @@ -1333,8 +1333,8 @@ export const ProofSpec = { 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; + obj.max_depth = message.maxDepth === 0 ? undefined : message.maxDepth; + obj.min_depth = message.minDepth === 0 ? undefined : message.minDepth; return obj; }, fromAminoMsg(object: ProofSpecAminoMsg): ProofSpec { @@ -1511,7 +1511,7 @@ export const InnerSpec = { message.emptyChild = bytesFromBase64(object.empty_child); } if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } return message; }, @@ -1520,13 +1520,13 @@ export const InnerSpec = { if (message.childOrder) { obj.child_order = message.childOrder.map(e => e); } else { - obj.child_order = []; + obj.child_order = message.childOrder; } - obj.child_size = message.childSize; - obj.min_prefix_length = message.minPrefixLength; - obj.max_prefix_length = message.maxPrefixLength; + obj.child_size = message.childSize === 0 ? undefined : message.childSize; + obj.min_prefix_length = message.minPrefixLength === 0 ? undefined : message.minPrefixLength; + obj.max_prefix_length = message.maxPrefixLength === 0 ? undefined : message.maxPrefixLength; obj.empty_child = message.emptyChild ? base64FromBytes(message.emptyChild) : undefined; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; return obj; }, fromAminoMsg(object: InnerSpecAminoMsg): InnerSpec { @@ -1623,7 +1623,7 @@ export const BatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? BatchEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1848,12 +1848,12 @@ export const CompressedBatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? CompressedBatchEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.lookupInners) { obj.lookup_inners = message.lookupInners.map(e => e ? InnerOp.toAmino(e) : undefined); } else { - obj.lookup_inners = []; + obj.lookup_inners = message.lookupInners; } return obj; }, @@ -2116,7 +2116,7 @@ export const CompressedExistenceProof = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/config.ts b/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/config.ts index 33d497f9e1..6e2f98ed3a 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/config.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/config.ts @@ -139,7 +139,7 @@ export const Config = { if (message.modules) { obj.modules = message.modules.map(e => e ? ModuleConfig.toAmino(e) : undefined); } else { - obj.modules = []; + obj.modules = message.modules; } return obj; }, @@ -250,7 +250,7 @@ export const ModuleConfig = { }, toAmino(message: ModuleConfig): ModuleConfigAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.config = message.config ? Any.toAmino(message.config) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/module.ts b/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/module.ts index 8ef45b2b07..f6c47f871c 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/module.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/module.ts @@ -226,16 +226,16 @@ export const ModuleDescriptor = { }, toAmino(message: ModuleDescriptor): ModuleDescriptorAmino { const obj: any = {}; - obj.go_import = message.goImport; + obj.go_import = message.goImport === "" ? undefined : message.goImport; if (message.usePackage) { obj.use_package = message.usePackage.map(e => e ? PackageReference.toAmino(e) : undefined); } else { - obj.use_package = []; + obj.use_package = message.usePackage; } if (message.canMigrateFrom) { obj.can_migrate_from = message.canMigrateFrom.map(e => e ? MigrateFromInfo.toAmino(e) : undefined); } else { - obj.can_migrate_from = []; + obj.can_migrate_from = message.canMigrateFrom; } return obj; }, @@ -346,8 +346,8 @@ export const PackageReference = { }, toAmino(message: PackageReference): PackageReferenceAmino { const obj: any = {}; - obj.name = message.name; - obj.revision = message.revision; + obj.name = message.name === "" ? undefined : message.name; + obj.revision = message.revision === 0 ? undefined : message.revision; return obj; }, fromAminoMsg(object: PackageReferenceAminoMsg): PackageReference { @@ -441,7 +441,7 @@ export const MigrateFromInfo = { }, toAmino(message: MigrateFromInfo): MigrateFromInfoAmino { const obj: any = {}; - obj.module = message.module; + obj.module = message.module === "" ? undefined : message.module; return obj; }, fromAminoMsg(object: MigrateFromInfoAminoMsg): MigrateFromInfo { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/auth.ts b/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/auth.ts index 439e6904d4..096e1ad34f 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/auth.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/auth.ts @@ -181,10 +181,10 @@ export const BaseAccount = { }, toAmino(message: BaseAccount): BaseAccountAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : 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; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: BaseAccountAminoMsg): BaseAccount { @@ -317,11 +317,11 @@ export const ModuleAccount = { toAmino(message: ModuleAccount): ModuleAccountAmino { const obj: any = {}; obj.base_account = message.baseAccount ? BaseAccount.toAmino(message.baseAccount) : undefined; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.permissions) { obj.permissions = message.permissions.map(e => e); } else { - obj.permissions = []; + obj.permissions = message.permissions; } return obj; }, @@ -480,11 +480,11 @@ export const Params = { }, 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; + obj.max_memo_characters = message.maxMemoCharacters !== BigInt(0) ? message.maxMemoCharacters.toString() : undefined; + obj.tx_sig_limit = message.txSigLimit !== BigInt(0) ? message.txSigLimit.toString() : undefined; + obj.tx_size_cost_per_byte = message.txSizeCostPerByte !== BigInt(0) ? message.txSizeCostPerByte.toString() : undefined; + obj.sig_verify_cost_ed25519 = message.sigVerifyCostEd25519 !== BigInt(0) ? message.sigVerifyCostEd25519.toString() : undefined; + obj.sig_verify_cost_secp256k1 = message.sigVerifyCostSecp256k1 !== BigInt(0) ? message.sigVerifyCostSecp256k1.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/genesis.ts index 4a1998cde7..3ee09b328c 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/genesis.ts @@ -114,7 +114,7 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/query.ts index c5b281ae76..b1b803f9ef 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/query.ts @@ -372,7 +372,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -468,7 +468,7 @@ export const QueryAccountRequest = { }, toAmino(message: QueryAccountRequest): QueryAccountRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryAccountRequestAminoMsg): QueryAccountRequest { @@ -905,7 +905,7 @@ export const QueryModuleAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } return obj; }, @@ -1073,7 +1073,7 @@ export const Bech32PrefixResponse = { }, toAmino(message: Bech32PrefixResponse): Bech32PrefixResponseAmino { const obj: any = {}; - obj.bech32_prefix = message.bech32Prefix; + obj.bech32_prefix = message.bech32Prefix === "" ? undefined : message.bech32Prefix; return obj; }, fromAminoMsg(object: Bech32PrefixResponseAminoMsg): Bech32PrefixResponse { @@ -1261,7 +1261,7 @@ export const AddressBytesToStringResponse = { }, toAmino(message: AddressBytesToStringResponse): AddressBytesToStringResponseAmino { const obj: any = {}; - obj.address_string = message.addressString; + obj.address_string = message.addressString === "" ? undefined : message.addressString; return obj; }, fromAminoMsg(object: AddressBytesToStringResponseAminoMsg): AddressBytesToStringResponse { @@ -1355,7 +1355,7 @@ export const AddressStringToBytesRequest = { }, toAmino(message: AddressStringToBytesRequest): AddressStringToBytesRequestAmino { const obj: any = {}; - obj.address_string = message.addressString; + obj.address_string = message.addressString === "" ? undefined : message.addressString; return obj; }, fromAminoMsg(object: AddressStringToBytesRequestAminoMsg): AddressStringToBytesRequest { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/authz.ts b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/authz.ts index dd1370ff3d..535deadad2 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/authz.ts @@ -153,7 +153,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { @@ -406,8 +406,8 @@ export const GrantAuthorization = { }, toAmino(message: GrantAuthorization): GrantAuthorizationAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.authorization = message.authorization ? Any.toAmino(message.authorization) : undefined; obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -512,7 +512,7 @@ export const GrantQueueItem = { if (message.msgTypeUrls) { obj.msg_type_urls = message.msgTypeUrls.map(e => e); } else { - obj.msg_type_urls = []; + obj.msg_type_urls = message.msgTypeUrls; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/genesis.ts index 439e82bf78..f7aedb368f 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.authorization) { obj.authorization = message.authorization.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.authorization = []; + obj.authorization = message.authorization; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/query.ts index 215c2021f1..92a2bd8404 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/query.ts @@ -218,9 +218,9 @@ export const QueryGrantsRequest = { }, toAmino(message: QueryGrantsRequest): QueryGrantsRequestAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -340,7 +340,7 @@ export const QueryGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -452,7 +452,7 @@ export const QueryGranterGrantsRequest = { }, toAmino(message: QueryGranterGrantsRequest): QueryGranterGrantsRequestAmino { const obj: any = {}; - obj.granter = message.granter; + obj.granter = message.granter === "" ? undefined : message.granter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -572,7 +572,7 @@ export const QueryGranterGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -684,7 +684,7 @@ export const QueryGranteeGrantsRequest = { }, toAmino(message: QueryGranteeGrantsRequest): QueryGranteeGrantsRequestAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -804,7 +804,7 @@ export const QueryGranteeGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/tx.ts index db7fa337ae..f2d95e1479 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/tx.ts @@ -203,8 +203,8 @@ export const MsgGrant = { }, toAmino(message: MsgGrant): MsgGrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.grant = message.grant ? Grant.toAmino(message.grant) : undefined; return obj; }, @@ -308,7 +308,7 @@ export const MsgExecResponse = { if (message.results) { obj.results = message.results.map(e => base64FromBytes(e)); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -425,11 +425,11 @@ export const MsgExec = { }, toAmino(message: MsgExec): MsgExecAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -629,9 +629,9 @@ export const MsgRevoke = { }, toAmino(message: MsgRevoke): MsgRevokeAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromAminoMsg(object: MsgRevokeAminoMsg): MsgRevoke { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/authz.ts b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/authz.ts index 0add015538..22794060dd 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/authz.ts @@ -102,7 +102,7 @@ export const SendAuthorization = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/bank.ts b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/bank.ts index a08195539f..b92b3f0cd5 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/bank.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/bank.ts @@ -271,9 +271,9 @@ export const Params = { if (message.sendEnabled) { obj.send_enabled = message.sendEnabled.map(e => e ? SendEnabled.toAmino(e) : undefined); } else { - obj.send_enabled = []; + obj.send_enabled = message.sendEnabled; } - obj.default_send_enabled = message.defaultSendEnabled; + obj.default_send_enabled = message.defaultSendEnabled === false ? undefined : message.defaultSendEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -383,8 +383,8 @@ export const SendEnabled = { }, toAmino(message: SendEnabled): SendEnabledAmino { const obj: any = {}; - obj.denom = message.denom; - obj.enabled = message.enabled; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.enabled = message.enabled === false ? undefined : message.enabled; return obj; }, fromAminoMsg(object: SendEnabledAminoMsg): SendEnabled { @@ -500,11 +500,11 @@ export const Input = { }, toAmino(message: Input): InputAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -621,11 +621,11 @@ export const Output = { }, toAmino(message: Output): OutputAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -729,7 +729,7 @@ export const Supply = { if (message.total) { obj.total = message.total.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total = []; + obj.total = message.total; } return obj; }, @@ -862,12 +862,12 @@ export const DenomUnit = { }, toAmino(message: DenomUnit): DenomUnitAmino { const obj: any = {}; - obj.denom = message.denom; - obj.exponent = message.exponent; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.exponent = message.exponent === 0 ? undefined : message.exponent; if (message.aliases) { obj.aliases = message.aliases.map(e => e); } else { - obj.aliases = []; + obj.aliases = message.aliases; } return obj; }, @@ -1080,18 +1080,18 @@ export const Metadata = { }, toAmino(message: Metadata): MetadataAmino { const obj: any = {}; - obj.description = message.description; + obj.description = message.description === "" ? undefined : message.description; if (message.denomUnits) { obj.denom_units = message.denomUnits.map(e => e ? DenomUnit.toAmino(e) : undefined); } else { - obj.denom_units = []; + obj.denom_units = message.denomUnits; } - 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; + obj.base = message.base === "" ? undefined : message.base; + obj.display = message.display === "" ? undefined : message.display; + obj.name = message.name === "" ? undefined : message.name; + obj.symbol = message.symbol === "" ? undefined : message.symbol; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; return obj; }, fromAminoMsg(object: MetadataAminoMsg): Metadata { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/genesis.ts index faded1c8e3..31d97ef473 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/genesis.ts @@ -189,17 +189,17 @@ export const GenesisState = { if (message.balances) { obj.balances = message.balances.map(e => e ? Balance.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } if (message.supply) { obj.supply = message.supply.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.supply = []; + obj.supply = message.supply; } if (message.denomMetadata) { obj.denom_metadata = message.denomMetadata.map(e => e ? Metadata.toAmino(e) : undefined); } else { - obj.denom_metadata = []; + obj.denom_metadata = message.denomMetadata; } return obj; }, @@ -316,11 +316,11 @@ export const Balance = { }, toAmino(message: Balance): BalanceAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/query.ts index 4627a656b4..caf3f19930 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/query.ts @@ -425,8 +425,8 @@ export const QueryBalanceRequest = { }, toAmino(message: QueryBalanceRequest): QueryBalanceRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.denom = message.denom; + obj.address = message.address === "" ? undefined : message.address; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest { @@ -630,7 +630,7 @@ export const QueryAllBalancesRequest = { }, toAmino(message: QueryAllBalancesRequest): QueryAllBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -750,7 +750,7 @@ export const QueryAllBalancesResponse = { if (message.balances) { obj.balances = message.balances.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -862,7 +862,7 @@ export const QuerySpendableBalancesRequest = { }, toAmino(message: QuerySpendableBalancesRequest): QuerySpendableBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -982,7 +982,7 @@ export const QuerySpendableBalancesResponse = { if (message.balances) { obj.balances = message.balances.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1197,7 +1197,7 @@ export const QueryTotalSupplyResponse = { if (message.supply) { obj.supply = message.supply.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.supply = []; + obj.supply = message.supply; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1293,7 +1293,7 @@ export const QuerySupplyOfRequest = { }, toAmino(message: QuerySupplyOfRequest): QuerySupplyOfRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QuerySupplyOfRequestAminoMsg): QuerySupplyOfRequest { @@ -1767,7 +1767,7 @@ export const QueryDenomsMetadataResponse = { if (message.metadatas) { obj.metadatas = message.metadatas.map(e => e ? Metadata.toAmino(e) : undefined); } else { - obj.metadatas = []; + obj.metadatas = message.metadatas; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1863,7 +1863,7 @@ export const QueryDenomMetadataRequest = { }, toAmino(message: QueryDenomMetadataRequest): QueryDenomMetadataRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomMetadataRequestAminoMsg): QueryDenomMetadataRequest { @@ -2067,7 +2067,7 @@ export const QueryDenomOwnersRequest = { }, toAmino(message: QueryDenomOwnersRequest): QueryDenomOwnersRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2178,7 +2178,7 @@ export const DenomOwner = { }, toAmino(message: DenomOwner): DenomOwnerAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined; return obj; }, @@ -2298,7 +2298,7 @@ export const QueryDenomOwnersResponse = { if (message.denomOwners) { obj.denom_owners = message.denomOwners.map(e => e ? DenomOwner.toAmino(e) : undefined); } else { - obj.denom_owners = []; + obj.denom_owners = message.denomOwners; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/tx.ts index 49ef7e471b..4158a8d2f3 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/tx.ts @@ -156,12 +156,12 @@ export const MsgSend = { }, toAmino(message: MsgSend): MsgSendAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -360,12 +360,12 @@ export const MsgMultiSend = { if (message.inputs) { obj.inputs = message.inputs.map(e => e ? Input.toAmino(e) : undefined); } else { - obj.inputs = []; + obj.inputs = message.inputs; } if (message.outputs) { obj.outputs = message.outputs.map(e => e ? Output.toAmino(e) : undefined); } else { - obj.outputs = []; + obj.outputs = message.outputs; } return obj; }, 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 a74bcfd52b..8471e06873 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/abci/v1beta1/abci.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/abci/v1beta1/abci.ts @@ -555,26 +555,26 @@ export const TxResponse = { }, 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; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.txhash = message.txhash === "" ? undefined : message.txhash; + obj.codespace = message.codespace === "" ? undefined : message.codespace; + obj.code = message.code === 0 ? undefined : message.code; + obj.data = message.data === "" ? undefined : message.data; + obj.raw_log = message.rawLog === "" ? undefined : message.rawLog; if (message.logs) { obj.logs = message.logs.map(e => e ? ABCIMessageLog.toAmino(e) : undefined); } else { - obj.logs = []; + obj.logs = message.logs; } - obj.info = message.info; - obj.gas_wanted = message.gasWanted ? message.gasWanted.toString() : undefined; - obj.gas_used = message.gasUsed ? message.gasUsed.toString() : undefined; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; obj.tx = message.tx ? Any.toAmino(message.tx) : undefined; - obj.timestamp = message.timestamp; + obj.timestamp = message.timestamp === "" ? undefined : message.timestamp; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -707,12 +707,12 @@ export const ABCIMessageLog = { }, toAmino(message: ABCIMessageLog): ABCIMessageLogAmino { const obj: any = {}; - obj.msg_index = message.msgIndex; - obj.log = message.log; + obj.msg_index = message.msgIndex ?? 0; + obj.log = message.log === "" ? undefined : message.log; if (message.events) { obj.events = message.events.map(e => e ? StringEvent.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -829,11 +829,11 @@ export const StringEvent = { }, toAmino(message: StringEvent): StringEventAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -944,8 +944,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -1055,8 +1055,8 @@ export const GasInfo = { }, 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; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; return obj; }, fromAminoMsg(object: GasInfoAminoMsg): GasInfo { @@ -1211,16 +1211,16 @@ export const Result = { toAmino(message: Result): ResultAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.log = message.log; + obj.log = message.log === "" ? undefined : message.log; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } if (message.msgResponses) { obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msg_responses = []; + obj.msg_responses = message.msgResponses; } return obj; }, @@ -1442,7 +1442,7 @@ export const MsgData = { }, toAmino(message: MsgData): MsgDataAmino { const obj: any = {}; - obj.msg_type = message.msgType; + obj.msg_type = message.msgType === "" ? undefined : message.msgType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1568,12 +1568,12 @@ export const TxMsgData = { if (message.data) { obj.data = message.data.map(e => e ? MsgData.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } if (message.msgResponses) { obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msg_responses = []; + obj.msg_responses = message.msgResponses; } return obj; }, @@ -1754,15 +1754,15 @@ export const SearchTxsResult = { }, 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; + obj.total_count = message.totalCount !== BigInt(0) ? message.totalCount.toString() : undefined; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.page_number = message.pageNumber !== BigInt(0) ? message.pageNumber.toString() : undefined; + obj.page_total = message.pageTotal !== BigInt(0) ? message.pageTotal.toString() : undefined; + obj.limit = message.limit !== BigInt(0) ? message.limit.toString() : undefined; if (message.txs) { obj.txs = message.txs.map(e => e ? TxResponse.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } return obj; }, 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 5b0b04a862..ff0ddb56a8 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/kv/v1beta1/kv.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/kv/v1beta1/kv.ts @@ -105,7 +105,7 @@ export const Pairs = { if (message.pairs) { obj.pairs = message.pairs.map(e => e ? Pair.toAmino(e) : undefined); } else { - obj.pairs = []; + obj.pairs = message.pairs; } return obj; }, 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 c4785e3d42..8ab74190e4 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/node/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/node/v1beta1/query.ts @@ -163,7 +163,7 @@ export const ConfigResponse = { }, toAmino(message: ConfigResponse): ConfigResponseAmino { const obj: any = {}; - obj.minimum_gas_price = message.minimumGasPrice; + obj.minimum_gas_price = message.minimumGasPrice === "" ? undefined : message.minimumGasPrice; return obj; }, fromAminoMsg(object: ConfigResponseAminoMsg): ConfigResponse { 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 d7708ab1d8..3996520628 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/query/v1beta1/pagination.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/query/v1beta1/pagination.ts @@ -235,10 +235,10 @@ export const PageRequest = { toAmino(message: PageRequest): PageRequestAmino { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; - 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; + obj.offset = message.offset !== BigInt(0) ? message.offset.toString() : undefined; + obj.limit = message.limit !== BigInt(0) ? message.limit.toString() : undefined; + obj.count_total = message.countTotal === false ? undefined : message.countTotal; + obj.reverse = message.reverse === false ? undefined : message.reverse; return obj; }, fromAminoMsg(object: PageRequestAminoMsg): PageRequest { @@ -349,7 +349,7 @@ export const PageResponse = { toAmino(message: PageResponse): PageResponseAmino { const obj: any = {}; obj.next_key = message.nextKey ? base64FromBytes(message.nextKey) : undefined; - obj.total = message.total ? message.total.toString() : undefined; + obj.total = message.total !== BigInt(0) ? message.total.toString() : undefined; return obj; }, fromAminoMsg(object: PageResponseAminoMsg): PageResponse { 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 810e8ed72a..ad4e68b634 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/reflection/v1beta1/reflection.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/reflection/v1beta1/reflection.ts @@ -210,7 +210,7 @@ export const ListAllInterfacesResponse = { if (message.interfaceNames) { obj.interface_names = message.interfaceNames.map(e => e); } else { - obj.interface_names = []; + obj.interface_names = message.interfaceNames; } return obj; }, @@ -305,7 +305,7 @@ export const ListImplementationsRequest = { }, toAmino(message: ListImplementationsRequest): ListImplementationsRequestAmino { const obj: any = {}; - obj.interface_name = message.interfaceName; + obj.interface_name = message.interfaceName === "" ? undefined : message.interfaceName; return obj; }, fromAminoMsg(object: ListImplementationsRequestAminoMsg): ListImplementationsRequest { @@ -408,7 +408,7 @@ export const ListImplementationsResponse = { if (message.implementationMessageNames) { obj.implementation_message_names = message.implementationMessageNames.map(e => e); } else { - obj.implementation_message_names = []; + obj.implementation_message_names = message.implementationMessageNames; } return obj; }, 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 6d7d833b73..2947178a22 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/reflection/v2alpha1/reflection.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/reflection/v2alpha1/reflection.ts @@ -682,11 +682,11 @@ export const TxDescriptor = { }, toAmino(message: TxDescriptor): TxDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? MsgDescriptor.toAmino(e) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -790,7 +790,7 @@ export const AuthnDescriptor = { if (message.signModes) { obj.sign_modes = message.signModes.map(e => e ? SigningModeDescriptor.toAmino(e) : undefined); } else { - obj.sign_modes = []; + obj.sign_modes = message.signModes; } return obj; }, @@ -917,9 +917,9 @@ export const SigningModeDescriptor = { }, toAmino(message: SigningModeDescriptor): SigningModeDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; - obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname === "" ? undefined : message.authnInfoProviderMethodFullname; return obj; }, fromAminoMsg(object: SigningModeDescriptorAminoMsg): SigningModeDescriptor { @@ -1013,7 +1013,7 @@ export const ChainDescriptor = { }, toAmino(message: ChainDescriptor): ChainDescriptorAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: ChainDescriptorAminoMsg): ChainDescriptor { @@ -1116,7 +1116,7 @@ export const CodecDescriptor = { if (message.interfaces) { obj.interfaces = message.interfaces.map(e => e ? InterfaceDescriptor.toAmino(e) : undefined); } else { - obj.interfaces = []; + obj.interfaces = message.interfaces; } return obj; }, @@ -1255,16 +1255,16 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.interfaceAcceptingMessages) { obj.interface_accepting_messages = message.interfaceAcceptingMessages.map(e => e ? InterfaceAcceptingMessageDescriptor.toAmino(e) : undefined); } else { - obj.interface_accepting_messages = []; + obj.interface_accepting_messages = message.interfaceAcceptingMessages; } if (message.interfaceImplementers) { obj.interface_implementers = message.interfaceImplementers.map(e => e ? InterfaceImplementerDescriptor.toAmino(e) : undefined); } else { - obj.interface_implementers = []; + obj.interface_implementers = message.interfaceImplementers; } return obj; }, @@ -1375,8 +1375,8 @@ export const InterfaceImplementerDescriptor = { }, toAmino(message: InterfaceImplementerDescriptor): InterfaceImplementerDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; - obj.type_url = message.typeUrl; + obj.fullname = message.fullname === "" ? undefined : message.fullname; + obj.type_url = message.typeUrl === "" ? undefined : message.typeUrl; return obj; }, fromAminoMsg(object: InterfaceImplementerDescriptorAminoMsg): InterfaceImplementerDescriptor { @@ -1492,11 +1492,11 @@ export const InterfaceAcceptingMessageDescriptor = { }, toAmino(message: InterfaceAcceptingMessageDescriptor): InterfaceAcceptingMessageDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.fieldDescriptorNames) { obj.field_descriptor_names = message.fieldDescriptorNames.map(e => e); } else { - obj.field_descriptor_names = []; + obj.field_descriptor_names = message.fieldDescriptorNames; } return obj; }, @@ -1591,7 +1591,7 @@ export const ConfigurationDescriptor = { }, toAmino(message: ConfigurationDescriptor): ConfigurationDescriptorAmino { const obj: any = {}; - obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix; + obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix === "" ? undefined : message.bech32AccountAddressPrefix; return obj; }, fromAminoMsg(object: ConfigurationDescriptorAminoMsg): ConfigurationDescriptor { @@ -1685,7 +1685,7 @@ export const MsgDescriptor = { }, toAmino(message: MsgDescriptor): MsgDescriptorAmino { const obj: any = {}; - obj.msg_type_url = message.msgTypeUrl; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromAminoMsg(object: MsgDescriptorAminoMsg): MsgDescriptor { @@ -2790,7 +2790,7 @@ export const QueryServicesDescriptor = { if (message.queryServices) { obj.query_services = message.queryServices.map(e => e ? QueryServiceDescriptor.toAmino(e) : undefined); } else { - obj.query_services = []; + obj.query_services = message.queryServices; } return obj; }, @@ -2923,12 +2923,12 @@ export const QueryServiceDescriptor = { }, toAmino(message: QueryServiceDescriptor): QueryServiceDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; - obj.is_module = message.isModule; + obj.fullname = message.fullname === "" ? undefined : message.fullname; + obj.is_module = message.isModule === false ? undefined : message.isModule; if (message.methods) { obj.methods = message.methods.map(e => e ? QueryMethodDescriptor.toAmino(e) : undefined); } else { - obj.methods = []; + obj.methods = message.methods; } return obj; }, @@ -3039,8 +3039,8 @@ export const QueryMethodDescriptor = { }, toAmino(message: QueryMethodDescriptor): QueryMethodDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.full_query_path = message.fullQueryPath; + obj.name = message.name === "" ? undefined : message.name; + obj.full_query_path = message.fullQueryPath === "" ? undefined : message.fullQueryPath; return obj; }, fromAminoMsg(object: QueryMethodDescriptorAminoMsg): QueryMethodDescriptor { 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 56152fb16d..e493cf3ce3 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/snapshots/v1beta1/snapshot.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/snapshots/v1beta1/snapshot.ts @@ -273,9 +273,9 @@ export const Snapshot = { }, toAmino(message: Snapshot): SnapshotAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunks = message.chunks; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunks = message.chunks === 0 ? undefined : message.chunks; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; @@ -380,7 +380,7 @@ export const Metadata = { if (message.chunkHashes) { obj.chunk_hashes = message.chunkHashes.map(e => base64FromBytes(e)); } else { - obj.chunk_hashes = []; + obj.chunk_hashes = message.chunkHashes; } return obj; }, @@ -654,7 +654,7 @@ export const SnapshotStoreItem = { }, toAmino(message: SnapshotStoreItem): SnapshotStoreItemAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: SnapshotStoreItemAminoMsg): SnapshotStoreItem { @@ -798,8 +798,8 @@ export const SnapshotIAVLItem = { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; - obj.version = message.version ? message.version.toString() : undefined; - obj.height = message.height; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; + obj.height = message.height === 0 ? undefined : message.height; return obj; }, fromAminoMsg(object: SnapshotIAVLItemAminoMsg): SnapshotIAVLItem { @@ -909,8 +909,8 @@ export const SnapshotExtensionMeta = { }, toAmino(message: SnapshotExtensionMeta): SnapshotExtensionMetaAmino { const obj: any = {}; - obj.name = message.name; - obj.format = message.format; + obj.name = message.name === "" ? undefined : message.name; + obj.format = message.format === 0 ? undefined : message.format; return obj; }, fromAminoMsg(object: SnapshotExtensionMetaAminoMsg): SnapshotExtensionMeta { @@ -1218,7 +1218,7 @@ export const SnapshotSchema = { if (message.keys) { obj.keys = message.keys.map(e => base64FromBytes(e)); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, 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 16a465f03c..5a918f65d7 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 @@ -152,11 +152,11 @@ export const CommitInfo = { }, toAmino(message: CommitInfo): CommitInfoAmino { const obj: any = {}; - obj.version = message.version ? message.version.toString() : undefined; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; if (message.storeInfos) { obj.store_infos = message.storeInfos.map(e => e ? StoreInfo.toAmino(e) : undefined); } else { - obj.store_infos = []; + obj.store_infos = message.storeInfos; } return obj; }, @@ -267,7 +267,7 @@ export const StoreInfo = { }, toAmino(message: StoreInfo): StoreInfoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.commit_id = message.commitId ? CommitID.toAmino(message.commitId) : undefined; return obj; }, @@ -378,7 +378,7 @@ export const CommitID = { }, toAmino(message: CommitID): CommitIDAmino { const obj: any = {}; - obj.version = message.version ? message.version.toString() : undefined; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; return obj; }, 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 bc2a3add64..48f7b71f2f 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/store/v1beta1/listening.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/store/v1beta1/listening.ts @@ -150,8 +150,8 @@ export const StoreKVPair = { }, toAmino(message: StoreKVPair): StoreKVPairAmino { const obj: any = {}; - obj.store_key = message.storeKey; - obj.delete = message.delete; + obj.store_key = message.storeKey === "" ? undefined : message.storeKey; + obj.delete = message.delete === false ? undefined : message.delete; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; return obj; 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 c11b4a3679..54a4fbd24e 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/tendermint/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/tendermint/v1beta1/query.ts @@ -307,7 +307,7 @@ export const GetValidatorSetByHeightRequest = { }, toAmino(message: GetValidatorSetByHeightRequest): GetValidatorSetByHeightRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -440,11 +440,11 @@ export const GetValidatorSetByHeightResponse = { }, toAmino(message: GetValidatorSetByHeightResponse): GetValidatorSetByHeightResponseAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -672,11 +672,11 @@ export const GetLatestValidatorSetResponse = { }, toAmino(message: GetLatestValidatorSetResponse): GetLatestValidatorSetResponseAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -820,10 +820,10 @@ export const Validator = { }, toAmino(message: Validator): ValidatorAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority !== BigInt(0) ? message.proposerPriority.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -917,7 +917,7 @@ export const GetBlockByHeightRequest = { }, toAmino(message: GetBlockByHeightRequest): GetBlockByHeightRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: GetBlockByHeightRequestAminoMsg): GetBlockByHeightRequest { @@ -1379,7 +1379,7 @@ export const GetSyncingResponse = { }, toAmino(message: GetSyncingResponse): GetSyncingResponseAmino { const obj: any = {}; - obj.syncing = message.syncing; + obj.syncing = message.syncing === false ? undefined : message.syncing; return obj; }, fromAminoMsg(object: GetSyncingResponseAminoMsg): GetSyncingResponse { @@ -1775,18 +1775,18 @@ export const VersionInfo = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.app_name = message.appName === "" ? undefined : message.appName; + obj.version = message.version === "" ? undefined : message.version; + obj.git_commit = message.gitCommit === "" ? undefined : message.gitCommit; + obj.build_tags = message.buildTags === "" ? undefined : message.buildTags; + obj.go_version = message.goVersion === "" ? undefined : message.goVersion; if (message.buildDeps) { obj.build_deps = message.buildDeps.map(e => e ? Module.toAmino(e) : undefined); } else { - obj.build_deps = []; + obj.build_deps = message.buildDeps; } - obj.cosmos_sdk_version = message.cosmosSdkVersion; + obj.cosmos_sdk_version = message.cosmosSdkVersion === "" ? undefined : message.cosmosSdkVersion; return obj; }, fromAminoMsg(object: VersionInfoAminoMsg): VersionInfo { @@ -1912,9 +1912,9 @@ export const Module = { }, toAmino(message: Module): ModuleAmino { const obj: any = {}; - obj.path = message.path; - obj.version = message.version; - obj.sum = message.sum; + obj.path = message.path === "" ? undefined : message.path; + obj.version = message.version === "" ? undefined : message.version; + obj.sum = message.sum === "" ? undefined : message.sum; return obj; }, fromAminoMsg(object: ModuleAminoMsg): Module { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/base/v1beta1/coin.ts b/__fixtures__/v-next/outputosmojs/cosmos/base/v1beta1/coin.ts index 2020af5188..accde841e6 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/v1beta1/coin.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/v1beta1/coin.ts @@ -158,8 +158,8 @@ export const Coin = { }, toAmino(message: Coin): CoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: CoinAminoMsg): Coin { @@ -269,8 +269,8 @@ export const DecCoin = { }, toAmino(message: DecCoin): DecCoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: DecCoinAminoMsg): DecCoin { @@ -364,7 +364,7 @@ export const IntProto = { }, toAmino(message: IntProto): IntProtoAmino { const obj: any = {}; - obj.int = message.int; + obj.int = message.int === "" ? undefined : message.int; return obj; }, fromAminoMsg(object: IntProtoAminoMsg): IntProto { @@ -458,7 +458,7 @@ export const DecProto = { }, toAmino(message: DecProto): DecProtoAmino { const obj: any = {}; - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; return obj; }, fromAminoMsg(object: DecProtoAminoMsg): DecProto { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/capability.ts b/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/capability.ts index dea38f36e2..aabda996ac 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/capability.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/capability.ts @@ -126,7 +126,7 @@ export const Capability = { }, toAmino(message: Capability): CapabilityAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; return obj; }, fromAminoMsg(object: CapabilityAminoMsg): Capability { @@ -236,8 +236,8 @@ export const Owner = { }, toAmino(message: Owner): OwnerAmino { const obj: any = {}; - obj.module = message.module; - obj.name = message.name; + obj.module = message.module === "" ? undefined : message.module; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: OwnerAminoMsg): Owner { @@ -340,7 +340,7 @@ export const CapabilityOwners = { if (message.owners) { obj.owners = message.owners.map(e => e ? Owner.toAmino(e) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/genesis.ts index aa68f3cb39..aee0a7b705 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/genesis.ts @@ -122,7 +122,7 @@ export const GenesisOwners = { }, toAmino(message: GenesisOwners): GenesisOwnersAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.index_owners = message.indexOwners ? CapabilityOwners.toAmino(message.indexOwners) : undefined; return obj; }, @@ -239,11 +239,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; if (message.owners) { obj.owners = message.owners.map(e => e ? GenesisOwners.toAmino(e) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/crisis/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/crisis/v1beta1/tx.ts index 3d570d7e2c..e6bd264055 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crisis/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crisis/v1beta1/tx.ts @@ -126,9 +126,9 @@ export const MsgVerifyInvariant = { }, toAmino(message: MsgVerifyInvariant): MsgVerifyInvariantAmino { const obj: any = {}; - obj.sender = message.sender; - obj.invariant_module_name = message.invariantModuleName; - obj.invariant_route = message.invariantRoute; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.invariant_module_name = message.invariantModuleName === "" ? undefined : message.invariantModuleName; + obj.invariant_route = message.invariantRoute === "" ? undefined : message.invariantRoute; return obj; }, fromAminoMsg(object: MsgVerifyInvariantAminoMsg): MsgVerifyInvariant { 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 945f46463d..430a7cc8c0 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crypto/hd/v1/hd.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crypto/hd/v1/hd.ts @@ -162,11 +162,11 @@ export const BIP44Params = { }, 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; + obj.purpose = message.purpose === 0 ? undefined : message.purpose; + obj.coin_type = message.coinType === 0 ? undefined : message.coinType; + obj.account = message.account === 0 ? undefined : message.account; + obj.change = message.change === false ? undefined : message.change; + obj.address_index = message.addressIndex === 0 ? undefined : message.addressIndex; return obj; }, fromAminoMsg(object: BIP44ParamsAminoMsg): BIP44Params { 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 582031b168..2b5957a040 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crypto/keyring/v1/record.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crypto/keyring/v1/record.ts @@ -228,7 +228,7 @@ export const Record = { }, toAmino(message: Record): RecordAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : 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; @@ -344,7 +344,7 @@ export const Record_Local = { 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; + obj.priv_key_type = message.privKeyType === "" ? undefined : message.privKeyType; return obj; }, fromAminoMsg(object: Record_LocalAminoMsg): Record_Local { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/keys.ts b/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/keys.ts index 1a1ebe1120..d6c9bcd083 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/keys.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/keys.ts @@ -115,11 +115,11 @@ export const LegacyAminoPubKey = { }, toAmino(message: LegacyAminoPubKey): LegacyAminoPubKeyAmino { const obj: any = {}; - obj.threshold = message.threshold; + obj.threshold = message.threshold === 0 ? undefined : message.threshold; if (message.publicKeys) { obj.public_keys = message.publicKeys.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.public_keys = []; + obj.public_keys = message.publicKeys; } return obj; }, 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 e30e247767..3e55fa8335 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/v1beta1/multisig.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/v1beta1/multisig.ts @@ -123,7 +123,7 @@ export const MultiSignature = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -234,7 +234,7 @@ export const CompactBitArray = { }, toAmino(message: CompactBitArray): CompactBitArrayAmino { const obj: any = {}; - obj.extra_bits_stored = message.extraBitsStored; + obj.extra_bits_stored = message.extraBitsStored === 0 ? undefined : message.extraBitsStored; obj.elems = message.elems ? base64FromBytes(message.elems) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/distribution.ts b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/distribution.ts index c60c81cfbf..b388c995e7 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/distribution.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/distribution.ts @@ -386,10 +386,10 @@ export const Params = { }, 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; + obj.community_tax = message.communityTax === "" ? undefined : message.communityTax; + obj.base_proposer_reward = message.baseProposerReward === "" ? undefined : message.baseProposerReward; + obj.bonus_proposer_reward = message.bonusProposerReward === "" ? undefined : message.bonusProposerReward; + obj.withdraw_addr_enabled = message.withdrawAddrEnabled === false ? undefined : message.withdrawAddrEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -508,9 +508,9 @@ export const ValidatorHistoricalRewards = { if (message.cumulativeRewardRatio) { obj.cumulative_reward_ratio = message.cumulativeRewardRatio.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.cumulative_reward_ratio = []; + obj.cumulative_reward_ratio = message.cumulativeRewardRatio; } - obj.reference_count = message.referenceCount; + obj.reference_count = message.referenceCount === 0 ? undefined : message.referenceCount; return obj; }, fromAminoMsg(object: ValidatorHistoricalRewardsAminoMsg): ValidatorHistoricalRewards { @@ -629,9 +629,9 @@ export const ValidatorCurrentRewards = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } - obj.period = message.period ? message.period.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorCurrentRewardsAminoMsg): ValidatorCurrentRewards { @@ -734,7 +734,7 @@ export const ValidatorAccumulatedCommission = { if (message.commission) { obj.commission = message.commission.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.commission = []; + obj.commission = message.commission; } return obj; }, @@ -838,7 +838,7 @@ export const ValidatorOutstandingRewards = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, @@ -949,8 +949,8 @@ export const ValidatorSlashEvent = { }, toAmino(message: ValidatorSlashEvent): ValidatorSlashEventAmino { const obj: any = {}; - obj.validator_period = message.validatorPeriod ? message.validatorPeriod.toString() : undefined; - obj.fraction = message.fraction; + obj.validator_period = message.validatorPeriod !== BigInt(0) ? message.validatorPeriod.toString() : undefined; + obj.fraction = message.fraction === "" ? undefined : message.fraction; return obj; }, fromAminoMsg(object: ValidatorSlashEventAminoMsg): ValidatorSlashEvent { @@ -1053,7 +1053,7 @@ export const ValidatorSlashEvents = { if (message.validatorSlashEvents) { obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEvent.toAmino(e) : undefined); } else { - obj.validator_slash_events = []; + obj.validator_slash_events = message.validatorSlashEvents; } return obj; }, @@ -1157,7 +1157,7 @@ export const FeePool = { if (message.communityPool) { obj.community_pool = message.communityPool.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.community_pool = []; + obj.community_pool = message.communityPool; } return obj; }, @@ -1306,13 +1306,13 @@ export const CommunityPoolSpendProposal = { }, toAmino(message: CommunityPoolSpendProposal): CommunityPoolSpendProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.recipient = message.recipient; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.recipient = message.recipient === "" ? undefined : message.recipient; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -1439,9 +1439,9 @@ export const DelegatorStartingInfo = { }, 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; + obj.previous_period = message.previousPeriod !== BigInt(0) ? message.previousPeriod.toString() : undefined; + obj.stake = message.stake === "" ? undefined : message.stake; + obj.height = message.height ? message.height.toString() : "0"; return obj; }, fromAminoMsg(object: DelegatorStartingInfoAminoMsg): DelegatorStartingInfo { @@ -1557,11 +1557,11 @@ export const DelegationDelegatorReward = { }, toAmino(message: DelegationDelegatorReward): DelegationDelegatorRewardAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.reward) { obj.reward = message.reward.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.reward = []; + obj.reward = message.reward; } return obj; }, @@ -1720,11 +1720,11 @@ export const CommunityPoolSpendProposalWithDeposit = { }, 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; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.recipient = message.recipient === "" ? undefined : message.recipient; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.deposit = message.deposit === "" ? undefined : message.deposit; return obj; }, fromAminoMsg(object: CommunityPoolSpendProposalWithDepositAminoMsg): CommunityPoolSpendProposalWithDeposit { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/genesis.ts index 739791425f..f5b95117bf 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/genesis.ts @@ -272,8 +272,8 @@ export const DelegatorWithdrawInfo = { }, toAmino(message: DelegatorWithdrawInfo): DelegatorWithdrawInfoAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.withdraw_address = message.withdrawAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: DelegatorWithdrawInfoAminoMsg): DelegatorWithdrawInfo { @@ -389,11 +389,11 @@ export const ValidatorOutstandingRewardsRecord = { }, toAmino(message: ValidatorOutstandingRewardsRecord): ValidatorOutstandingRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.outstandingRewards) { obj.outstanding_rewards = message.outstandingRewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.outstanding_rewards = []; + obj.outstanding_rewards = message.outstandingRewards; } return obj; }, @@ -504,7 +504,7 @@ export const ValidatorAccumulatedCommissionRecord = { }, toAmino(message: ValidatorAccumulatedCommissionRecord): ValidatorAccumulatedCommissionRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.accumulated = message.accumulated ? ValidatorAccumulatedCommission.toAmino(message.accumulated) : undefined; return obj; }, @@ -631,8 +631,8 @@ export const ValidatorHistoricalRewardsRecord = { }, toAmino(message: ValidatorHistoricalRewardsRecord): ValidatorHistoricalRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.period = message.period ? message.period.toString() : undefined; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; obj.rewards = message.rewards ? ValidatorHistoricalRewards.toAmino(message.rewards) : undefined; return obj; }, @@ -743,7 +743,7 @@ export const ValidatorCurrentRewardsRecord = { }, toAmino(message: ValidatorCurrentRewardsRecord): ValidatorCurrentRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.rewards = message.rewards ? ValidatorCurrentRewards.toAmino(message.rewards) : undefined; return obj; }, @@ -870,8 +870,8 @@ export const DelegatorStartingInfoRecord = { }, toAmino(message: DelegatorStartingInfoRecord): DelegatorStartingInfoRecordAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.starting_info = message.startingInfo ? DelegatorStartingInfo.toAmino(message.startingInfo) : undefined; return obj; }, @@ -1014,9 +1014,9 @@ export const ValidatorSlashEventRecord = { }, 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_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; obj.validator_slash_event = message.validatorSlashEvent ? ValidatorSlashEvent.toAmino(message.validatorSlashEvent) : undefined; return obj; }, @@ -1302,38 +1302,38 @@ export const GenesisState = { if (message.delegatorWithdrawInfos) { obj.delegator_withdraw_infos = message.delegatorWithdrawInfos.map(e => e ? DelegatorWithdrawInfo.toAmino(e) : undefined); } else { - obj.delegator_withdraw_infos = []; + obj.delegator_withdraw_infos = message.delegatorWithdrawInfos; } - obj.previous_proposer = message.previousProposer; + obj.previous_proposer = message.previousProposer === "" ? undefined : message.previousProposer; if (message.outstandingRewards) { obj.outstanding_rewards = message.outstandingRewards.map(e => e ? ValidatorOutstandingRewardsRecord.toAmino(e) : undefined); } else { - obj.outstanding_rewards = []; + obj.outstanding_rewards = message.outstandingRewards; } if (message.validatorAccumulatedCommissions) { obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions.map(e => e ? ValidatorAccumulatedCommissionRecord.toAmino(e) : undefined); } else { - obj.validator_accumulated_commissions = []; + obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions; } if (message.validatorHistoricalRewards) { obj.validator_historical_rewards = message.validatorHistoricalRewards.map(e => e ? ValidatorHistoricalRewardsRecord.toAmino(e) : undefined); } else { - obj.validator_historical_rewards = []; + obj.validator_historical_rewards = message.validatorHistoricalRewards; } if (message.validatorCurrentRewards) { obj.validator_current_rewards = message.validatorCurrentRewards.map(e => e ? ValidatorCurrentRewardsRecord.toAmino(e) : undefined); } else { - obj.validator_current_rewards = []; + obj.validator_current_rewards = message.validatorCurrentRewards; } if (message.delegatorStartingInfos) { obj.delegator_starting_infos = message.delegatorStartingInfos.map(e => e ? DelegatorStartingInfoRecord.toAmino(e) : undefined); } else { - obj.delegator_starting_infos = []; + obj.delegator_starting_infos = message.delegatorStartingInfos; } if (message.validatorSlashEvents) { obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEventRecord.toAmino(e) : undefined); } else { - obj.validator_slash_events = []; + obj.validator_slash_events = message.validatorSlashEvents; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/query.ts index 9aa08f273c..ea10c0e1e4 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/query.ts @@ -577,7 +577,7 @@ export const QueryValidatorOutstandingRewardsRequest = { }, toAmino(message: QueryValidatorOutstandingRewardsRequest): QueryValidatorOutstandingRewardsRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryValidatorOutstandingRewardsRequestAminoMsg): QueryValidatorOutstandingRewardsRequest { @@ -765,7 +765,7 @@ export const QueryValidatorCommissionRequest = { }, toAmino(message: QueryValidatorCommissionRequest): QueryValidatorCommissionRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryValidatorCommissionRequestAminoMsg): QueryValidatorCommissionRequest { @@ -1001,9 +1001,9 @@ export const QueryValidatorSlashesRequest = { }, 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.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.starting_height = message.startingHeight !== BigInt(0) ? message.startingHeight.toString() : undefined; + obj.ending_height = message.endingHeight !== BigInt(0) ? message.endingHeight.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1123,7 +1123,7 @@ export const QueryValidatorSlashesResponse = { if (message.slashes) { obj.slashes = message.slashes.map(e => e ? ValidatorSlashEvent.toAmino(e) : undefined); } else { - obj.slashes = []; + obj.slashes = message.slashes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1235,8 +1235,8 @@ export const QueryDelegationRewardsRequest = { }, toAmino(message: QueryDelegationRewardsRequest): QueryDelegationRewardsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryDelegationRewardsRequestAminoMsg): QueryDelegationRewardsRequest { @@ -1339,7 +1339,7 @@ export const QueryDelegationRewardsResponse = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, @@ -1434,7 +1434,7 @@ export const QueryDelegationTotalRewardsRequest = { }, toAmino(message: QueryDelegationTotalRewardsRequest): QueryDelegationTotalRewardsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegationTotalRewardsRequestAminoMsg): QueryDelegationTotalRewardsRequest { @@ -1559,12 +1559,12 @@ export const QueryDelegationTotalRewardsResponse = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DelegationDelegatorReward.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } if (message.total) { obj.total = message.total.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.total = []; + obj.total = message.total; } return obj; }, @@ -1659,7 +1659,7 @@ export const QueryDelegatorValidatorsRequest = { }, toAmino(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegatorValidatorsRequestAminoMsg): QueryDelegatorValidatorsRequest { @@ -1762,7 +1762,7 @@ export const QueryDelegatorValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e); } else { - obj.validators = []; + obj.validators = message.validators; } return obj; }, @@ -1857,7 +1857,7 @@ export const QueryDelegatorWithdrawAddressRequest = { }, toAmino(message: QueryDelegatorWithdrawAddressRequest): QueryDelegatorWithdrawAddressRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegatorWithdrawAddressRequestAminoMsg): QueryDelegatorWithdrawAddressRequest { @@ -1951,7 +1951,7 @@ export const QueryDelegatorWithdrawAddressResponse = { }, toAmino(message: QueryDelegatorWithdrawAddressResponse): QueryDelegatorWithdrawAddressResponseAmino { const obj: any = {}; - obj.withdraw_address = message.withdrawAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: QueryDelegatorWithdrawAddressResponseAminoMsg): QueryDelegatorWithdrawAddressResponse { @@ -2127,7 +2127,7 @@ export const QueryCommunityPoolResponse = { if (message.pool) { obj.pool = message.pool.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.pool = []; + obj.pool = message.pool; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/tx.ts index 8f93dd16c0..9111e51c82 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/tx.ts @@ -205,8 +205,8 @@ export const MsgSetWithdrawAddress = { }, toAmino(message: MsgSetWithdrawAddress): MsgSetWithdrawAddressAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.withdraw_address = message.withdrawAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: MsgSetWithdrawAddressAminoMsg): MsgSetWithdrawAddress { @@ -389,8 +389,8 @@ export const MsgWithdrawDelegatorReward = { }, toAmino(message: MsgWithdrawDelegatorReward): MsgWithdrawDelegatorRewardAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: MsgWithdrawDelegatorRewardAminoMsg): MsgWithdrawDelegatorReward { @@ -493,7 +493,7 @@ export const MsgWithdrawDelegatorRewardResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -588,7 +588,7 @@ export const MsgWithdrawValidatorCommission = { }, toAmino(message: MsgWithdrawValidatorCommission): MsgWithdrawValidatorCommissionAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: MsgWithdrawValidatorCommissionAminoMsg): MsgWithdrawValidatorCommission { @@ -691,7 +691,7 @@ export const MsgWithdrawValidatorCommissionResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -811,9 +811,9 @@ export const MsgFundCommunityPool = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.depositor = message.depositor; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: MsgFundCommunityPoolAminoMsg): MsgFundCommunityPool { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/evidence.ts b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/evidence.ts index de0fcd30f2..e55fced8cc 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/evidence.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/evidence.ts @@ -143,10 +143,10 @@ export const Equivocation = { }, toAmino(message: Equivocation): EquivocationAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.power = message.power ? message.power.toString() : undefined; - obj.consensus_address = message.consensusAddress; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; + obj.consensus_address = message.consensusAddress === "" ? undefined : message.consensusAddress; return obj; }, fromAminoMsg(object: EquivocationAminoMsg): Equivocation { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/genesis.ts index 377c6d600f..215dd9186e 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/genesis.ts @@ -93,7 +93,7 @@ export const GenesisState = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/query.ts index 43a0309c51..baefd03bce 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/query.ts @@ -446,7 +446,7 @@ export const QueryAllEvidenceResponse = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/tx.ts index 41c19cffa0..0a0bf90fc7 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/tx.ts @@ -120,7 +120,7 @@ export const MsgSubmitEvidence = { }, toAmino(message: MsgSubmitEvidence): MsgSubmitEvidenceAmino { const obj: any = {}; - obj.submitter = message.submitter; + obj.submitter = message.submitter === "" ? undefined : message.submitter; obj.evidence = message.evidence ? Any.toAmino(message.evidence) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/feegrant.ts index cc92537f4d..0415449bf2 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/feegrant.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/feegrant.ts @@ -201,7 +201,7 @@ export const BasicAllowance = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -378,12 +378,12 @@ export const PeriodicAllowance = { if (message.periodSpendLimit) { obj.period_spend_limit = message.periodSpendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.period_spend_limit = []; + obj.period_spend_limit = message.periodSpendLimit; } if (message.periodCanSpend) { obj.period_can_spend = message.periodCanSpend.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.period_can_spend = []; + obj.period_can_spend = message.periodCanSpend; } obj.period_reset = message.periodReset ? Timestamp.toAmino(toTimestamp(message.periodReset)) : undefined; return obj; @@ -505,7 +505,7 @@ export const AllowedMsgAllowance = { if (message.allowedMessages) { obj.allowed_messages = message.allowedMessages.map(e => e); } else { - obj.allowed_messages = []; + obj.allowed_messages = message.allowedMessages; } return obj; }, @@ -632,8 +632,8 @@ export const Grant = { }, toAmino(message: Grant): GrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.allowance = message.allowance ? Any.toAmino(message.allowance) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/genesis.ts index 444fb5e442..321e439d17 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/query.ts index ca093f2e46..d33df578bc 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/query.ts @@ -179,8 +179,8 @@ export const QueryAllowanceRequest = { }, toAmino(message: QueryAllowanceRequest): QueryAllowanceRequestAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; return obj; }, fromAminoMsg(object: QueryAllowanceRequestAminoMsg): QueryAllowanceRequest { @@ -384,7 +384,7 @@ export const QueryAllowancesRequest = { }, toAmino(message: QueryAllowancesRequest): QueryAllowancesRequestAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -504,7 +504,7 @@ export const QueryAllowancesResponse = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -616,7 +616,7 @@ export const QueryAllowancesByGranterRequest = { }, toAmino(message: QueryAllowancesByGranterRequest): QueryAllowancesByGranterRequestAmino { const obj: any = {}; - obj.granter = message.granter; + obj.granter = message.granter === "" ? undefined : message.granter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -736,7 +736,7 @@ export const QueryAllowancesByGranterResponse = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/tx.ts index 2729e51001..9ebbf0153a 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/tx.ts @@ -160,8 +160,8 @@ export const MsgGrantAllowance = { }, toAmino(message: MsgGrantAllowance): MsgGrantAllowanceAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.allowance = message.allowance ? Any.toAmino(message.allowance) : undefined; return obj; }, @@ -345,8 +345,8 @@ export const MsgRevokeAllowance = { }, toAmino(message: MsgRevokeAllowance): MsgRevokeAllowanceAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; return obj; }, fromAminoMsg(object: MsgRevokeAllowanceAminoMsg): MsgRevokeAllowance { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/genutil/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/genutil/v1beta1/genesis.ts index cd36157736..090e69bfb6 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/genutil/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/genutil/v1beta1/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.genTxs) { obj.gen_txs = message.genTxs.map(e => base64FromBytes(e)); } else { - obj.gen_txs = []; + obj.gen_txs = message.genTxs; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/genesis.ts index 45193bd3ec..909158856c 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/genesis.ts @@ -216,21 +216,21 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + obj.starting_proposal_id = message.startingProposalId !== BigInt(0) ? message.startingProposalId.toString() : undefined; if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/gov.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/gov.ts index aac0bdc289..76dd4ad4a2 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/gov.ts @@ -385,7 +385,7 @@ export const WeightedVoteOption = { fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { const message = createBaseWeightedVoteOption(); if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.weight !== undefined && object.weight !== null) { message.weight = object.weight; @@ -394,8 +394,8 @@ export const WeightedVoteOption = { }, toAmino(message: WeightedVoteOption): WeightedVoteOptionAmino { const obj: any = {}; - obj.option = message.option; - obj.weight = message.weight; + obj.option = message.option === 0 ? undefined : message.option; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption { @@ -527,12 +527,12 @@ export const Deposit = { }, toAmino(message: Deposit): DepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -758,7 +758,7 @@ export const Proposal = { } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -783,24 +783,24 @@ export const Proposal = { }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.status = message.status; + obj.status = message.status === 0 ? undefined : message.status; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined; if (message.totalDeposit) { obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_deposit = []; + obj.total_deposit = message.totalDeposit; } obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined; obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined; - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: ProposalAminoMsg): Proposal { @@ -942,10 +942,10 @@ export const TallyResult = { }, 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; + obj.yes_count = message.yesCount === "" ? undefined : message.yesCount; + obj.abstain_count = message.abstainCount === "" ? undefined : message.abstainCount; + obj.no_count = message.noCount === "" ? undefined : message.noCount; + obj.no_with_veto_count = message.noWithVetoCount === "" ? undefined : message.noWithVetoCount; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -1093,14 +1093,14 @@ export const Vote = { }, toAmino(message: Vote): VoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: VoteAminoMsg): Vote { @@ -1219,7 +1219,7 @@ export const DepositParams = { if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; return obj; @@ -1441,9 +1441,9 @@ export const TallyParams = { }, toAmino(message: TallyParams): TallyParamsAmino { const obj: any = {}; - obj.quorum = message.quorum; - obj.threshold = message.threshold; - obj.veto_threshold = message.vetoThreshold; + obj.quorum = message.quorum === "" ? undefined : message.quorum; + obj.threshold = message.threshold === "" ? undefined : message.threshold; + obj.veto_threshold = message.vetoThreshold === "" ? undefined : message.vetoThreshold; return obj; }, fromAminoMsg(object: TallyParamsAminoMsg): TallyParams { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/query.ts index 0fad47c40a..c4dd5ac69e 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/query.ts @@ -322,7 +322,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -543,7 +543,7 @@ export const QueryProposalsRequest = { fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { const message = createBaseQueryProposalsRequest(); if (object.proposal_status !== undefined && object.proposal_status !== null) { - message.proposalStatus = proposalStatusFromJSON(object.proposal_status); + message.proposalStatus = object.proposal_status; } if (object.voter !== undefined && object.voter !== null) { message.voter = object.voter; @@ -558,9 +558,9 @@ export const QueryProposalsRequest = { }, toAmino(message: QueryProposalsRequest): QueryProposalsRequestAmino { const obj: any = {}; - obj.proposal_status = message.proposalStatus; - obj.voter = message.voter; - obj.depositor = message.depositor; + obj.proposal_status = message.proposalStatus === 0 ? undefined : message.proposalStatus; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.depositor = message.depositor === "" ? undefined : message.depositor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -680,7 +680,7 @@ export const QueryProposalsResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -792,8 +792,8 @@ export const QueryVoteRequest = { }, toAmino(message: QueryVoteRequest): QueryVoteRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest { @@ -997,7 +997,7 @@ export const QueryVotesRequest = { }, toAmino(message: QueryVotesRequest): QueryVotesRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1117,7 +1117,7 @@ export const QueryVotesResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1213,7 +1213,7 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.params_type = message.paramsType; + obj.params_type = message.paramsType === "" ? undefined : message.paramsType; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -1451,8 +1451,8 @@ export const QueryDepositRequest = { }, toAmino(message: QueryDepositRequest): QueryDepositRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest { @@ -1656,7 +1656,7 @@ export const QueryDepositsRequest = { }, toAmino(message: QueryDepositsRequest): QueryDepositsRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1776,7 +1776,7 @@ export const QueryDepositsResponse = { if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1872,7 +1872,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/tx.ts index f999d7a9cc..e3dc9f3d78 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/tx.ts @@ -279,15 +279,15 @@ export const MsgSubmitProposal = { if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; - obj.metadata = message.metadata; + obj.proposer = message.proposer === "" ? undefined : message.proposer; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -381,7 +381,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -492,7 +492,7 @@ export const MsgExecLegacyContent = { toAmino(message: MsgExecLegacyContent): MsgExecLegacyContentAmino { const obj: any = {}; obj.content = message.content ? Any.toAmino(message.content) : undefined; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; return obj; }, fromAminoMsg(object: MsgExecLegacyContentAminoMsg): MsgExecLegacyContent { @@ -698,7 +698,7 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; @@ -707,10 +707,10 @@ export const MsgVote = { }, 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.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -931,14 +931,14 @@ export const MsgVoteWeighted = { }, toAmino(message: MsgVoteWeighted): MsgVoteWeightedAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgVoteWeightedAminoMsg): MsgVoteWeighted { @@ -1143,12 +1143,12 @@ export const MsgDeposit = { }, toAmino(message: MsgDeposit): MsgDepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/genesis.ts index cf431cdc61..6d4b780328 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/genesis.ts @@ -216,21 +216,21 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + obj.starting_proposal_id = message.startingProposalId !== BigInt(0) ? message.startingProposalId.toString() : undefined; if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/gov.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/gov.ts index 72420cf055..e452f9afd0 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/gov.ts @@ -418,7 +418,7 @@ export const WeightedVoteOption = { fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { const message = createBaseWeightedVoteOption(); if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.weight !== undefined && object.weight !== null) { message.weight = object.weight; @@ -427,8 +427,8 @@ export const WeightedVoteOption = { }, toAmino(message: WeightedVoteOption): WeightedVoteOptionAmino { const obj: any = {}; - obj.option = message.option; - obj.weight = message.weight; + obj.option = message.option === 0 ? undefined : message.option; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption { @@ -538,8 +538,8 @@ export const TextProposal = { }, toAmino(message: TextProposal): TextProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: TextProposalAminoMsg): TextProposal { @@ -671,12 +671,12 @@ export const Deposit = { }, toAmino(message: Deposit): DepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -883,7 +883,7 @@ export const Proposal = { message.content = Any.fromAmino(object.content); } if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -905,16 +905,16 @@ export const Proposal = { }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.content = message.content ? Any.toAmino(message.content) : undefined; - obj.status = message.status; + obj.status = message.status === 0 ? undefined : message.status; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined; if (message.totalDeposit) { obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_deposit = []; + obj.total_deposit = message.totalDeposit; } obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined; obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined; @@ -1059,10 +1059,10 @@ export const TallyResult = { }, 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; + obj.yes = message.yes === "" ? undefined : message.yes; + obj.abstain = message.abstain === "" ? undefined : message.abstain; + obj.no = message.no === "" ? undefined : message.no; + obj.no_with_veto = message.noWithVeto === "" ? undefined : message.noWithVeto; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -1203,20 +1203,20 @@ export const Vote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } message.options = object.options?.map(e => WeightedVoteOption.fromAmino(e)) || []; return message; }, 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.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -1336,7 +1336,7 @@ export const DepositParams = { if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/query.ts index 52fefb3ffc..428ddf02eb 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/query.ts @@ -322,7 +322,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -543,7 +543,7 @@ export const QueryProposalsRequest = { fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { const message = createBaseQueryProposalsRequest(); if (object.proposal_status !== undefined && object.proposal_status !== null) { - message.proposalStatus = proposalStatusFromJSON(object.proposal_status); + message.proposalStatus = object.proposal_status; } if (object.voter !== undefined && object.voter !== null) { message.voter = object.voter; @@ -558,9 +558,9 @@ export const QueryProposalsRequest = { }, toAmino(message: QueryProposalsRequest): QueryProposalsRequestAmino { const obj: any = {}; - obj.proposal_status = message.proposalStatus; - obj.voter = message.voter; - obj.depositor = message.depositor; + obj.proposal_status = message.proposalStatus === 0 ? undefined : message.proposalStatus; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.depositor = message.depositor === "" ? undefined : message.depositor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -680,7 +680,7 @@ export const QueryProposalsResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -792,8 +792,8 @@ export const QueryVoteRequest = { }, toAmino(message: QueryVoteRequest): QueryVoteRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest { @@ -997,7 +997,7 @@ export const QueryVotesRequest = { }, toAmino(message: QueryVotesRequest): QueryVotesRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1117,7 +1117,7 @@ export const QueryVotesResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1213,7 +1213,7 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.params_type = message.paramsType; + obj.params_type = message.paramsType === "" ? undefined : message.paramsType; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -1451,8 +1451,8 @@ export const QueryDepositRequest = { }, toAmino(message: QueryDepositRequest): QueryDepositRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest { @@ -1656,7 +1656,7 @@ export const QueryDepositsRequest = { }, toAmino(message: QueryDepositsRequest): QueryDepositsRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1776,7 +1776,7 @@ export const QueryDepositsResponse = { if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1872,7 +1872,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/tx.ts index af79425790..adcf7333ea 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/tx.ts @@ -237,9 +237,9 @@ export const MsgSubmitProposal = { if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; + obj.proposer = message.proposer === "" ? undefined : message.proposer; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -333,7 +333,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -453,15 +453,15 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } return message; }, 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.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -666,12 +666,12 @@ export const MsgVoteWeighted = { }, toAmino(message: MsgVoteWeighted): MsgVoteWeightedAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -877,12 +877,12 @@ export const MsgDeposit = { }, toAmino(message: MsgDeposit): MsgDepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/events.ts b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/events.ts index fa1e90f565..99ade65b50 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/events.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/events.ts @@ -194,7 +194,7 @@ export const EventCreateGroup = { }, toAmino(message: EventCreateGroup): EventCreateGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: EventCreateGroupAminoMsg): EventCreateGroup { @@ -288,7 +288,7 @@ export const EventUpdateGroup = { }, toAmino(message: EventUpdateGroup): EventUpdateGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: EventUpdateGroupAminoMsg): EventUpdateGroup { @@ -382,7 +382,7 @@ export const EventCreateGroupPolicy = { }, toAmino(message: EventCreateGroupPolicy): EventCreateGroupPolicyAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventCreateGroupPolicyAminoMsg): EventCreateGroupPolicy { @@ -476,7 +476,7 @@ export const EventUpdateGroupPolicy = { }, toAmino(message: EventUpdateGroupPolicy): EventUpdateGroupPolicyAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventUpdateGroupPolicyAminoMsg): EventUpdateGroupPolicy { @@ -570,7 +570,7 @@ export const EventSubmitProposal = { }, toAmino(message: EventSubmitProposal): EventSubmitProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventSubmitProposalAminoMsg): EventSubmitProposal { @@ -664,7 +664,7 @@ export const EventWithdrawProposal = { }, toAmino(message: EventWithdrawProposal): EventWithdrawProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventWithdrawProposalAminoMsg): EventWithdrawProposal { @@ -758,7 +758,7 @@ export const EventVote = { }, toAmino(message: EventVote): EventVoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventVoteAminoMsg): EventVote { @@ -862,14 +862,14 @@ export const EventExec = { message.proposalId = BigInt(object.proposal_id); } if (object.result !== undefined && object.result !== null) { - message.result = proposalExecutorResultFromJSON(object.result); + message.result = object.result; } return message; }, toAmino(message: EventExec): EventExecAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.result = message.result; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.result = message.result === 0 ? undefined : message.result; return obj; }, fromAminoMsg(object: EventExecAminoMsg): EventExec { @@ -979,8 +979,8 @@ export const EventLeaveGroup = { }, toAmino(message: EventLeaveGroup): EventLeaveGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.address = message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventLeaveGroupAminoMsg): EventLeaveGroup { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/genesis.ts index 1715b47f45..426e7beb6f 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/genesis.ts @@ -256,33 +256,33 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.group_seq = message.groupSeq ? message.groupSeq.toString() : undefined; + obj.group_seq = message.groupSeq !== BigInt(0) ? message.groupSeq.toString() : undefined; if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } if (message.groupMembers) { obj.group_members = message.groupMembers.map(e => e ? GroupMember.toAmino(e) : undefined); } else { - obj.group_members = []; + obj.group_members = message.groupMembers; } - obj.group_policy_seq = message.groupPolicySeq ? message.groupPolicySeq.toString() : undefined; + obj.group_policy_seq = message.groupPolicySeq !== BigInt(0) ? message.groupPolicySeq.toString() : undefined; if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } - obj.proposal_seq = message.proposalSeq ? message.proposalSeq.toString() : undefined; + obj.proposal_seq = message.proposalSeq !== BigInt(0) ? message.proposalSeq.toString() : undefined; if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/query.ts index f7d6c2428f..341c2fd9a8 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/query.ts @@ -461,7 +461,7 @@ export const QueryGroupInfoRequest = { }, toAmino(message: QueryGroupInfoRequest): QueryGroupInfoRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGroupInfoRequestAminoMsg): QueryGroupInfoRequest { @@ -649,7 +649,7 @@ export const QueryGroupPolicyInfoRequest = { }, toAmino(message: QueryGroupPolicyInfoRequest): QueryGroupPolicyInfoRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryGroupPolicyInfoRequestAminoMsg): QueryGroupPolicyInfoRequest { @@ -853,7 +853,7 @@ export const QueryGroupMembersRequest = { }, toAmino(message: QueryGroupMembersRequest): QueryGroupMembersRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -973,7 +973,7 @@ export const QueryGroupMembersResponse = { if (message.members) { obj.members = message.members.map(e => e ? GroupMember.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1085,7 +1085,7 @@ export const QueryGroupsByAdminRequest = { }, toAmino(message: QueryGroupsByAdminRequest): QueryGroupsByAdminRequestAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1205,7 +1205,7 @@ export const QueryGroupsByAdminResponse = { if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1317,7 +1317,7 @@ export const QueryGroupPoliciesByGroupRequest = { }, toAmino(message: QueryGroupPoliciesByGroupRequest): QueryGroupPoliciesByGroupRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1437,7 +1437,7 @@ export const QueryGroupPoliciesByGroupResponse = { if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1549,7 +1549,7 @@ export const QueryGroupPoliciesByAdminRequest = { }, toAmino(message: QueryGroupPoliciesByAdminRequest): QueryGroupPoliciesByAdminRequestAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1669,7 +1669,7 @@ export const QueryGroupPoliciesByAdminResponse = { if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1765,7 +1765,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -1969,7 +1969,7 @@ export const QueryProposalsByGroupPolicyRequest = { }, toAmino(message: QueryProposalsByGroupPolicyRequest): QueryProposalsByGroupPolicyRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2089,7 +2089,7 @@ export const QueryProposalsByGroupPolicyResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2201,8 +2201,8 @@ export const QueryVoteByProposalVoterRequest = { }, toAmino(message: QueryVoteByProposalVoterRequest): QueryVoteByProposalVoterRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteByProposalVoterRequestAminoMsg): QueryVoteByProposalVoterRequest { @@ -2406,7 +2406,7 @@ export const QueryVotesByProposalRequest = { }, toAmino(message: QueryVotesByProposalRequest): QueryVotesByProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2526,7 +2526,7 @@ export const QueryVotesByProposalResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2638,7 +2638,7 @@ export const QueryVotesByVoterRequest = { }, toAmino(message: QueryVotesByVoterRequest): QueryVotesByVoterRequestAmino { const obj: any = {}; - obj.voter = message.voter; + obj.voter = message.voter === "" ? undefined : message.voter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2758,7 +2758,7 @@ export const QueryVotesByVoterResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2870,7 +2870,7 @@ export const QueryGroupsByMemberRequest = { }, toAmino(message: QueryGroupsByMemberRequest): QueryGroupsByMemberRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2990,7 +2990,7 @@ export const QueryGroupsByMemberResponse = { if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -3086,7 +3086,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/tx.ts index a4d3ec6f9e..3b09e110f6 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/tx.ts @@ -581,13 +581,13 @@ export const MsgCreateGroup = { }, toAmino(message: MsgCreateGroup): MsgCreateGroupAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgCreateGroupAminoMsg): MsgCreateGroup { @@ -681,7 +681,7 @@ export const MsgCreateGroupResponse = { }, toAmino(message: MsgCreateGroupResponse): MsgCreateGroupResponseAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateGroupResponseAminoMsg): MsgCreateGroupResponse { @@ -813,12 +813,12 @@ export const MsgUpdateGroupMembers = { }, toAmino(message: MsgUpdateGroupMembers): MsgUpdateGroupMembersAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; if (message.memberUpdates) { obj.member_updates = message.memberUpdates.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.member_updates = []; + obj.member_updates = message.memberUpdates; } return obj; }, @@ -1018,9 +1018,9 @@ export const MsgUpdateGroupAdmin = { }, 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; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgUpdateGroupAdminAminoMsg): MsgUpdateGroupAdmin { @@ -1219,9 +1219,9 @@ export const MsgUpdateGroupMetadata = { }, toAmino(message: MsgUpdateGroupMetadata): MsgUpdateGroupMetadataAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgUpdateGroupMetadataAminoMsg): MsgUpdateGroupMetadata { @@ -1436,9 +1436,9 @@ export const MsgCreateGroupPolicy = { }, 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.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; return obj; }, @@ -1533,7 +1533,7 @@ export const MsgCreateGroupPolicyResponse = { }, toAmino(message: MsgCreateGroupPolicyResponse): MsgCreateGroupPolicyResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: MsgCreateGroupPolicyResponseAminoMsg): MsgCreateGroupPolicyResponse { @@ -1659,9 +1659,9 @@ export const MsgUpdateGroupPolicyAdmin = { }, toAmino(message: MsgUpdateGroupPolicyAdmin): MsgUpdateGroupPolicyAdminAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; - obj.new_admin = message.newAdmin; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgUpdateGroupPolicyAdminAminoMsg): MsgUpdateGroupPolicyAdmin { @@ -1841,15 +1841,15 @@ export const MsgCreateGroupWithPolicy = { }, toAmino(message: MsgCreateGroupWithPolicy): MsgCreateGroupWithPolicyAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } - obj.group_metadata = message.groupMetadata; - obj.group_policy_metadata = message.groupPolicyMetadata; - obj.group_policy_as_admin = message.groupPolicyAsAdmin; + obj.group_metadata = message.groupMetadata === "" ? undefined : message.groupMetadata; + obj.group_policy_metadata = message.groupPolicyMetadata === "" ? undefined : message.groupPolicyMetadata; + obj.group_policy_as_admin = message.groupPolicyAsAdmin === false ? undefined : message.groupPolicyAsAdmin; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; return obj; }, @@ -1960,8 +1960,8 @@ export const MsgCreateGroupWithPolicyResponse = { }, toAmino(message: MsgCreateGroupWithPolicyResponse): MsgCreateGroupWithPolicyResponseAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.group_policy_address = message.groupPolicyAddress; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.group_policy_address = message.groupPolicyAddress === "" ? undefined : message.groupPolicyAddress; return obj; }, fromAminoMsg(object: MsgCreateGroupWithPolicyResponseAminoMsg): MsgCreateGroupWithPolicyResponse { @@ -2160,8 +2160,8 @@ export const MsgUpdateGroupPolicyDecisionPolicy = { }, toAmino(message: MsgUpdateGroupPolicyDecisionPolicy): MsgUpdateGroupPolicyDecisionPolicyAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; return obj; }, @@ -2361,9 +2361,9 @@ export const MsgUpdateGroupPolicyMetadata = { }, toAmino(message: MsgUpdateGroupPolicyMetadata): MsgUpdateGroupPolicyMetadataAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgUpdateGroupPolicyMetadataAminoMsg): MsgUpdateGroupPolicyMetadata { @@ -2600,25 +2600,25 @@ export const MsgSubmitProposal = { } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; if (object.exec !== undefined && object.exec !== null) { - message.exec = execFromJSON(object.exec); + message.exec = object.exec; } return message; }, toAmino(message: MsgSubmitProposal): MsgSubmitProposalAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.proposers) { obj.proposers = message.proposers.map(e => e); } else { - obj.proposers = []; + obj.proposers = message.proposers; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.exec = message.exec; + obj.exec = message.exec === 0 ? undefined : message.exec; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -2712,7 +2712,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -2822,8 +2822,8 @@ export const MsgWithdrawProposal = { }, toAmino(message: MsgWithdrawProposal): MsgWithdrawProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.address = message.address; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: MsgWithdrawProposalAminoMsg): MsgWithdrawProposal { @@ -3042,23 +3042,23 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; } if (object.exec !== undefined && object.exec !== null) { - message.exec = execFromJSON(object.exec); + message.exec = object.exec; } return message; }, 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; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.exec = message.exec === 0 ? undefined : message.exec; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -3241,8 +3241,8 @@ export const MsgExec = { }, toAmino(message: MsgExec): MsgExecAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.signer = message.signer; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgExecAminoMsg): MsgExec { @@ -3425,8 +3425,8 @@ export const MsgLeaveGroup = { }, toAmino(message: MsgLeaveGroup): MsgLeaveGroupAmino { const obj: any = {}; - obj.address = message.address; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLeaveGroupAminoMsg): MsgLeaveGroup { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/types.ts b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/types.ts index 095ea8126a..80899202ce 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/types.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/types.ts @@ -643,9 +643,9 @@ export const Member = { }, toAmino(message: Member): MemberAmino { const obj: any = {}; - obj.address = message.address; - obj.weight = message.weight; - obj.metadata = message.metadata; + obj.address = message.address === "" ? undefined : message.address; + obj.weight = message.weight === "" ? undefined : message.weight; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.added_at = message.addedAt ? Timestamp.toAmino(toTimestamp(message.addedAt)) : undefined; return obj; }, @@ -749,7 +749,7 @@ export const Members = { if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } return obj; }, @@ -860,7 +860,7 @@ export const ThresholdDecisionPolicy = { }, toAmino(message: ThresholdDecisionPolicy): ThresholdDecisionPolicyAmino { const obj: any = {}; - obj.threshold = message.threshold; + obj.threshold = message.threshold === "" ? undefined : message.threshold; obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined; return obj; }, @@ -971,7 +971,7 @@ export const PercentageDecisionPolicy = { }, toAmino(message: PercentageDecisionPolicy): PercentageDecisionPolicyAmino { const obj: any = {}; - obj.percentage = message.percentage; + obj.percentage = message.percentage === "" ? undefined : message.percentage; obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined; return obj; }, @@ -1257,11 +1257,11 @@ export const GroupInfo = { }, 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.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; obj.created_at = message.createdAt ? Timestamp.toAmino(toTimestamp(message.createdAt)) : undefined; return obj; }, @@ -1372,7 +1372,7 @@ export const GroupMember = { }, toAmino(message: GroupMember): GroupMemberAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.member = message.member ? Member.toAmino(message.member) : undefined; return obj; }, @@ -1563,11 +1563,11 @@ export const GroupPolicyInfo = { }, 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.address = message.address === "" ? undefined : message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; obj.created_at = message.createdAt ? Timestamp.toAmino(toTimestamp(message.createdAt)) : undefined; return obj; @@ -1848,10 +1848,10 @@ export const Proposal = { message.groupPolicyVersion = BigInt(object.group_policy_version); } if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.result !== undefined && object.result !== null) { - message.result = proposalResultFromJSON(object.result); + message.result = object.result; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -1860,33 +1860,33 @@ export const Proposal = { message.votingPeriodEnd = fromTimestamp(Timestamp.fromAmino(object.voting_period_end)); } if (object.executor_result !== undefined && object.executor_result !== null) { - message.executorResult = proposalExecutorResultFromJSON(object.executor_result); + message.executorResult = object.executor_result; } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; return message; }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.address = message.address; - obj.metadata = message.metadata; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.metadata = message.metadata === "" ? undefined : message.metadata; if (message.proposers) { obj.proposers = message.proposers.map(e => e); } else { - obj.proposers = []; + obj.proposers = message.proposers; } obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; - 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.group_version = message.groupVersion !== BigInt(0) ? message.groupVersion.toString() : undefined; + obj.group_policy_version = message.groupPolicyVersion !== BigInt(0) ? message.groupPolicyVersion.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.result = message.result === 0 ? undefined : message.result; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.voting_period_end = message.votingPeriodEnd ? Timestamp.toAmino(toTimestamp(message.votingPeriodEnd)) : undefined; - obj.executor_result = message.executorResult; + obj.executor_result = message.executorResult === 0 ? undefined : message.executorResult; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } return obj; }, @@ -2029,10 +2029,10 @@ export const TallyResult = { }, 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; + obj.yes_count = message.yesCount === "" ? undefined : message.yesCount; + obj.abstain_count = message.abstainCount === "" ? undefined : message.abstainCount; + obj.no_count = message.noCount === "" ? undefined : message.noCount; + obj.no_with_veto_count = message.noWithVetoCount === "" ? undefined : message.noWithVetoCount; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -2178,7 +2178,7 @@ export const Vote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; @@ -2190,10 +2190,10 @@ export const Vote = { }, 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.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/ics23/v1/proofs.ts b/__fixtures__/v-next/outputosmojs/cosmos/ics23/v1/proofs.ts index e58d5622cc..31bd2e33f5 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/ics23/v1/proofs.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/ics23/v1/proofs.ts @@ -661,7 +661,7 @@ export const ExistenceProof = { if (message.path) { obj.path = message.path.map(e => e ? InnerOp.toAmino(e) : undefined); } else { - obj.path = []; + obj.path = message.path; } return obj; }, @@ -1075,16 +1075,16 @@ export const LeafOp = { fromAmino(object: LeafOpAmino): LeafOp { const message = createBaseLeafOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prehash_key !== undefined && object.prehash_key !== null) { - message.prehashKey = hashOpFromJSON(object.prehash_key); + message.prehashKey = object.prehash_key; } if (object.prehash_value !== undefined && object.prehash_value !== null) { - message.prehashValue = hashOpFromJSON(object.prehash_value); + message.prehashValue = object.prehash_value; } if (object.length !== undefined && object.length !== null) { - message.length = lengthOpFromJSON(object.length); + message.length = object.length; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1093,10 +1093,10 @@ export const LeafOp = { }, 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.hash = message.hash === 0 ? undefined : message.hash; + obj.prehash_key = message.prehashKey === 0 ? undefined : message.prehashKey; + obj.prehash_value = message.prehashValue === 0 ? undefined : message.prehashValue; + obj.length = message.length === 0 ? undefined : message.length; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; }, @@ -1211,7 +1211,7 @@ export const InnerOp = { fromAmino(object: InnerOpAmino): InnerOp { const message = createBaseInnerOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1223,7 +1223,7 @@ export const InnerOp = { }, toAmino(message: InnerOp): InnerOpAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; obj.suffix = message.suffix ? base64FromBytes(message.suffix) : undefined; return obj; @@ -1369,8 +1369,8 @@ export const ProofSpec = { 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; + obj.max_depth = message.maxDepth === 0 ? undefined : message.maxDepth; + obj.min_depth = message.minDepth === 0 ? undefined : message.minDepth; return obj; }, fromAminoMsg(object: ProofSpecAminoMsg): ProofSpec { @@ -1553,7 +1553,7 @@ export const InnerSpec = { message.emptyChild = bytesFromBase64(object.empty_child); } if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } return message; }, @@ -1562,13 +1562,13 @@ export const InnerSpec = { if (message.childOrder) { obj.child_order = message.childOrder.map(e => e); } else { - obj.child_order = []; + obj.child_order = message.childOrder; } - obj.child_size = message.childSize; - obj.min_prefix_length = message.minPrefixLength; - obj.max_prefix_length = message.maxPrefixLength; + obj.child_size = message.childSize === 0 ? undefined : message.childSize; + obj.min_prefix_length = message.minPrefixLength === 0 ? undefined : message.minPrefixLength; + obj.max_prefix_length = message.maxPrefixLength === 0 ? undefined : message.maxPrefixLength; obj.empty_child = message.emptyChild ? base64FromBytes(message.emptyChild) : undefined; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; return obj; }, fromAminoMsg(object: InnerSpecAminoMsg): InnerSpec { @@ -1671,7 +1671,7 @@ export const BatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? BatchEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1908,12 +1908,12 @@ export const CompressedBatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? CompressedBatchEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.lookupInners) { obj.lookup_inners = message.lookupInners.map(e => e ? InnerOp.toAmino(e) : undefined); } else { - obj.lookup_inners = []; + obj.lookup_inners = message.lookupInners; } return obj; }, @@ -2188,7 +2188,7 @@ export const CompressedExistenceProof = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/mint.ts index cf5cbd290d..684f6af8b8 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/mint.ts @@ -131,8 +131,8 @@ export const Minter = { }, toAmino(message: Minter): MinterAmino { const obj: any = {}; - obj.inflation = message.inflation; - obj.annual_provisions = message.annualProvisions; + obj.inflation = message.inflation === "" ? undefined : message.inflation; + obj.annual_provisions = message.annualProvisions === "" ? undefined : message.annualProvisions; return obj; }, fromAminoMsg(object: MinterAminoMsg): Minter { @@ -306,12 +306,12 @@ export const Params = { }, 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; + obj.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; + obj.inflation_rate_change = message.inflationRateChange === "" ? undefined : message.inflationRateChange; + obj.inflation_max = message.inflationMax === "" ? undefined : message.inflationMax; + obj.inflation_min = message.inflationMin === "" ? undefined : message.inflationMin; + obj.goal_bonded = message.goalBonded === "" ? undefined : message.goalBonded; + obj.blocks_per_year = message.blocksPerYear !== BigInt(0) ? message.blocksPerYear.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/event.ts b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/event.ts index 76591e952e..002e8cc120 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/event.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/event.ts @@ -168,10 +168,10 @@ export const EventSend = { }, toAmino(message: EventSend): EventSendAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: EventSendAminoMsg): EventSend { @@ -297,9 +297,9 @@ export const EventMint = { }, toAmino(message: EventMint): EventMintAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: EventMintAminoMsg): EventMint { @@ -425,9 +425,9 @@ export const EventBurn = { }, toAmino(message: EventBurn): EventBurnAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: EventBurnAminoMsg): EventBurn { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/genesis.ts index 88a06e4951..5d01ac2e0a 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/genesis.ts @@ -133,12 +133,12 @@ export const GenesisState = { if (message.classes) { obj.classes = message.classes.map(e => e ? Class.toAmino(e) : undefined); } else { - obj.classes = []; + obj.classes = message.classes; } if (message.entries) { obj.entries = message.entries.map(e => e ? Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -255,11 +255,11 @@ export const Entry = { }, toAmino(message: Entry): EntryAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; if (message.nfts) { obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e) : undefined); } else { - obj.nfts = []; + obj.nfts = message.nfts; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/nft.ts b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/nft.ts index e895fcd12e..76e5dd82e1 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/nft.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/nft.ts @@ -223,12 +223,12 @@ export const Class = { }, 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.id = message.id === "" ? undefined : message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.symbol = message.symbol === "" ? undefined : message.symbol; + obj.description = message.description === "" ? undefined : message.description; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; obj.data = message.data ? Any.toAmino(message.data) : undefined; return obj; }, @@ -387,10 +387,10 @@ export const NFT = { }, 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.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; obj.data = message.data ? Any.toAmino(message.data) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/query.ts index 54f35a00cc..d8db51c510 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/query.ts @@ -271,8 +271,8 @@ export const QueryBalanceRequest = { }, toAmino(message: QueryBalanceRequest): QueryBalanceRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest { @@ -366,7 +366,7 @@ export const QueryBalanceResponse = { }, toAmino(message: QueryBalanceResponse): QueryBalanceResponseAmino { const obj: any = {}; - obj.amount = message.amount ? message.amount.toString() : undefined; + obj.amount = message.amount !== BigInt(0) ? message.amount.toString() : undefined; return obj; }, fromAminoMsg(object: QueryBalanceResponseAminoMsg): QueryBalanceResponse { @@ -476,8 +476,8 @@ export const QueryOwnerRequest = { }, toAmino(message: QueryOwnerRequest): QueryOwnerRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: QueryOwnerRequestAminoMsg): QueryOwnerRequest { @@ -571,7 +571,7 @@ export const QueryOwnerResponse = { }, toAmino(message: QueryOwnerResponse): QueryOwnerResponseAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryOwnerResponseAminoMsg): QueryOwnerResponse { @@ -665,7 +665,7 @@ export const QuerySupplyRequest = { }, toAmino(message: QuerySupplyRequest): QuerySupplyRequestAmino { const obj: any = {}; - obj.class_id = message.classId; + obj.class_id = message.classId === "" ? undefined : message.classId; return obj; }, fromAminoMsg(object: QuerySupplyRequestAminoMsg): QuerySupplyRequest { @@ -759,7 +759,7 @@ export const QuerySupplyResponse = { }, toAmino(message: QuerySupplyResponse): QuerySupplyResponseAmino { const obj: any = {}; - obj.amount = message.amount ? message.amount.toString() : undefined; + obj.amount = message.amount !== BigInt(0) ? message.amount.toString() : undefined; return obj; }, fromAminoMsg(object: QuerySupplyResponseAminoMsg): QuerySupplyResponse { @@ -885,8 +885,8 @@ export const QueryNFTsRequest = { }, toAmino(message: QueryNFTsRequest): QueryNFTsRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.owner = message.owner === "" ? undefined : message.owner; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1006,7 +1006,7 @@ export const QueryNFTsResponse = { if (message.nfts) { obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e) : undefined); } else { - obj.nfts = []; + obj.nfts = message.nfts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1118,8 +1118,8 @@ export const QueryNFTRequest = { }, toAmino(message: QueryNFTRequest): QueryNFTRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: QueryNFTRequestAminoMsg): QueryNFTRequest { @@ -1307,7 +1307,7 @@ export const QueryClassRequest = { }, toAmino(message: QueryClassRequest): QueryClassRequestAmino { const obj: any = {}; - obj.class_id = message.classId; + obj.class_id = message.classId === "" ? undefined : message.classId; return obj; }, fromAminoMsg(object: QueryClassRequestAminoMsg): QueryClassRequest { @@ -1614,7 +1614,7 @@ export const QueryClassesResponse = { if (message.classes) { obj.classes = message.classes.map(e => e ? Class.toAmino(e) : undefined); } else { - obj.classes = []; + obj.classes = message.classes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/tx.ts index 526992d90c..06eefbb691 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/tx.ts @@ -148,10 +148,10 @@ export const MsgSend = { }, toAmino(message: MsgSend): MsgSendAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: MsgSendAminoMsg): MsgSend { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/orm/v1/orm.ts b/__fixtures__/v-next/outputosmojs/cosmos/orm/v1/orm.ts index dca94906f6..56cf24cf56 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/orm/v1/orm.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/orm/v1/orm.ts @@ -236,9 +236,9 @@ export const TableDescriptor = { if (message.index) { obj.index = message.index.map(e => e ? SecondaryIndexDescriptor.toAmino(e) : undefined); } else { - obj.index = []; + obj.index = message.index; } - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: TableDescriptorAminoMsg): TableDescriptor { @@ -348,8 +348,8 @@ export const PrimaryKeyDescriptor = { }, toAmino(message: PrimaryKeyDescriptor): PrimaryKeyDescriptorAmino { const obj: any = {}; - obj.fields = message.fields; - obj.auto_increment = message.autoIncrement; + obj.fields = message.fields === "" ? undefined : message.fields; + obj.auto_increment = message.autoIncrement === false ? undefined : message.autoIncrement; return obj; }, fromAminoMsg(object: PrimaryKeyDescriptorAminoMsg): PrimaryKeyDescriptor { @@ -475,9 +475,9 @@ export const SecondaryIndexDescriptor = { }, toAmino(message: SecondaryIndexDescriptor): SecondaryIndexDescriptorAmino { const obj: any = {}; - obj.fields = message.fields; - obj.id = message.id; - obj.unique = message.unique; + obj.fields = message.fields === "" ? undefined : message.fields; + obj.id = message.id === 0 ? undefined : message.id; + obj.unique = message.unique === false ? undefined : message.unique; return obj; }, fromAminoMsg(object: SecondaryIndexDescriptorAminoMsg): SecondaryIndexDescriptor { @@ -571,7 +571,7 @@ export const SingletonDescriptor = { }, toAmino(message: SingletonDescriptor): SingletonDescriptorAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: SingletonDescriptorAminoMsg): SingletonDescriptor { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/orm/v1alpha1/schema.ts b/__fixtures__/v-next/outputosmojs/cosmos/orm/v1alpha1/schema.ts index 7e768eb6bc..94980f501d 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/orm/v1alpha1/schema.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/orm/v1alpha1/schema.ts @@ -227,7 +227,7 @@ export const ModuleSchemaDescriptor = { if (message.schemaFile) { obj.schema_file = message.schemaFile.map(e => e ? ModuleSchemaDescriptor_FileEntry.toAmino(e) : undefined); } else { - obj.schema_file = []; + obj.schema_file = message.schemaFile; } obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; @@ -349,15 +349,15 @@ export const ModuleSchemaDescriptor_FileEntry = { message.protoFileName = object.proto_file_name; } if (object.storage_type !== undefined && object.storage_type !== null) { - message.storageType = storageTypeFromJSON(object.storage_type); + message.storageType = object.storage_type; } return message; }, toAmino(message: ModuleSchemaDescriptor_FileEntry): ModuleSchemaDescriptor_FileEntryAmino { const obj: any = {}; - obj.id = message.id; - obj.proto_file_name = message.protoFileName; - obj.storage_type = message.storageType; + obj.id = message.id === 0 ? undefined : message.id; + obj.proto_file_name = message.protoFileName === "" ? undefined : message.protoFileName; + obj.storage_type = message.storageType === 0 ? undefined : message.storageType; return obj; }, fromAminoMsg(object: ModuleSchemaDescriptor_FileEntryAminoMsg): ModuleSchemaDescriptor_FileEntry { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/params.ts b/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/params.ts index 5a8c89034b..deffe0c13f 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/params.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/params.ts @@ -146,12 +146,12 @@ export const ParameterChangeProposal = { }, toAmino(message: ParameterChangeProposal): ParameterChangeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.changes) { obj.changes = message.changes.map(e => e ? ParamChange.toAmino(e) : undefined); } else { - obj.changes = []; + obj.changes = message.changes; } return obj; }, @@ -278,9 +278,9 @@ export const ParamChange = { }, toAmino(message: ParamChange): ParamChangeAmino { const obj: any = {}; - obj.subspace = message.subspace; - obj.key = message.key; - obj.value = message.value; + obj.subspace = message.subspace === "" ? undefined : message.subspace; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: ParamChangeAminoMsg): ParamChange { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/query.ts index f973f7bbd5..a58d62676b 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/query.ts @@ -168,8 +168,8 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.subspace = message.subspace; - obj.key = message.key; + obj.subspace = message.subspace === "" ? undefined : message.subspace; + obj.key = message.key === "" ? undefined : message.key; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -439,7 +439,7 @@ export const QuerySubspacesResponse = { if (message.subspaces) { obj.subspaces = message.subspaces.map(e => e ? Subspace.toAmino(e) : undefined); } else { - obj.subspaces = []; + obj.subspaces = message.subspaces; } return obj; }, @@ -556,11 +556,11 @@ export const Subspace = { }, toAmino(message: Subspace): SubspaceAmino { const obj: any = {}; - obj.subspace = message.subspace; + obj.subspace = message.subspace === "" ? undefined : message.subspace; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/genesis.ts index a84e0abb2c..b5cf799c7c 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/genesis.ts @@ -198,12 +198,12 @@ export const GenesisState = { if (message.signingInfos) { obj.signing_infos = message.signingInfos.map(e => e ? SigningInfo.toAmino(e) : undefined); } else { - obj.signing_infos = []; + obj.signing_infos = message.signingInfos; } if (message.missedBlocks) { obj.missed_blocks = message.missedBlocks.map(e => e ? ValidatorMissedBlocks.toAmino(e) : undefined); } else { - obj.missed_blocks = []; + obj.missed_blocks = message.missedBlocks; } return obj; }, @@ -314,7 +314,7 @@ export const SigningInfo = { }, toAmino(message: SigningInfo): SigningInfoAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.validator_signing_info = message.validatorSigningInfo ? ValidatorSigningInfo.toAmino(message.validatorSigningInfo) : undefined; return obj; }, @@ -431,11 +431,11 @@ export const ValidatorMissedBlocks = { }, toAmino(message: ValidatorMissedBlocks): ValidatorMissedBlocksAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.missedBlocks) { obj.missed_blocks = message.missedBlocks.map(e => e ? MissedBlock.toAmino(e) : undefined); } else { - obj.missed_blocks = []; + obj.missed_blocks = message.missedBlocks; } return obj; }, @@ -546,8 +546,8 @@ export const MissedBlock = { }, toAmino(message: MissedBlock): MissedBlockAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; - obj.missed = message.missed; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; + obj.missed = message.missed === false ? undefined : message.missed; return obj; }, fromAminoMsg(object: MissedBlockAminoMsg): MissedBlock { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/query.ts index 5962d2ffe9..1283775958 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/query.ts @@ -336,7 +336,7 @@ export const QuerySigningInfoRequest = { }, toAmino(message: QuerySigningInfoRequest): QuerySigningInfoRequestAmino { const obj: any = {}; - obj.cons_address = message.consAddress; + obj.cons_address = message.consAddress === "" ? undefined : message.consAddress; return obj; }, fromAminoMsg(object: QuerySigningInfoRequestAminoMsg): QuerySigningInfoRequest { @@ -643,7 +643,7 @@ export const QuerySigningInfosResponse = { if (message.info) { obj.info = message.info.map(e => e ? ValidatorSigningInfo.toAmino(e) : undefined); } else { - obj.info = []; + obj.info = message.info; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/slashing.ts b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/slashing.ts index 5650ad4673..60a6d7b15f 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/slashing.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/slashing.ts @@ -215,12 +215,12 @@ export const ValidatorSigningInfo = { }, 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.address = message.address === "" ? undefined : message.address; + obj.start_height = message.startHeight !== BigInt(0) ? message.startHeight.toString() : undefined; + obj.index_offset = message.indexOffset !== BigInt(0) ? message.indexOffset.toString() : undefined; obj.jailed_until = message.jailedUntil ? Timestamp.toAmino(toTimestamp(message.jailedUntil)) : undefined; - obj.tombstoned = message.tombstoned; - obj.missed_blocks_counter = message.missedBlocksCounter ? message.missedBlocksCounter.toString() : undefined; + obj.tombstoned = message.tombstoned === false ? undefined : message.tombstoned; + obj.missed_blocks_counter = message.missedBlocksCounter !== BigInt(0) ? message.missedBlocksCounter.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorSigningInfoAminoMsg): ValidatorSigningInfo { @@ -378,7 +378,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.signed_blocks_window = message.signedBlocksWindow ? message.signedBlocksWindow.toString() : undefined; + obj.signed_blocks_window = message.signedBlocksWindow !== BigInt(0) ? message.signedBlocksWindow.toString() : undefined; obj.min_signed_per_window = message.minSignedPerWindow ? base64FromBytes(message.minSignedPerWindow) : undefined; obj.downtime_jail_duration = message.downtimeJailDuration ? Duration.toAmino(message.downtimeJailDuration) : undefined; obj.slash_fraction_double_sign = message.slashFractionDoubleSign ? base64FromBytes(message.slashFractionDoubleSign) : undefined; diff --git a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/tx.ts index 56364813f3..f6091360f7 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/tx.ts @@ -90,7 +90,7 @@ export const MsgUnjail = { }, toAmino(message: MsgUnjail): MsgUnjailAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr ?? ""; return obj; }, fromAminoMsg(object: MsgUnjailAminoMsg): MsgUnjail { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/authz.ts b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/authz.ts index ab65679178..dd8583fa84 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/authz.ts @@ -213,7 +213,7 @@ export const StakeAuthorization = { message.denyList = StakeAuthorization_Validators.fromAmino(object.deny_list); } if (object.authorization_type !== undefined && object.authorization_type !== null) { - message.authorizationType = authorizationTypeFromJSON(object.authorization_type); + message.authorizationType = object.authorization_type; } return message; }, @@ -222,7 +222,7 @@ export const StakeAuthorization = { 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; + obj.authorization_type = message.authorizationType === 0 ? undefined : message.authorizationType; return obj; }, fromAminoMsg(object: StakeAuthorizationAminoMsg): StakeAuthorization { @@ -325,7 +325,7 @@ export const StakeAuthorization_Validators = { if (message.address) { obj.address = message.address.map(e => e); } else { - obj.address = []; + obj.address = message.address; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/genesis.ts index 06b3844220..8ae04683d9 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/genesis.ts @@ -273,29 +273,29 @@ export const GenesisState = { if (message.lastValidatorPowers) { obj.last_validator_powers = message.lastValidatorPowers.map(e => e ? LastValidatorPower.toAmino(e) : undefined); } else { - obj.last_validator_powers = []; + obj.last_validator_powers = message.lastValidatorPowers; } if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } if (message.delegations) { obj.delegations = message.delegations.map(e => e ? Delegation.toAmino(e) : undefined); } else { - obj.delegations = []; + obj.delegations = message.delegations; } if (message.unbondingDelegations) { obj.unbonding_delegations = message.unbondingDelegations.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_delegations = []; + obj.unbonding_delegations = message.unbondingDelegations; } if (message.redelegations) { obj.redelegations = message.redelegations.map(e => e ? Redelegation.toAmino(e) : undefined); } else { - obj.redelegations = []; + obj.redelegations = message.redelegations; } - obj.exported = message.exported; + obj.exported = message.exported === false ? undefined : message.exported; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -405,8 +405,8 @@ export const LastValidatorPower = { }, toAmino(message: LastValidatorPower): LastValidatorPowerAmino { const obj: any = {}; - obj.address = message.address; - obj.power = message.power ? message.power.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: LastValidatorPowerAminoMsg): LastValidatorPower { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/query.ts index ac3c416915..d067a67dc0 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/query.ts @@ -603,7 +603,7 @@ export const QueryValidatorsRequest = { }, toAmino(message: QueryValidatorsRequest): QueryValidatorsRequestAmino { const obj: any = {}; - obj.status = message.status; + obj.status = message.status === "" ? undefined : message.status; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -723,7 +723,7 @@ export const QueryValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -819,7 +819,7 @@ export const QueryValidatorRequest = { }, toAmino(message: QueryValidatorRequest): QueryValidatorRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryValidatorRequestAminoMsg): QueryValidatorRequest { @@ -1023,7 +1023,7 @@ export const QueryValidatorDelegationsRequest = { }, toAmino(message: QueryValidatorDelegationsRequest): QueryValidatorDelegationsRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1143,7 +1143,7 @@ export const QueryValidatorDelegationsResponse = { if (message.delegationResponses) { obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_responses = []; + obj.delegation_responses = message.delegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1255,7 +1255,7 @@ export const QueryValidatorUnbondingDelegationsRequest = { }, toAmino(message: QueryValidatorUnbondingDelegationsRequest): QueryValidatorUnbondingDelegationsRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1375,7 +1375,7 @@ export const QueryValidatorUnbondingDelegationsResponse = { if (message.unbondingResponses) { obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_responses = []; + obj.unbonding_responses = message.unbondingResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1487,8 +1487,8 @@ export const QueryDelegationRequest = { }, toAmino(message: QueryDelegationRequest): QueryDelegationRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryDelegationRequestAminoMsg): QueryDelegationRequest { @@ -1692,8 +1692,8 @@ export const QueryUnbondingDelegationRequest = { }, toAmino(message: QueryUnbondingDelegationRequest): QueryUnbondingDelegationRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryUnbondingDelegationRequestAminoMsg): QueryUnbondingDelegationRequest { @@ -1897,7 +1897,7 @@ export const QueryDelegatorDelegationsRequest = { }, toAmino(message: QueryDelegatorDelegationsRequest): QueryDelegatorDelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2017,7 +2017,7 @@ export const QueryDelegatorDelegationsResponse = { if (message.delegationResponses) { obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_responses = []; + obj.delegation_responses = message.delegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2129,7 +2129,7 @@ export const QueryDelegatorUnbondingDelegationsRequest = { }, toAmino(message: QueryDelegatorUnbondingDelegationsRequest): QueryDelegatorUnbondingDelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2249,7 +2249,7 @@ export const QueryDelegatorUnbondingDelegationsResponse = { if (message.unbondingResponses) { obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_responses = []; + obj.unbonding_responses = message.unbondingResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2393,9 +2393,9 @@ export const QueryRedelegationsRequest = { }, 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.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.src_validator_addr = message.srcValidatorAddr === "" ? undefined : message.srcValidatorAddr; + obj.dst_validator_addr = message.dstValidatorAddr === "" ? undefined : message.dstValidatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2515,7 +2515,7 @@ export const QueryRedelegationsResponse = { if (message.redelegationResponses) { obj.redelegation_responses = message.redelegationResponses.map(e => e ? RedelegationResponse.toAmino(e) : undefined); } else { - obj.redelegation_responses = []; + obj.redelegation_responses = message.redelegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2627,7 +2627,7 @@ export const QueryDelegatorValidatorsRequest = { }, toAmino(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2747,7 +2747,7 @@ export const QueryDelegatorValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2859,8 +2859,8 @@ export const QueryDelegatorValidatorRequest = { }, toAmino(message: QueryDelegatorValidatorRequest): QueryDelegatorValidatorRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryDelegatorValidatorRequestAminoMsg): QueryDelegatorValidatorRequest { @@ -3048,7 +3048,7 @@ export const QueryHistoricalInfoRequest = { }, toAmino(message: QueryHistoricalInfoRequest): QueryHistoricalInfoRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: QueryHistoricalInfoRequestAminoMsg): QueryHistoricalInfoRequest { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/staking.ts index beb4621128..730936a756 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/staking.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/staking.ts @@ -622,7 +622,7 @@ export const HistoricalInfo = { if (message.valset) { obj.valset = message.valset.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.valset = []; + obj.valset = message.valset; } return obj; }, @@ -749,9 +749,9 @@ export const CommissionRates = { }, toAmino(message: CommissionRates): CommissionRatesAmino { const obj: any = {}; - obj.rate = message.rate; - obj.max_rate = message.maxRate; - obj.max_change_rate = message.maxChangeRate; + obj.rate = message.rate === "" ? undefined : message.rate; + obj.max_rate = message.maxRate === "" ? undefined : message.maxRate; + obj.max_change_rate = message.maxChangeRate === "" ? undefined : message.maxChangeRate; return obj; }, fromAminoMsg(object: CommissionRatesAminoMsg): CommissionRates { @@ -1020,11 +1020,11 @@ export const Description = { }, 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; + obj.moniker = message.moniker === "" ? undefined : message.moniker; + obj.identity = message.identity === "" ? undefined : message.identity; + obj.website = message.website === "" ? undefined : message.website; + obj.security_contact = message.securityContact === "" ? undefined : message.securityContact; + obj.details = message.details === "" ? undefined : message.details; return obj; }, fromAminoMsg(object: DescriptionAminoMsg): Description { @@ -1251,7 +1251,7 @@ export const Validator = { message.jailed = object.jailed; } if (object.status !== undefined && object.status !== null) { - message.status = bondStatusFromJSON(object.status); + message.status = object.status; } if (object.tokens !== undefined && object.tokens !== null) { message.tokens = object.tokens; @@ -1278,17 +1278,17 @@ export const Validator = { }, toAmino(message: Validator): ValidatorAmino { const obj: any = {}; - obj.operator_address = message.operatorAddress; + obj.operator_address = message.operatorAddress === "" ? undefined : 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.jailed = message.jailed === false ? undefined : message.jailed; + obj.status = message.status === 0 ? undefined : message.status; + obj.tokens = message.tokens === "" ? undefined : message.tokens; + obj.delegator_shares = message.delegatorShares === "" ? undefined : message.delegatorShares; obj.description = message.description ? Description.toAmino(message.description) : undefined; - obj.unbonding_height = message.unbondingHeight ? message.unbondingHeight.toString() : undefined; + obj.unbonding_height = message.unbondingHeight !== BigInt(0) ? message.unbondingHeight.toString() : undefined; obj.unbonding_time = message.unbondingTime ? Timestamp.toAmino(toTimestamp(message.unbondingTime)) : undefined; obj.commission = message.commission ? Commission.toAmino(message.commission) : undefined; - obj.min_self_delegation = message.minSelfDelegation; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -1391,7 +1391,7 @@ export const ValAddresses = { if (message.addresses) { obj.addresses = message.addresses.map(e => e); } else { - obj.addresses = []; + obj.addresses = message.addresses; } return obj; }, @@ -1502,8 +1502,8 @@ export const DVPair = { }, toAmino(message: DVPair): DVPairAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: DVPairAminoMsg): DVPair { @@ -1606,7 +1606,7 @@ export const DVPairs = { if (message.pairs) { obj.pairs = message.pairs.map(e => e ? DVPair.toAmino(e) : undefined); } else { - obj.pairs = []; + obj.pairs = message.pairs; } return obj; }, @@ -1733,9 +1733,9 @@ export const DVVTriplet = { }, toAmino(message: DVVTriplet): DVVTripletAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; return obj; }, fromAminoMsg(object: DVVTripletAminoMsg): DVVTriplet { @@ -1838,7 +1838,7 @@ export const DVVTriplets = { if (message.triplets) { obj.triplets = message.triplets.map(e => e ? DVVTriplet.toAmino(e) : undefined); } else { - obj.triplets = []; + obj.triplets = message.triplets; } return obj; }, @@ -1965,9 +1965,9 @@ export const Delegation = { }, toAmino(message: Delegation): DelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.shares = message.shares; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.shares = message.shares === "" ? undefined : message.shares; return obj; }, fromAminoMsg(object: DelegationAminoMsg): Delegation { @@ -2099,12 +2099,12 @@ export const UnbondingDelegation = { }, toAmino(message: UnbondingDelegation): UnbondingDelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.entries) { obj.entries = message.entries.map(e => e ? UnbondingDelegationEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2247,10 +2247,10 @@ export const UnbondingDelegationEntry = { }, toAmino(message: UnbondingDelegationEntry): UnbondingDelegationEntryAmino { const obj: any = {}; - obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.creation_height = message.creationHeight !== BigInt(0) ? message.creationHeight.toString() : undefined; obj.completion_time = message.completionTime ? Timestamp.toAmino(toTimestamp(message.completionTime)) : undefined; - obj.initial_balance = message.initialBalance; - obj.balance = message.balance; + obj.initial_balance = message.initialBalance === "" ? undefined : message.initialBalance; + obj.balance = message.balance === "" ? undefined : message.balance; return obj; }, fromAminoMsg(object: UnbondingDelegationEntryAminoMsg): UnbondingDelegationEntry { @@ -2392,10 +2392,10 @@ export const RedelegationEntry = { }, toAmino(message: RedelegationEntry): RedelegationEntryAmino { const obj: any = {}; - obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.creation_height = message.creationHeight !== BigInt(0) ? message.creationHeight.toString() : undefined; obj.completion_time = message.completionTime ? Timestamp.toAmino(toTimestamp(message.completionTime)) : undefined; - obj.initial_balance = message.initialBalance; - obj.shares_dst = message.sharesDst; + obj.initial_balance = message.initialBalance === "" ? undefined : message.initialBalance; + obj.shares_dst = message.sharesDst === "" ? undefined : message.sharesDst; return obj; }, fromAminoMsg(object: RedelegationEntryAminoMsg): RedelegationEntry { @@ -2543,13 +2543,13 @@ export const Redelegation = { }, toAmino(message: Redelegation): RedelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; if (message.entries) { obj.entries = message.entries.map(e => e ? RedelegationEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2725,11 +2725,11 @@ export const Params = { 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; + obj.max_validators = message.maxValidators === 0 ? undefined : message.maxValidators; + obj.max_entries = message.maxEntries === 0 ? undefined : message.maxEntries; + obj.historical_entries = message.historicalEntries === 0 ? undefined : message.historicalEntries; + obj.bond_denom = message.bondDenom === "" ? undefined : message.bondDenom; + obj.min_commission_rate = message.minCommissionRate === "" ? undefined : message.minCommissionRate; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -2951,7 +2951,7 @@ export const RedelegationEntryResponse = { toAmino(message: RedelegationEntryResponse): RedelegationEntryResponseAmino { const obj: any = {}; obj.redelegation_entry = message.redelegationEntry ? RedelegationEntry.toAmino(message.redelegationEntry) : undefined; - obj.balance = message.balance; + obj.balance = message.balance === "" ? undefined : message.balance; return obj; }, fromAminoMsg(object: RedelegationEntryResponseAminoMsg): RedelegationEntryResponse { @@ -3071,7 +3071,7 @@ export const RedelegationResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? RedelegationEntryResponse.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -3182,8 +3182,8 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.not_bonded_tokens = message.notBondedTokens; - obj.bonded_tokens = message.bondedTokens; + obj.not_bonded_tokens = message.notBondedTokens ?? ""; + obj.bonded_tokens = message.bondedTokens ?? ""; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/tx.ts index 0dc8c8f7d7..65f3036687 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/tx.ts @@ -338,9 +338,9 @@ export const MsgCreateValidator = { 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.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; obj.value = message.value ? Coin.toAmino(message.value) : undefined; return obj; @@ -558,9 +558,9 @@ export const MsgEditValidator = { 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; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.commission_rate = message.commissionRate === "" ? undefined : message.commissionRate; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; return obj; }, fromAminoMsg(object: MsgEditValidatorAminoMsg): MsgEditValidator { @@ -759,8 +759,8 @@ export const MsgDelegate = { }, toAmino(message: MsgDelegate): MsgDelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -976,9 +976,9 @@ export const MsgBeginRedelegate = { }, 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.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -1199,8 +1199,8 @@ export const MsgUndelegate = { }, toAmino(message: MsgUndelegate): MsgUndelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, 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 8f45a965ef..0b69c9bfc6 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/tx/signing/v1beta1/signing.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/tx/signing/v1beta1/signing.ts @@ -258,7 +258,7 @@ export const SignatureDescriptors = { if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor.toAmino(e) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -387,7 +387,7 @@ export const SignatureDescriptor = { 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; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureDescriptorAminoMsg): SignatureDescriptor { @@ -599,7 +599,7 @@ export const SignatureDescriptor_Data_Single = { fromAmino(object: SignatureDescriptor_Data_SingleAmino): SignatureDescriptor_Data_Single { const message = createBaseSignatureDescriptor_Data_Single(); if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.signature !== undefined && object.signature !== null) { message.signature = bytesFromBase64(object.signature); @@ -608,7 +608,7 @@ export const SignatureDescriptor_Data_Single = { }, toAmino(message: SignatureDescriptor_Data_Single): SignatureDescriptor_Data_SingleAmino { const obj: any = {}; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; return obj; }, @@ -729,7 +729,7 @@ export const SignatureDescriptor_Data_Multi = { if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor_Data.toAmino(e) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/service.ts b/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/service.ts index 411fe97635..85b244d189 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/service.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/service.ts @@ -436,7 +436,7 @@ export const GetTxsEventRequest = { message.pagination = PageRequest.fromAmino(object.pagination); } if (object.order_by !== undefined && object.order_by !== null) { - message.orderBy = orderByFromJSON(object.order_by); + message.orderBy = object.order_by; } return message; }, @@ -445,10 +445,10 @@ export const GetTxsEventRequest = { if (message.events) { obj.events = message.events.map(e => e); } else { - obj.events = []; + obj.events = message.events; } obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; - obj.order_by = message.orderBy; + obj.order_by = message.orderBy === 0 ? undefined : message.orderBy; return obj; }, fromAminoMsg(object: GetTxsEventRequestAminoMsg): GetTxsEventRequest { @@ -589,12 +589,12 @@ export const GetTxsEventResponse = { if (message.txs) { obj.txs = message.txs.map(e => e ? Tx.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } if (message.txResponses) { obj.tx_responses = message.txResponses.map(e => e ? TxResponse.toAmino(e) : undefined); } else { - obj.tx_responses = []; + obj.tx_responses = message.txResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -700,14 +700,14 @@ export const BroadcastTxRequest = { message.txBytes = bytesFromBase64(object.tx_bytes); } if (object.mode !== undefined && object.mode !== null) { - message.mode = broadcastModeFromJSON(object.mode); + message.mode = object.mode; } return message; }, toAmino(message: BroadcastTxRequest): BroadcastTxRequestAmino { const obj: any = {}; obj.tx_bytes = message.txBytes ? base64FromBytes(message.txBytes) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; return obj; }, fromAminoMsg(object: BroadcastTxRequestAminoMsg): BroadcastTxRequest { @@ -1117,7 +1117,7 @@ export const GetTxRequest = { }, toAmino(message: GetTxRequest): GetTxRequestAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === "" ? undefined : message.hash; return obj; }, fromAminoMsg(object: GetTxRequestAminoMsg): GetTxRequest { @@ -1338,7 +1338,7 @@ export const GetBlockWithTxsRequest = { }, toAmino(message: GetBlockWithTxsRequest): GetBlockWithTxsRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1490,7 +1490,7 @@ export const GetBlockWithTxsResponse = { if (message.txs) { obj.txs = message.txs.map(e => e ? Tx.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.block = message.block ? Block.toAmino(message.block) : undefined; diff --git a/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/tx.ts index 8439411b97..3200a9f147 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/tx.ts @@ -552,7 +552,7 @@ export const Tx = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -690,7 +690,7 @@ export const TxRaw = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -835,8 +835,8 @@ export const SignDoc = { const obj: any = {}; obj.body_bytes = message.bodyBytes ? base64FromBytes(message.bodyBytes) : undefined; obj.auth_info_bytes = message.authInfoBytes ? base64FromBytes(message.authInfoBytes) : undefined; - obj.chain_id = message.chainId; - obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; return obj; }, fromAminoMsg(object: SignDocAminoMsg): SignDoc { @@ -1012,9 +1012,9 @@ export const SignDocDirectAux = { const obj: any = {}; obj.body_bytes = message.bodyBytes ? base64FromBytes(message.bodyBytes) : undefined; 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.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined; return obj; }, @@ -1194,19 +1194,19 @@ export const TxBody = { if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.memo = message.memo; - obj.timeout_height = message.timeoutHeight ? message.timeoutHeight.toString() : undefined; + obj.memo = message.memo === "" ? undefined : message.memo; + obj.timeout_height = message.timeoutHeight !== BigInt(0) ? message.timeoutHeight.toString() : undefined; if (message.extensionOptions) { obj.extension_options = message.extensionOptions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extension_options = []; + obj.extension_options = message.extensionOptions; } if (message.nonCriticalExtensionOptions) { obj.non_critical_extension_options = message.nonCriticalExtensionOptions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.non_critical_extension_options = []; + obj.non_critical_extension_options = message.nonCriticalExtensionOptions; } return obj; }, @@ -1342,7 +1342,7 @@ export const AuthInfo = { if (message.signerInfos) { obj.signer_infos = message.signerInfos.map(e => e ? SignerInfo.toAmino(e) : undefined); } else { - obj.signer_infos = []; + obj.signer_infos = message.signerInfos; } obj.fee = message.fee ? Fee.toAmino(message.fee) : undefined; obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined; @@ -1473,7 +1473,7 @@ export const SignerInfo = { 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; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: SignerInfoAminoMsg): SignerInfo { @@ -1672,13 +1672,13 @@ export const ModeInfo_Single = { fromAmino(object: ModeInfo_SingleAmino): ModeInfo_Single { const message = createBaseModeInfo_Single(); if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } return message; }, toAmino(message: ModeInfo_Single): ModeInfo_SingleAmino { const obj: any = {}; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; return obj; }, fromAminoMsg(object: ModeInfo_SingleAminoMsg): ModeInfo_Single { @@ -1798,7 +1798,7 @@ export const ModeInfo_Multi = { if (message.modeInfos) { obj.mode_infos = message.modeInfos.map(e => e ? ModeInfo.toAmino(e) : undefined); } else { - obj.mode_infos = []; + obj.mode_infos = message.modeInfos; } return obj; }, @@ -1950,11 +1950,11 @@ export const Fee = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.gas_limit = message.gasLimit ? message.gasLimit.toString() : undefined; - obj.payer = message.payer; - obj.granter = message.granter; + obj.gas_limit = message.gasLimit !== BigInt(0) ? message.gasLimit.toString() : undefined; + obj.payer = message.payer === "" ? undefined : message.payer; + obj.granter = message.granter === "" ? undefined : message.granter; return obj; }, fromAminoMsg(object: FeeAminoMsg): Fee { @@ -2073,9 +2073,9 @@ export const Tip = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.tipper = message.tipper; + obj.tipper = message.tipper === "" ? undefined : message.tipper; return obj; }, fromAminoMsg(object: TipAminoMsg): Tip { @@ -2208,7 +2208,7 @@ export const AuxSignerData = { message.signDoc = SignDocDirectAux.fromAmino(object.sign_doc); } if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.sig !== undefined && object.sig !== null) { message.sig = bytesFromBase64(object.sig); @@ -2217,9 +2217,9 @@ export const AuxSignerData = { }, toAmino(message: AuxSignerData): AuxSignerDataAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.sign_doc = message.signDoc ? SignDocDirectAux.toAmino(message.signDoc) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.sig = message.sig ? base64FromBytes(message.sig) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/query.ts index fc7f9bb677..47129244a6 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/query.ts @@ -440,7 +440,7 @@ export const QueryAppliedPlanRequest = { }, toAmino(message: QueryAppliedPlanRequest): QueryAppliedPlanRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: QueryAppliedPlanRequestAminoMsg): QueryAppliedPlanRequest { @@ -534,7 +534,7 @@ export const QueryAppliedPlanResponse = { }, toAmino(message: QueryAppliedPlanResponse): QueryAppliedPlanResponseAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: QueryAppliedPlanResponseAminoMsg): QueryAppliedPlanResponse { @@ -628,7 +628,7 @@ export const QueryUpgradedConsensusStateRequest = { }, toAmino(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAmino { const obj: any = {}; - obj.last_height = message.lastHeight ? message.lastHeight.toString() : undefined; + obj.last_height = message.lastHeight !== BigInt(0) ? message.lastHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryUpgradedConsensusStateRequestAminoMsg): QueryUpgradedConsensusStateRequest { @@ -816,7 +816,7 @@ export const QueryModuleVersionsRequest = { }, toAmino(message: QueryModuleVersionsRequest): QueryModuleVersionsRequestAmino { const obj: any = {}; - obj.module_name = message.moduleName; + obj.module_name = message.moduleName === "" ? undefined : message.moduleName; return obj; }, fromAminoMsg(object: QueryModuleVersionsRequestAminoMsg): QueryModuleVersionsRequest { @@ -919,7 +919,7 @@ export const QueryModuleVersionsResponse = { if (message.moduleVersions) { obj.module_versions = message.moduleVersions.map(e => e ? ModuleVersion.toAmino(e) : undefined); } else { - obj.module_versions = []; + obj.module_versions = message.moduleVersions; } return obj; }, @@ -1087,7 +1087,7 @@ export const QueryAuthorityResponse = { }, toAmino(message: QueryAuthorityResponse): QueryAuthorityResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryAuthorityResponseAminoMsg): QueryAuthorityResponse { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/tx.ts index fc030d2b2d..1211d840ef 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/tx.ts @@ -164,7 +164,7 @@ export const MsgSoftwareUpgrade = { }, toAmino(message: MsgSoftwareUpgrade): MsgSoftwareUpgradeAmino { const obj: any = {}; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; return obj; }, @@ -332,7 +332,7 @@ export const MsgCancelUpgrade = { }, toAmino(message: MsgCancelUpgrade): MsgCancelUpgradeAmino { const obj: any = {}; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; return obj; }, fromAminoMsg(object: MsgCancelUpgradeAminoMsg): MsgCancelUpgrade { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/upgrade.ts b/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/upgrade.ts index 3b8d0a5c60..c1cd9a61b7 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/upgrade.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/upgrade.ts @@ -265,10 +265,10 @@ export const Plan = { }, toAmino(message: Plan): PlanAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.height = message.height ? message.height.toString() : undefined; - obj.info = message.info; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.info = message.info === "" ? undefined : message.info; obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; return obj; }, @@ -395,8 +395,8 @@ export const SoftwareUpgradeProposal = { }, toAmino(message: SoftwareUpgradeProposal): SoftwareUpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; return obj; }, @@ -507,8 +507,8 @@ export const CancelSoftwareUpgradeProposal = { }, toAmino(message: CancelSoftwareUpgradeProposal): CancelSoftwareUpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: CancelSoftwareUpgradeProposalAminoMsg): CancelSoftwareUpgradeProposal { @@ -618,8 +618,8 @@ export const ModuleVersion = { }, toAmino(message: ModuleVersion): ModuleVersionAmino { const obj: any = {}; - obj.name = message.name; - obj.version = message.version ? message.version.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; return obj; }, fromAminoMsg(object: ModuleVersionAminoMsg): ModuleVersion { diff --git a/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/tx.ts index e5eb168b0d..99ade6c6df 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/tx.ts @@ -244,15 +244,15 @@ export const MsgCreateVestingAccount = { }, toAmino(message: MsgCreateVestingAccount): MsgCreateVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.end_time = message.endTime ? message.endTime.toString() : undefined; - obj.delayed = message.delayed; + obj.end_time = message.endTime !== BigInt(0) ? message.endTime.toString() : undefined; + obj.delayed = message.delayed === false ? undefined : message.delayed; return obj; }, fromAminoMsg(object: MsgCreateVestingAccountAminoMsg): MsgCreateVestingAccount { @@ -457,12 +457,12 @@ export const MsgCreatePermanentLockedAccount = { }, toAmino(message: MsgCreatePermanentLockedAccount): MsgCreatePermanentLockedAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -684,13 +684,13 @@ export const MsgCreatePeriodicVestingAccount = { }, 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; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/vesting.ts b/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/vesting.ts index c778be4216..9b3fc1bca6 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/vesting.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/vesting.ts @@ -284,19 +284,19 @@ export const BaseVestingAccount = { if (message.originalVesting) { obj.original_vesting = message.originalVesting.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.original_vesting = []; + obj.original_vesting = message.originalVesting; } if (message.delegatedFree) { obj.delegated_free = message.delegatedFree.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.delegated_free = []; + obj.delegated_free = message.delegatedFree; } if (message.delegatedVesting) { obj.delegated_vesting = message.delegatedVesting.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.delegated_vesting = []; + obj.delegated_vesting = message.delegatedVesting; } - obj.end_time = message.endTime ? message.endTime.toString() : undefined; + obj.end_time = message.endTime !== BigInt(0) ? message.endTime.toString() : undefined; return obj; }, fromAminoMsg(object: BaseVestingAccountAminoMsg): BaseVestingAccount { @@ -407,7 +407,7 @@ export const ContinuousVestingAccount = { 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; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; return obj; }, fromAminoMsg(object: ContinuousVestingAccountAminoMsg): ContinuousVestingAccount { @@ -617,11 +617,11 @@ export const Period = { }, toAmino(message: Period): PeriodAmino { const obj: any = {}; - obj.length = message.length ? message.length.toString() : undefined; + obj.length = message.length !== BigInt(0) ? message.length.toString() : undefined; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -755,11 +755,11 @@ export const PeriodicVestingAccount = { 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; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmos_proto/cosmos.ts b/__fixtures__/v-next/outputosmojs/cosmos_proto/cosmos.ts index cf36bdaec7..ee618b424e 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos_proto/cosmos.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos_proto/cosmos.ts @@ -202,8 +202,8 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: InterfaceDescriptorAminoMsg): InterfaceDescriptor { @@ -333,17 +333,17 @@ export const ScalarDescriptor = { if (object.description !== undefined && object.description !== null) { message.description = object.description; } - message.fieldType = object.field_type?.map(e => scalarTypeFromJSON(e)) || []; + message.fieldType = object.field_type?.map(e => e) || []; return message; }, toAmino(message: ScalarDescriptor): ScalarDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; if (message.fieldType) { obj.field_type = message.fieldType.map(e => e); } else { - obj.field_type = []; + obj.field_type = message.fieldType; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/authz.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/authz.ts index ac1a8f9bf4..7a2d330e87 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/authz.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/authz.ts @@ -272,7 +272,7 @@ export const ContractExecutionAuthorization = { if (message.grants) { obj.grants = message.grants.map(e => e ? ContractGrant.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } return obj; }, @@ -376,7 +376,7 @@ export const ContractMigrationAuthorization = { if (message.grants) { obj.grants = message.grants.map(e => e ? ContractGrant.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } return obj; }, @@ -503,7 +503,7 @@ export const ContractGrant = { }, toAmino(message: ContractGrant): ContractGrantAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; obj.limit = message.limit ? Any.toAmino(message.limit) : undefined; obj.filter = message.filter ? Any.toAmino(message.filter) : undefined; return obj; @@ -599,7 +599,7 @@ export const MaxCallsLimit = { }, toAmino(message: MaxCallsLimit): MaxCallsLimitAmino { const obj: any = {}; - obj.remaining = message.remaining ? message.remaining.toString() : undefined; + obj.remaining = message.remaining !== BigInt(0) ? message.remaining.toString() : undefined; return obj; }, fromAminoMsg(object: MaxCallsLimitAminoMsg): MaxCallsLimit { @@ -702,7 +702,7 @@ export const MaxFundsLimit = { if (message.amounts) { obj.amounts = message.amounts.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amounts = []; + obj.amounts = message.amounts; } return obj; }, @@ -819,11 +819,11 @@ export const CombinedLimit = { }, toAmino(message: CombinedLimit): CombinedLimitAmino { const obj: any = {}; - obj.calls_remaining = message.callsRemaining ? message.callsRemaining.toString() : undefined; + obj.calls_remaining = message.callsRemaining !== BigInt(0) ? message.callsRemaining.toString() : undefined; if (message.amounts) { obj.amounts = message.amounts.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amounts = []; + obj.amounts = message.amounts; } return obj; }, @@ -1000,7 +1000,7 @@ export const AcceptedMessageKeysFilter = { if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, @@ -1104,7 +1104,7 @@ export const AcceptedMessagesFilter = { if (message.messages) { obj.messages = message.messages.map(e => JSON.parse(fromUtf8(e))); } else { - obj.messages = []; + obj.messages = message.messages; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/genesis.ts index 78bad104ff..c7a00c9b49 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/genesis.ts @@ -255,22 +255,22 @@ export const GenesisState = { if (message.codes) { obj.codes = message.codes.map(e => e ? Code.toAmino(e) : undefined); } else { - obj.codes = []; + obj.codes = message.codes; } if (message.contracts) { obj.contracts = message.contracts.map(e => e ? Contract.toAmino(e) : undefined); } else { - obj.contracts = []; + obj.contracts = message.contracts; } if (message.sequences) { obj.sequences = message.sequences.map(e => e ? Sequence.toAmino(e) : undefined); } else { - obj.sequences = []; + obj.sequences = message.sequences; } if (message.genMsgs) { obj.gen_msgs = message.genMsgs.map(e => e ? GenesisState_GenMsgs.toAmino(e) : undefined); } else { - obj.gen_msgs = []; + obj.gen_msgs = message.genMsgs; } return obj; }, @@ -541,10 +541,10 @@ export const Code = { }, toAmino(message: Code): CodeAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.code_info = message.codeInfo ? CodeInfo.toAmino(message.codeInfo) : undefined; obj.code_bytes = message.codeBytes ? base64FromBytes(message.codeBytes) : undefined; - obj.pinned = message.pinned; + obj.pinned = message.pinned === false ? undefined : message.pinned; return obj; }, fromAminoMsg(object: CodeAminoMsg): Code { @@ -676,12 +676,12 @@ export const Contract = { }, toAmino(message: Contract): ContractAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : 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 = []; + obj.contract_state = message.contractState; } return obj; }, @@ -793,7 +793,7 @@ export const Sequence = { toAmino(message: Sequence): SequenceAmino { const obj: any = {}; obj.id_key = message.idKey ? base64FromBytes(message.idKey) : undefined; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: SequenceAminoMsg): Sequence { diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/ibc.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/ibc.ts index 18cdf7b957..4e828cde26 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/ibc.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/ibc.ts @@ -161,9 +161,9 @@ export const MsgIBCSend = { }, 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.channel = message.channel === "" ? undefined : message.channel; + obj.timeout_height = message.timeoutHeight !== BigInt(0) ? message.timeoutHeight.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -258,7 +258,7 @@ export const MsgIBCCloseChannel = { }, toAmino(message: MsgIBCCloseChannel): MsgIBCCloseChannelAmino { const obj: any = {}; - obj.channel = message.channel; + obj.channel = message.channel === "" ? undefined : message.channel; return obj; }, fromAminoMsg(object: MsgIBCCloseChannelAminoMsg): MsgIBCCloseChannel { diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/proposal.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/proposal.ts index ad9ca82149..3880732d73 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/proposal.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/proposal.ts @@ -380,9 +380,9 @@ export const StoreCodeProposal = { }, toAmino(message: StoreCodeProposal): StoreCodeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.run_as = message.runAs; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; return obj; @@ -596,17 +596,17 @@ export const InstantiateContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -765,10 +765,10 @@ export const MigrateContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -911,9 +911,9 @@ export const SudoContractProposal = { }, toAmino(message: SudoContractProposal): SudoContractProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1094,15 +1094,15 @@ export const ExecuteContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; + obj.contract = message.contract === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -1245,10 +1245,10 @@ export const UpdateAdminProposal = { }, toAmino(message: UpdateAdminProposal): UpdateAdminProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.new_admin = message.newAdmin; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: UpdateAdminProposalAminoMsg): UpdateAdminProposal { @@ -1374,9 +1374,9 @@ export const ClearAdminProposal = { }, toAmino(message: ClearAdminProposal): ClearAdminProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: ClearAdminProposalAminoMsg): ClearAdminProposal { @@ -1517,12 +1517,12 @@ export const PinCodesProposal = { }, toAmino(message: PinCodesProposal): PinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, @@ -1664,12 +1664,12 @@ export const UnpinCodesProposal = { }, toAmino(message: UnpinCodesProposal): UnpinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/query.ts index 907044b691..bc5822633b 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/query.ts @@ -437,7 +437,7 @@ export const QueryContractInfoRequest = { }, toAmino(message: QueryContractInfoRequest): QueryContractInfoRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryContractInfoRequestAminoMsg): QueryContractInfoRequest { @@ -547,7 +547,7 @@ export const QueryContractInfoResponse = { }, toAmino(message: QueryContractInfoResponse): QueryContractInfoResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.contract_info = message.contractInfo ? ContractInfo.toAmino(message.contractInfo) : undefined; return obj; }, @@ -658,7 +658,7 @@ export const QueryContractHistoryRequest = { }, toAmino(message: QueryContractHistoryRequest): QueryContractHistoryRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -778,7 +778,7 @@ export const QueryContractHistoryResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? ContractCodeHistoryEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -890,7 +890,7 @@ export const QueryContractsByCodeRequest = { }, toAmino(message: QueryContractsByCodeRequest): QueryContractsByCodeRequestAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1010,7 +1010,7 @@ export const QueryContractsByCodeResponse = { if (message.contracts) { obj.contracts = message.contracts.map(e => e); } else { - obj.contracts = []; + obj.contracts = message.contracts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1122,7 +1122,7 @@ export const QueryAllContractStateRequest = { }, toAmino(message: QueryAllContractStateRequest): QueryAllContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1242,7 +1242,7 @@ export const QueryAllContractStateResponse = { if (message.models) { obj.models = message.models.map(e => e ? Model.toAmino(e) : undefined); } else { - obj.models = []; + obj.models = message.models; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1354,7 +1354,7 @@ export const QueryRawContractStateRequest = { }, toAmino(message: QueryRawContractStateRequest): QueryRawContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? base64FromBytes(message.queryData) : undefined; return obj; }, @@ -1559,7 +1559,7 @@ export const QuerySmartContractStateRequest = { }, toAmino(message: QuerySmartContractStateRequest): QuerySmartContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? JSON.parse(fromUtf8(message.queryData)) : undefined; return obj; }, @@ -1748,7 +1748,7 @@ export const QueryCodeRequest = { }, toAmino(message: QueryCodeRequest): QueryCodeRequestAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCodeRequestAminoMsg): QueryCodeRequest { @@ -1874,8 +1874,8 @@ export const CodeInfoResponse = { }, toAmino(message: CodeInfoResponse): CodeInfoResponseAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; - obj.creator = message.creator; + obj.code_id = message.codeId ? message.codeId.toString() : "0"; + obj.creator = message.creator === "" ? undefined : message.creator; obj.data_hash = message.dataHash ? base64FromBytes(message.dataHash) : undefined; return obj; }, @@ -1987,7 +1987,7 @@ export const QueryCodeResponse = { toAmino(message: QueryCodeResponse): QueryCodeResponseAmino { const obj: any = {}; obj.code_info = message.codeInfo ? CodeInfoResponse.toAmino(message.codeInfo) : undefined; - obj.data = message.data ? base64FromBytes(message.data) : undefined; + obj.data = message.data ? base64FromBytes(message.data) : ""; return obj; }, fromAminoMsg(object: QueryCodeResponseAminoMsg): QueryCodeResponse { @@ -2200,7 +2200,7 @@ export const QueryCodesResponse = { if (message.codeInfos) { obj.code_infos = message.codeInfos.map(e => e ? CodeInfoResponse.toAmino(e) : undefined); } else { - obj.code_infos = []; + obj.code_infos = message.codeInfos; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2424,7 +2424,7 @@ export const QueryPinnedCodesResponse = { if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/tx.ts index 5561ae679a..722e20d1a3 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/tx.ts @@ -314,7 +314,7 @@ export const MsgStoreCode = { }, toAmino(message: MsgStoreCode): MsgStoreCodeAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; return obj; @@ -410,7 +410,7 @@ export const MsgStoreCodeResponse = { }, toAmino(message: MsgStoreCodeResponse): MsgStoreCodeResponseAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgStoreCodeResponseAminoMsg): MsgStoreCodeResponse { @@ -590,15 +590,15 @@ export const MsgInstantiateContract = { }, 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.sender = message.sender === "" ? undefined : message.sender; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -709,7 +709,7 @@ export const MsgInstantiateContractResponse = { }, toAmino(message: MsgInstantiateContractResponse): MsgInstantiateContractResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -858,13 +858,13 @@ export const MsgExecuteContract = { }, toAmino(message: MsgExecuteContract): MsgExecuteContractAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -1101,9 +1101,9 @@ export const MsgMigrateContract = { }, 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.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1324,9 +1324,9 @@ export const MsgUpdateAdmin = { }, toAmino(message: MsgUpdateAdmin): MsgUpdateAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.new_admin = message.newAdmin; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: MsgUpdateAdminAminoMsg): MsgUpdateAdmin { @@ -1509,8 +1509,8 @@ export const MsgClearAdmin = { }, toAmino(message: MsgClearAdmin): MsgClearAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: MsgClearAdminAminoMsg): MsgClearAdmin { diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/types.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/types.ts index 50fab7cdeb..a1578dadb8 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/types.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/types.ts @@ -321,13 +321,13 @@ export const AccessTypeParam = { fromAmino(object: AccessTypeParamAmino): AccessTypeParam { const message = createBaseAccessTypeParam(); if (object.value !== undefined && object.value !== null) { - message.value = accessTypeFromJSON(object.value); + message.value = object.value; } return message; }, toAmino(message: AccessTypeParam): AccessTypeParamAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: AccessTypeParamAminoMsg): AccessTypeParam { @@ -428,7 +428,7 @@ export const AccessConfig = { fromAmino(object: AccessConfigAmino): AccessConfig { const message = createBaseAccessConfig(); if (object.permission !== undefined && object.permission !== null) { - message.permission = accessTypeFromJSON(object.permission); + message.permission = object.permission; } if (object.address !== undefined && object.address !== null) { message.address = object.address; @@ -437,8 +437,8 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.permission = message.permission; - obj.address = message.address; + obj.permission = message.permission === 0 ? undefined : message.permission; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -555,7 +555,7 @@ export const Params = { message.codeUploadAccess = AccessConfig.fromAmino(object.code_upload_access); } if (object.instantiate_default_permission !== undefined && object.instantiate_default_permission !== null) { - message.instantiateDefaultPermission = accessTypeFromJSON(object.instantiate_default_permission); + message.instantiateDefaultPermission = object.instantiate_default_permission; } if (object.max_wasm_code_size !== undefined && object.max_wasm_code_size !== null) { message.maxWasmCodeSize = BigInt(object.max_wasm_code_size); @@ -565,8 +565,8 @@ export const Params = { 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; + obj.instantiate_default_permission = message.instantiateDefaultPermission === 0 ? undefined : message.instantiateDefaultPermission; + obj.max_wasm_code_size = message.maxWasmCodeSize !== BigInt(0) ? message.maxWasmCodeSize.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -693,7 +693,7 @@ export const CodeInfo = { toAmino(message: CodeInfo): CodeInfoAmino { const obj: any = {}; obj.code_hash = message.codeHash ? base64FromBytes(message.codeHash) : undefined; - obj.creator = message.creator; + obj.creator = message.creator === "" ? undefined : message.creator; obj.instantiate_config = message.instantiateConfig ? AccessConfig.toAmino(message.instantiateConfig) : undefined; return obj; }, @@ -884,12 +884,12 @@ export const ContractInfo = { }, 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.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.creator = message.creator === "" ? undefined : message.creator; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.label = message.label === "" ? undefined : message.label; obj.created = message.created ? AbsoluteTxPosition.toAmino(message.created) : undefined; - obj.ibc_port_id = message.ibcPortId; + obj.ibc_port_id = message.ibcPortId === "" ? undefined : message.ibcPortId; obj.extension = message.extension ? Any.toAmino(message.extension) : undefined; return obj; }, @@ -1017,7 +1017,7 @@ export const ContractCodeHistoryEntry = { fromAmino(object: ContractCodeHistoryEntryAmino): ContractCodeHistoryEntry { const message = createBaseContractCodeHistoryEntry(); if (object.operation !== undefined && object.operation !== null) { - message.operation = contractCodeHistoryOperationTypeFromJSON(object.operation); + message.operation = object.operation; } if (object.code_id !== undefined && object.code_id !== null) { message.codeId = BigInt(object.code_id); @@ -1032,8 +1032,8 @@ export const ContractCodeHistoryEntry = { }, toAmino(message: ContractCodeHistoryEntry): ContractCodeHistoryEntryAmino { const obj: any = {}; - obj.operation = message.operation; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.operation = message.operation === 0 ? undefined : message.operation; + obj.code_id = message.codeId !== BigInt(0) ? 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; @@ -1145,8 +1145,8 @@ export const AbsoluteTxPosition = { }, 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; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; + obj.tx_index = message.txIndex !== BigInt(0) ? message.txIndex.toString() : undefined; return obj; }, fromAminoMsg(object: AbsoluteTxPositionAminoMsg): AbsoluteTxPosition { diff --git a/__fixtures__/v-next/outputosmojs/evmos/claims/v1/claims.ts b/__fixtures__/v-next/outputosmojs/evmos/claims/v1/claims.ts index 6ee4cacd73..a0ef80a174 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/claims/v1/claims.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/claims/v1/claims.ts @@ -211,7 +211,7 @@ export const Claim = { fromAmino(object: ClaimAmino): Claim { const message = createBaseClaim(); if (object.action !== undefined && object.action !== null) { - message.action = actionFromJSON(object.action); + message.action = object.action; } if (object.completed !== undefined && object.completed !== null) { message.completed = object.completed; @@ -223,9 +223,9 @@ export const Claim = { }, toAmino(message: Claim): ClaimAmino { const obj: any = {}; - obj.action = message.action; - obj.completed = message.completed; - obj.claimable_amount = message.claimableAmount; + obj.action = message.action === 0 ? undefined : message.action; + obj.completed = message.completed === false ? undefined : message.completed; + obj.claimable_amount = message.claimableAmount === "" ? undefined : message.claimableAmount; return obj; }, fromAminoMsg(object: ClaimAminoMsg): Claim { @@ -360,12 +360,12 @@ export const ClaimsRecordAddress = { }, toAmino(message: ClaimsRecordAddress): ClaimsRecordAddressAmino { const obj: any = {}; - obj.address = message.address; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.address = message.address === "" ? undefined : message.address; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.actionsCompleted) { obj.actions_completed = message.actionsCompleted.map(e => e); } else { - obj.actions_completed = []; + obj.actions_completed = message.actionsCompleted; } return obj; }, @@ -485,11 +485,11 @@ export const ClaimsRecord = { }, toAmino(message: ClaimsRecord): ClaimsRecordAmino { const obj: any = {}; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.actionsCompleted) { obj.actions_completed = message.actionsCompleted.map(e => e); } else { - obj.actions_completed = []; + obj.actions_completed = message.actionsCompleted; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/evmos/claims/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/claims/v1/genesis.ts index ff4c1b829c..75787cf163 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/claims/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/claims/v1/genesis.ts @@ -149,7 +149,7 @@ export const GenesisState = { if (message.claimsRecords) { obj.claims_records = message.claimsRecords.map(e => e ? ClaimsRecordAddress.toAmino(e) : undefined); } else { - obj.claims_records = []; + obj.claims_records = message.claimsRecords; } return obj; }, @@ -346,20 +346,20 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_claims = message.enableClaims; + obj.enable_claims = message.enableClaims === false ? undefined : message.enableClaims; obj.airdrop_start_time = message.airdropStartTime ? Timestamp.toAmino(toTimestamp(message.airdropStartTime)) : undefined; 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; + obj.claims_denom = message.claimsDenom === "" ? undefined : message.claimsDenom; if (message.authorizedChannels) { obj.authorized_channels = message.authorizedChannels.map(e => e); } else { - obj.authorized_channels = []; + obj.authorized_channels = message.authorizedChannels; } if (message.evmChannels) { obj.evm_channels = message.evmChannels.map(e => e); } else { - obj.evm_channels = []; + obj.evm_channels = message.evmChannels; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/evmos/claims/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/claims/v1/query.ts index 1751217f03..ea69a7a5a9 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/claims/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/claims/v1/query.ts @@ -286,7 +286,7 @@ export const QueryTotalUnclaimedResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -643,7 +643,7 @@ export const QueryClaimsRecordsResponse = { if (message.claims) { obj.claims = message.claims.map(e => e ? ClaimsRecordAddress.toAmino(e) : undefined); } else { - obj.claims = []; + obj.claims = message.claims; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -733,7 +733,7 @@ export const QueryClaimsRecordRequest = { }, toAmino(message: QueryClaimsRecordRequest): QueryClaimsRecordRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryClaimsRecordRequestAminoMsg): QueryClaimsRecordRequest { @@ -843,11 +843,11 @@ export const QueryClaimsRecordResponse = { }, toAmino(message: QueryClaimsRecordResponse): QueryClaimsRecordResponseAmino { const obj: any = {}; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.claims) { obj.claims = message.claims.map(e => e ? Claim.toAmino(e) : undefined); } else { - obj.claims = []; + obj.claims = message.claims; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/genesis.ts index e30ac5ca9e..6c1b3ecefb 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/genesis.ts @@ -202,13 +202,13 @@ export const EpochInfo = { }, toAmino(message: EpochInfo): EpochInfoAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; obj.current_epoch_start_time = message.currentEpochStartTime ? Timestamp.toAmino(toTimestamp(message.currentEpochStartTime)) : undefined; - obj.epoch_counting_started = message.epochCountingStarted; - obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + obj.epoch_counting_started = message.epochCountingStarted === false ? undefined : message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight !== BigInt(0) ? message.currentEpochStartHeight.toString() : undefined; return obj; }, fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo { @@ -305,7 +305,7 @@ export const GenesisState = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/query.ts index 16293d2860..bc4ba475b9 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/query.ts @@ -227,7 +227,7 @@ export const QueryEpochsInfoResponse = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -317,7 +317,7 @@ export const QueryCurrentEpochRequest = { }, toAmino(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; return obj; }, fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest { @@ -405,7 +405,7 @@ export const QueryCurrentEpochResponse = { }, toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { const obj: any = {}; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse { diff --git a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/erc20.ts b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/erc20.ts index 21635173c8..a1a6171e51 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/erc20.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/erc20.ts @@ -260,16 +260,16 @@ export const TokenPair = { message.enabled = object.enabled; } if (object.contract_owner !== undefined && object.contract_owner !== null) { - message.contractOwner = ownerFromJSON(object.contract_owner); + message.contractOwner = object.contract_owner; } return message; }, 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; + obj.erc20_address = message.erc20Address === "" ? undefined : message.erc20Address; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.enabled = message.enabled === false ? undefined : message.enabled; + obj.contract_owner = message.contractOwner === 0 ? undefined : message.contractOwner; return obj; }, fromAminoMsg(object: TokenPairAminoMsg): TokenPair { @@ -389,8 +389,8 @@ export const RegisterCoinProposal = { }, toAmino(message: RegisterCoinProposal): RegisterCoinProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; }, @@ -511,9 +511,9 @@ export const RegisterERC20Proposal = { }, toAmino(message: RegisterERC20Proposal): RegisterERC20ProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.erc20address = message.erc20address; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.erc20address = message.erc20address === "" ? undefined : message.erc20address; return obj; }, fromAminoMsg(object: RegisterERC20ProposalAminoMsg): RegisterERC20Proposal { @@ -633,9 +633,9 @@ export const ToggleTokenConversionProposal = { }, toAmino(message: ToggleTokenConversionProposal): ToggleTokenConversionProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.token = message.token; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.token = message.token === "" ? undefined : message.token; return obj; }, fromAminoMsg(object: ToggleTokenConversionProposalAminoMsg): ToggleTokenConversionProposal { diff --git a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/genesis.ts index 68a47266a9..cfbf1c0132 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/genesis.ts @@ -133,7 +133,7 @@ export const GenesisState = { if (message.tokenPairs) { obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e) : undefined); } else { - obj.token_pairs = []; + obj.token_pairs = message.tokenPairs; } return obj; }, @@ -238,8 +238,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_erc20 = message.enableErc20; - obj.enable_evm_hook = message.enableEvmHook; + obj.enable_erc20 = message.enableErc20 === false ? undefined : message.enableErc20; + obj.enable_evm_hook = message.enableEvmHook === false ? undefined : message.enableEvmHook; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/query.ts index 91935f89ab..4ebf9f9d72 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/query.ts @@ -286,7 +286,7 @@ export const QueryTokenPairsResponse = { if (message.tokenPairs) { obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e) : undefined); } else { - obj.token_pairs = []; + obj.token_pairs = message.tokenPairs; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -376,7 +376,7 @@ export const QueryTokenPairRequest = { }, toAmino(message: QueryTokenPairRequest): QueryTokenPairRequestAmino { const obj: any = {}; - obj.token = message.token; + obj.token = message.token === "" ? undefined : message.token; return obj; }, fromAminoMsg(object: QueryTokenPairRequestAminoMsg): QueryTokenPairRequest { diff --git a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/tx.ts b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/tx.ts index 8f4ddf15cf..cfa9a1abee 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/tx.ts @@ -170,8 +170,8 @@ export const MsgConvertCoin = { toAmino(message: MsgConvertCoin): MsgConvertCoinAmino { const obj: any = {}; obj.coin = message.coin ? Coin.toAmino(message.coin) : undefined; - obj.receiver = message.receiver; - obj.sender = message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgConvertCoinAminoMsg): MsgConvertCoin { @@ -374,10 +374,10 @@ export const MsgConvertERC20 = { }, toAmino(message: MsgConvertERC20): MsgConvertERC20Amino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.amount = message.amount; - obj.receiver = message.receiver; - obj.sender = message.sender; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.receiver = message.receiver === "" ? undefined : message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgConvertERC20AminoMsg): MsgConvertERC20 { diff --git a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/fees.ts b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/fees.ts index f987aca315..7d90631735 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/fees.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/fees.ts @@ -130,9 +130,9 @@ export const DevFeeInfo = { }, toAmino(message: DevFeeInfo): DevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: DevFeeInfoAminoMsg): DevFeeInfo { diff --git a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/genesis.ts index 571934f44a..17d2fdeb08 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/genesis.ts @@ -148,7 +148,7 @@ export const GenesisState = { if (message.devFeeInfos) { obj.dev_fee_infos = message.devFeeInfos.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.dev_fee_infos = []; + obj.dev_fee_infos = message.devFeeInfos; } return obj; }, @@ -301,11 +301,11 @@ export const Params = { }, 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; + obj.enable_fees = message.enableFees === false ? undefined : message.enableFees; + obj.developer_shares = message.developerShares === "" ? undefined : message.developerShares; + obj.validator_shares = message.validatorShares === "" ? undefined : message.validatorShares; + obj.addr_derivation_cost_create = message.addrDerivationCostCreate !== BigInt(0) ? message.addrDerivationCostCreate.toString() : undefined; + obj.min_gas_price = message.minGasPrice === "" ? undefined : message.minGasPrice; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/query.ts index c6372c7dc2..1b798bc035 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/query.ts @@ -332,7 +332,7 @@ export const QueryDevFeeInfosResponse = { if (message.fees) { obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.fees = []; + obj.fees = message.fees; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -422,7 +422,7 @@ export const QueryDevFeeInfoRequest = { }, toAmino(message: QueryDevFeeInfoRequest): QueryDevFeeInfoRequestAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; return obj; }, fromAminoMsg(object: QueryDevFeeInfoRequestAminoMsg): QueryDevFeeInfoRequest { @@ -769,7 +769,7 @@ export const QueryDevFeeInfosPerDeployerRequest = { }, toAmino(message: QueryDevFeeInfosPerDeployerRequest): QueryDevFeeInfosPerDeployerRequestAmino { const obj: any = {}; - obj.deployer_address = message.deployerAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -883,7 +883,7 @@ export const QueryDevFeeInfosPerDeployerResponse = { if (message.fees) { obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.fees = []; + obj.fees = message.fees; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/tx.ts b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/tx.ts index 9b22951fd3..71f9248868 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/tx.ts @@ -239,13 +239,13 @@ export const MsgRegisterDevFeeInfo = { }, toAmino(message: MsgRegisterDevFeeInfo): MsgRegisterDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; if (message.nonces) { obj.nonces = message.nonces.map(e => e.toString()); } else { - obj.nonces = []; + obj.nonces = message.nonces; } return obj; }, @@ -417,8 +417,8 @@ export const MsgCancelDevFeeInfo = { }, toAmino(message: MsgCancelDevFeeInfo): MsgCancelDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; return obj; }, fromAminoMsg(object: MsgCancelDevFeeInfoAminoMsg): MsgCancelDevFeeInfo { @@ -605,9 +605,9 @@ export const MsgUpdateDevFeeInfo = { }, toAmino(message: MsgUpdateDevFeeInfo): MsgUpdateDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: MsgUpdateDevFeeInfoAminoMsg): MsgUpdateDevFeeInfo { diff --git a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/genesis.ts index a927e7ed22..aed3c9e2cd 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/genesis.ts @@ -161,12 +161,12 @@ export const GenesisState = { if (message.incentives) { obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e) : undefined); } else { - obj.incentives = []; + obj.incentives = message.incentives; } if (message.gasMeters) { obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e) : undefined); } else { - obj.gas_meters = []; + obj.gas_meters = message.gasMeters; } return obj; }, @@ -303,10 +303,10 @@ export const Params = { }, 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; + obj.enable_incentives = message.enableIncentives === false ? undefined : message.enableIncentives; + obj.allocation_limit = message.allocationLimit === "" ? undefined : message.allocationLimit; + obj.incentives_epoch_identifier = message.incentivesEpochIdentifier === "" ? undefined : message.incentivesEpochIdentifier; + obj.reward_scaler = message.rewardScaler === "" ? undefined : message.rewardScaler; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/incentives.ts b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/incentives.ts index cbe7c604fe..4253f0e658 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/incentives.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/incentives.ts @@ -236,15 +236,15 @@ export const Incentive = { }, toAmino(message: Incentive): IncentiveAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; if (message.allocations) { obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } - obj.epochs = message.epochs; + obj.epochs = message.epochs === 0 ? undefined : message.epochs; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.total_gas = message.totalGas ? message.totalGas.toString() : undefined; + obj.total_gas = message.totalGas !== BigInt(0) ? message.totalGas.toString() : undefined; return obj; }, fromAminoMsg(object: IncentiveAminoMsg): Incentive { @@ -364,9 +364,9 @@ export const GasMeter = { }, toAmino(message: GasMeter): GasMeterAmino { const obj: any = {}; - obj.contract = message.contract; - obj.participant = message.participant; - obj.cumulative_gas = message.cumulativeGas ? message.cumulativeGas.toString() : undefined; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.participant = message.participant === "" ? undefined : message.participant; + obj.cumulative_gas = message.cumulativeGas !== BigInt(0) ? message.cumulativeGas.toString() : undefined; return obj; }, fromAminoMsg(object: GasMeterAminoMsg): GasMeter { @@ -524,15 +524,15 @@ export const RegisterIncentiveProposal = { }, toAmino(message: RegisterIncentiveProposal): RegisterIncentiveProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; if (message.allocations) { obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } - obj.epochs = message.epochs; + obj.epochs = message.epochs === 0 ? undefined : message.epochs; return obj; }, fromAminoMsg(object: RegisterIncentiveProposalAminoMsg): RegisterIncentiveProposal { @@ -652,9 +652,9 @@ export const CancelIncentiveProposal = { }, toAmino(message: CancelIncentiveProposal): CancelIncentiveProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: CancelIncentiveProposalAminoMsg): CancelIncentiveProposal { diff --git a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/query.ts index a7f86ccda5..e6de05423e 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/query.ts @@ -442,7 +442,7 @@ export const QueryIncentivesResponse = { if (message.incentives) { obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e) : undefined); } else { - obj.incentives = []; + obj.incentives = message.incentives; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -532,7 +532,7 @@ export const QueryIncentiveRequest = { }, toAmino(message: QueryIncentiveRequest): QueryIncentiveRequestAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: QueryIncentiveRequestAminoMsg): QueryIncentiveRequest { @@ -724,7 +724,7 @@ export const QueryGasMetersRequest = { }, toAmino(message: QueryGasMetersRequest): QueryGasMetersRequestAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -838,7 +838,7 @@ export const QueryGasMetersResponse = { if (message.gasMeters) { obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e) : undefined); } else { - obj.gas_meters = []; + obj.gas_meters = message.gasMeters; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -944,8 +944,8 @@ export const QueryGasMeterRequest = { }, toAmino(message: QueryGasMeterRequest): QueryGasMeterRequestAmino { const obj: any = {}; - obj.contract = message.contract; - obj.participant = message.participant; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.participant = message.participant === "" ? undefined : message.participant; return obj; }, fromAminoMsg(object: QueryGasMeterRequestAminoMsg): QueryGasMeterRequest { @@ -1033,7 +1033,7 @@ export const QueryGasMeterResponse = { }, toAmino(message: QueryGasMeterResponse): QueryGasMeterResponseAmino { const obj: any = {}; - obj.gas_meter = message.gasMeter ? message.gasMeter.toString() : undefined; + obj.gas_meter = message.gasMeter !== BigInt(0) ? message.gasMeter.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGasMeterResponseAminoMsg): QueryGasMeterResponse { @@ -1234,7 +1234,7 @@ export const QueryAllocationMetersResponse = { if (message.allocationMeters) { obj.allocation_meters = message.allocationMeters.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocation_meters = []; + obj.allocation_meters = message.allocationMeters; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1324,7 +1324,7 @@ export const QueryAllocationMeterRequest = { }, toAmino(message: QueryAllocationMeterRequest): QueryAllocationMeterRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryAllocationMeterRequestAminoMsg): QueryAllocationMeterRequest { diff --git a/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/genesis.ts index 90cdde1ef8..5f56ff0ba3 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/genesis.ts @@ -183,10 +183,10 @@ export const GenesisState = { 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; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; + obj.epoch_identifier = message.epochIdentifier === "" ? undefined : message.epochIdentifier; + obj.epochs_per_period = message.epochsPerPeriod !== BigInt(0) ? message.epochsPerPeriod.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs !== BigInt(0) ? message.skippedEpochs.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -322,10 +322,10 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.mint_denom = message.mintDenom; + obj.mint_denom = message.mintDenom === "" ? undefined : 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; + obj.enable_inflation = message.enableInflation === false ? undefined : message.enableInflation; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/inflation.ts b/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/inflation.ts index 616080f97f..773a376b94 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/inflation.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/inflation.ts @@ -184,9 +184,9 @@ export const InflationDistribution = { }, toAmino(message: InflationDistribution): InflationDistributionAmino { const obj: any = {}; - obj.staking_rewards = message.stakingRewards; - obj.usage_incentives = message.usageIncentives; - obj.community_pool = message.communityPool; + obj.staking_rewards = message.stakingRewards === "" ? undefined : message.stakingRewards; + obj.usage_incentives = message.usageIncentives === "" ? undefined : message.usageIncentives; + obj.community_pool = message.communityPool === "" ? undefined : message.communityPool; return obj; }, fromAminoMsg(object: InflationDistributionAminoMsg): InflationDistribution { @@ -338,11 +338,11 @@ export const ExponentialCalculation = { }, 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; + obj.a = message.a === "" ? undefined : message.a; + obj.r = message.r === "" ? undefined : message.r; + obj.c = message.c === "" ? undefined : message.c; + obj.bonding_target = message.bondingTarget === "" ? undefined : message.bondingTarget; + obj.max_variance = message.maxVariance === "" ? undefined : message.maxVariance; return obj; }, fromAminoMsg(object: ExponentialCalculationAminoMsg): ExponentialCalculation { diff --git a/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/query.ts index 232c076645..72ef9fa379 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/query.ts @@ -314,7 +314,7 @@ export const QueryPeriodResponse = { }, toAmino(message: QueryPeriodResponse): QueryPeriodResponseAmino { const obj: any = {}; - obj.period = message.period ? message.period.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPeriodResponseAminoMsg): QueryPeriodResponse { @@ -624,7 +624,7 @@ export const QuerySkippedEpochsResponse = { }, toAmino(message: QuerySkippedEpochsResponse): QuerySkippedEpochsResponseAmino { const obj: any = {}; - obj.skipped_epochs = message.skippedEpochs ? message.skippedEpochs.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs !== BigInt(0) ? message.skippedEpochs.toString() : undefined; return obj; }, fromAminoMsg(object: QuerySkippedEpochsResponseAminoMsg): QuerySkippedEpochsResponse { @@ -934,7 +934,7 @@ export const QueryInflationRateResponse = { }, toAmino(message: QueryInflationRateResponse): QueryInflationRateResponseAmino { const obj: any = {}; - obj.inflation_rate = message.inflationRate; + obj.inflation_rate = message.inflationRate === "" ? undefined : message.inflationRate; return obj; }, fromAminoMsg(object: QueryInflationRateResponseAminoMsg): QueryInflationRateResponse { diff --git a/__fixtures__/v-next/outputosmojs/evmos/recovery/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/recovery/v1/genesis.ts index 1f645eb427..e736cf9a71 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/recovery/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/recovery/v1/genesis.ts @@ -204,7 +204,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_recovery = message.enableRecovery; + obj.enable_recovery = message.enableRecovery === false ? undefined : message.enableRecovery; obj.packet_timeout_duration = message.packetTimeoutDuration ? Duration.toAmino(message.packetTimeoutDuration) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/query.ts index 2fc4dfa116..40ca16b58f 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/query.ts @@ -109,7 +109,7 @@ export const QueryBalancesRequest = { }, toAmino(message: QueryBalancesRequest): QueryBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryBalancesRequestAminoMsg): QueryBalancesRequest { @@ -250,17 +250,17 @@ export const QueryBalancesResponse = { if (message.locked) { obj.locked = message.locked.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.locked = []; + obj.locked = message.locked; } if (message.unvested) { obj.unvested = message.unvested.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.unvested = []; + obj.unvested = message.unvested; } if (message.vested) { obj.vested = message.vested.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.vested = []; + obj.vested = message.vested; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/tx.ts b/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/tx.ts index 8d2160e359..9389069720 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/tx.ts @@ -252,20 +252,20 @@ export const MsgCreateClawbackVestingAccount = { }, toAmino(message: MsgCreateClawbackVestingAccount): MsgCreateClawbackVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; if (message.lockupPeriods) { obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.lockup_periods = []; + obj.lockup_periods = message.lockupPeriods; } if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } - obj.merge = message.merge; + obj.merge = message.merge === false ? undefined : message.merge; return obj; }, fromAminoMsg(object: MsgCreateClawbackVestingAccountAminoMsg): MsgCreateClawbackVestingAccount { @@ -452,9 +452,9 @@ export const MsgClawback = { }, toAmino(message: MsgClawback): MsgClawbackAmino { const obj: any = {}; - obj.funder_address = message.funderAddress; - obj.account_address = message.accountAddress; - obj.dest_address = message.destAddress; + obj.funder_address = message.funderAddress === "" ? undefined : message.funderAddress; + obj.account_address = message.accountAddress === "" ? undefined : message.accountAddress; + obj.dest_address = message.destAddress === "" ? undefined : message.destAddress; return obj; }, fromAminoMsg(object: MsgClawbackAminoMsg): MsgClawback { diff --git a/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/vesting.ts b/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/vesting.ts index 19942ffdf1..e09a392758 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/vesting.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/vesting.ts @@ -187,17 +187,17 @@ export const ClawbackVestingAccount = { toAmino(message: ClawbackVestingAccount): ClawbackVestingAccountAmino { const obj: any = {}; obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined; - obj.funder_address = message.funderAddress; + obj.funder_address = message.funderAddress === "" ? undefined : message.funderAddress; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; if (message.lockupPeriods) { obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.lockup_periods = []; + obj.lockup_periods = message.lockupPeriods; } if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/api/auth.ts b/__fixtures__/v-next/outputosmojs/google/api/auth.ts index d4d929e91b..cc7a09366e 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/auth.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/auth.ts @@ -442,12 +442,12 @@ export const Authentication = { if (message.rules) { obj.rules = message.rules.map(e => e ? AuthenticationRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } if (message.providers) { obj.providers = message.providers.map(e => e ? AuthProvider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } return obj; }, @@ -590,13 +590,13 @@ export const AuthenticationRule = { }, toAmino(message: AuthenticationRule): AuthenticationRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.oauth = message.oauth ? OAuthRequirements.toAmino(message.oauth) : undefined; - obj.allow_without_credential = message.allowWithoutCredential; + obj.allow_without_credential = message.allowWithoutCredential === false ? undefined : message.allowWithoutCredential; if (message.requirements) { obj.requirements = message.requirements.map(e => e ? AuthRequirement.toAmino(e) : undefined); } else { - obj.requirements = []; + obj.requirements = message.requirements; } return obj; }, @@ -717,9 +717,9 @@ export const JwtLocation = { }, toAmino(message: JwtLocation): JwtLocationAmino { const obj: any = {}; - obj.header = message.header; - obj.query = message.query; - obj.value_prefix = message.valuePrefix; + obj.header = message.header === null ? undefined : message.header; + obj.query = message.query === null ? undefined : message.query; + obj.value_prefix = message.valuePrefix === "" ? undefined : message.valuePrefix; return obj; }, fromAminoMsg(object: JwtLocationAminoMsg): JwtLocation { @@ -893,15 +893,15 @@ export const AuthProvider = { }, 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; + obj.id = message.id === "" ? undefined : message.id; + obj.issuer = message.issuer === "" ? undefined : message.issuer; + obj.jwks_uri = message.jwksUri === "" ? undefined : message.jwksUri; + obj.audiences = message.audiences === "" ? undefined : message.audiences; + obj.authorization_url = message.authorizationUrl === "" ? undefined : message.authorizationUrl; if (message.jwtLocations) { obj.jwt_locations = message.jwtLocations.map(e => e ? JwtLocation.toAmino(e) : undefined); } else { - obj.jwt_locations = []; + obj.jwt_locations = message.jwtLocations; } return obj; }, @@ -990,7 +990,7 @@ export const OAuthRequirements = { }, toAmino(message: OAuthRequirements): OAuthRequirementsAmino { const obj: any = {}; - obj.canonical_scopes = message.canonicalScopes; + obj.canonical_scopes = message.canonicalScopes === "" ? undefined : message.canonicalScopes; return obj; }, fromAminoMsg(object: OAuthRequirementsAminoMsg): OAuthRequirements { @@ -1094,8 +1094,8 @@ export const AuthRequirement = { }, toAmino(message: AuthRequirement): AuthRequirementAmino { const obj: any = {}; - obj.provider_id = message.providerId; - obj.audiences = message.audiences; + obj.provider_id = message.providerId === "" ? undefined : message.providerId; + obj.audiences = message.audiences === "" ? undefined : message.audiences; return obj; }, fromAminoMsg(object: AuthRequirementAminoMsg): AuthRequirement { diff --git a/__fixtures__/v-next/outputosmojs/google/api/backend.ts b/__fixtures__/v-next/outputosmojs/google/api/backend.ts index 3e7c29ebf8..5c8762eec0 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/backend.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/backend.ts @@ -289,7 +289,7 @@ export const Backend = { if (message.rules) { obj.rules = message.rules.map(e => e ? BackendRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -491,7 +491,7 @@ export const BackendRule = { message.operationDeadline = object.operation_deadline; } if (object.path_translation !== undefined && object.path_translation !== null) { - message.pathTranslation = backendRule_PathTranslationFromJSON(object.path_translation); + message.pathTranslation = object.path_translation; } if (object.jwt_audience !== undefined && object.jwt_audience !== null) { message.jwtAudience = object.jwt_audience; @@ -506,15 +506,15 @@ export const BackendRule = { }, 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; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.address = message.address === "" ? undefined : message.address; + obj.deadline = message.deadline === 0 ? undefined : message.deadline; + obj.min_deadline = message.minDeadline === 0 ? undefined : message.minDeadline; + obj.operation_deadline = message.operationDeadline === 0 ? undefined : message.operationDeadline; + obj.path_translation = message.pathTranslation === 0 ? undefined : message.pathTranslation; + obj.jwt_audience = message.jwtAudience === null ? undefined : message.jwtAudience; + obj.disable_auth = message.disableAuth === null ? undefined : message.disableAuth; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: BackendRuleAminoMsg): BackendRule { diff --git a/__fixtures__/v-next/outputosmojs/google/api/billing.ts b/__fixtures__/v-next/outputosmojs/google/api/billing.ts index 053eec272f..09911b5f83 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/billing.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/billing.ts @@ -191,7 +191,7 @@ export const Billing = { if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Billing_BillingDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -302,11 +302,11 @@ export const Billing_BillingDestination = { }, toAmino(message: Billing_BillingDestination): Billing_BillingDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.metrics) { obj.metrics = message.metrics.map(e => e); } else { - obj.metrics = []; + obj.metrics = message.metrics; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/api/config_change.ts b/__fixtures__/v-next/outputosmojs/google/api/config_change.ts index a792317869..ea9183ad6b 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/config_change.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/config_change.ts @@ -273,21 +273,21 @@ export const ConfigChange = { message.newValue = object.new_value; } if (object.change_type !== undefined && object.change_type !== null) { - message.changeType = changeTypeFromJSON(object.change_type); + message.changeType = object.change_type; } message.advices = object.advices?.map(e => Advice.fromAmino(e)) || []; return message; }, 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; + obj.element = message.element === "" ? undefined : message.element; + obj.old_value = message.oldValue === "" ? undefined : message.oldValue; + obj.new_value = message.newValue === "" ? undefined : message.newValue; + obj.change_type = message.changeType === 0 ? undefined : message.changeType; if (message.advices) { obj.advices = message.advices.map(e => e ? Advice.toAmino(e) : undefined); } else { - obj.advices = []; + obj.advices = message.advices; } return obj; }, @@ -376,7 +376,7 @@ export const Advice = { }, toAmino(message: Advice): AdviceAmino { const obj: any = {}; - obj.description = message.description; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: AdviceAminoMsg): Advice { diff --git a/__fixtures__/v-next/outputosmojs/google/api/consumer.ts b/__fixtures__/v-next/outputosmojs/google/api/consumer.ts index a9ed57fcac..8a25b5e2b5 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/consumer.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/consumer.ts @@ -222,7 +222,7 @@ export const ProjectProperties = { if (message.properties) { obj.properties = message.properties.map(e => e ? Property.toAmino(e) : undefined); } else { - obj.properties = []; + obj.properties = message.properties; } return obj; }, @@ -334,7 +334,7 @@ export const Property = { message.name = object.name; } if (object.type !== undefined && object.type !== null) { - message.type = property_PropertyTypeFromJSON(object.type); + message.type = object.type; } if (object.description !== undefined && object.description !== null) { message.description = object.description; @@ -343,9 +343,9 @@ export const Property = { }, toAmino(message: Property): PropertyAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === 0 ? undefined : message.type; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: PropertyAminoMsg): Property { diff --git a/__fixtures__/v-next/outputosmojs/google/api/context.ts b/__fixtures__/v-next/outputosmojs/google/api/context.ts index 3452b7eb21..46b14c81bb 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/context.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/context.ts @@ -211,7 +211,7 @@ export const Context = { if (message.rules) { obj.rules = message.rules.map(e => e ? ContextRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -388,26 +388,26 @@ export const ContextRule = { }, toAmino(message: ContextRule): ContextRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; if (message.requested) { obj.requested = message.requested.map(e => e); } else { - obj.requested = []; + obj.requested = message.requested; } if (message.provided) { obj.provided = message.provided.map(e => e); } else { - obj.provided = []; + obj.provided = message.provided; } if (message.allowedRequestExtensions) { obj.allowed_request_extensions = message.allowedRequestExtensions.map(e => e); } else { - obj.allowed_request_extensions = []; + obj.allowed_request_extensions = message.allowedRequestExtensions; } if (message.allowedResponseExtensions) { obj.allowed_response_extensions = message.allowedResponseExtensions.map(e => e); } else { - obj.allowed_response_extensions = []; + obj.allowed_response_extensions = message.allowedResponseExtensions; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/api/control.ts b/__fixtures__/v-next/outputosmojs/google/api/control.ts index 50e67c1f72..d19b4adc27 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/control.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/control.ts @@ -94,7 +94,7 @@ export const Control = { }, toAmino(message: Control): ControlAmino { const obj: any = {}; - obj.environment = message.environment; + obj.environment = message.environment === "" ? undefined : message.environment; return obj; }, fromAminoMsg(object: ControlAminoMsg): Control { diff --git a/__fixtures__/v-next/outputosmojs/google/api/distribution.ts b/__fixtures__/v-next/outputosmojs/google/api/distribution.ts index 1466a41042..e15ba63698 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/distribution.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/distribution.ts @@ -517,20 +517,20 @@ export const Distribution = { }, 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.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.mean = message.mean === 0 ? undefined : message.mean; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation === 0 ? undefined : 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 = []; + obj.bucket_counts = message.bucketCounts; } if (message.exemplars) { obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e) : undefined); } else { - obj.exemplars = []; + obj.exemplars = message.exemplars; } return obj; }, @@ -635,8 +635,8 @@ export const Distribution_Range = { }, toAmino(message: Distribution_Range): Distribution_RangeAmino { const obj: any = {}; - obj.min = message.min; - obj.max = message.max; + obj.min = message.min === 0 ? undefined : message.min; + obj.max = message.max === 0 ? undefined : message.max; return obj; }, fromAminoMsg(object: Distribution_RangeAminoMsg): Distribution_Range { @@ -878,9 +878,9 @@ export const Distribution_BucketOptions_Linear = { }, 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; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.width = message.width === 0 ? undefined : message.width; + obj.offset = message.offset === 0 ? undefined : message.offset; return obj; }, fromAminoMsg(object: Distribution_BucketOptions_LinearAminoMsg): Distribution_BucketOptions_Linear { @@ -1000,9 +1000,9 @@ export const Distribution_BucketOptions_Exponential = { }, 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; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.growth_factor = message.growthFactor === 0 ? undefined : message.growthFactor; + obj.scale = message.scale === 0 ? undefined : message.scale; return obj; }, fromAminoMsg(object: Distribution_BucketOptions_ExponentialAminoMsg): Distribution_BucketOptions_Exponential { @@ -1108,7 +1108,7 @@ export const Distribution_BucketOptions_Explicit = { if (message.bounds) { obj.bounds = message.bounds.map(e => e); } else { - obj.bounds = []; + obj.bounds = message.bounds; } return obj; }, @@ -1235,12 +1235,12 @@ export const Distribution_Exemplar = { }, toAmino(message: Distribution_Exemplar): Distribution_ExemplarAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; if (message.attachments) { obj.attachments = message.attachments.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.attachments = []; + obj.attachments = message.attachments; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/api/documentation.ts b/__fixtures__/v-next/outputosmojs/google/api/documentation.ts index 53a14f4283..9eb8d07f9a 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/documentation.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/documentation.ts @@ -403,20 +403,20 @@ export const Documentation = { }, toAmino(message: Documentation): DocumentationAmino { const obj: any = {}; - obj.summary = message.summary; + obj.summary = message.summary === "" ? undefined : message.summary; if (message.pages) { obj.pages = message.pages.map(e => e ? Page.toAmino(e) : undefined); } else { - obj.pages = []; + obj.pages = message.pages; } if (message.rules) { obj.rules = message.rules.map(e => e ? DocumentationRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.documentation_root_url = message.documentationRootUrl; - obj.service_root_url = message.serviceRootUrl; - obj.overview = message.overview; + obj.documentation_root_url = message.documentationRootUrl === "" ? undefined : message.documentationRootUrl; + obj.service_root_url = message.serviceRootUrl === "" ? undefined : message.serviceRootUrl; + obj.overview = message.overview === "" ? undefined : message.overview; return obj; }, fromAminoMsg(object: DocumentationAminoMsg): Documentation { @@ -536,9 +536,9 @@ export const DocumentationRule = { }, toAmino(message: DocumentationRule): DocumentationRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.description = message.description; - obj.deprecation_description = message.deprecationDescription; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.description = message.description === "" ? undefined : message.description; + obj.deprecation_description = message.deprecationDescription === "" ? undefined : message.deprecationDescription; return obj; }, fromAminoMsg(object: DocumentationRuleAminoMsg): DocumentationRule { @@ -664,12 +664,12 @@ export const Page = { }, toAmino(message: Page): PageAmino { const obj: any = {}; - obj.name = message.name; - obj.content = message.content; + obj.name = message.name === "" ? undefined : message.name; + obj.content = message.content === "" ? undefined : message.content; if (message.subpages) { obj.subpages = message.subpages.map(e => e ? Page.toAmino(e) : undefined); } else { - obj.subpages = []; + obj.subpages = message.subpages; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/api/endpoint.ts b/__fixtures__/v-next/outputosmojs/google/api/endpoint.ts index 6059b784d1..dc0e5efdbf 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/endpoint.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/endpoint.ts @@ -203,14 +203,14 @@ export const Endpoint = { }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.aliases) { obj.aliases = message.aliases.map(e => e); } else { - obj.aliases = []; + obj.aliases = message.aliases; } - obj.target = message.target; - obj.allow_cors = message.allowCors; + obj.target = message.target === "" ? undefined : message.target; + obj.allow_cors = message.allowCors === false ? undefined : message.allowCors; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { 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 13c235fe75..e2db0c3173 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 @@ -349,10 +349,10 @@ export const ParseRequest = { }, 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; + obj.cel_source = message.celSource === "" ? undefined : message.celSource; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.source_location = message.sourceLocation === "" ? undefined : message.sourceLocation; + obj.disable_macros = message.disableMacros === false ? undefined : message.disableMacros; return obj; }, fromAminoMsg(object: ParseRequestAminoMsg): ParseRequest { @@ -466,7 +466,7 @@ export const ParseResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -613,10 +613,10 @@ export const CheckRequest = { if (message.typeEnv) { obj.type_env = message.typeEnv.map(e => e ? Decl.toAmino(e) : undefined); } else { - obj.type_env = []; + obj.type_env = message.typeEnv; } - obj.container = message.container; - obj.no_std_env = message.noStdEnv; + obj.container = message.container === "" ? undefined : message.container; + obj.no_std_env = message.noStdEnv === false ? undefined : message.noStdEnv; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -730,7 +730,7 @@ export const CheckResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -834,7 +834,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -1016,7 +1016,7 @@ export const EvalRequest = { obj.bindings[k] = ExprValue.toAmino(v); }); } - obj.container = message.container; + obj.container = message.container === "" ? undefined : message.container; return obj; }, fromAminoMsg(object: EvalRequestAminoMsg): EvalRequest { @@ -1130,7 +1130,7 @@ export const EvalResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -1239,7 +1239,7 @@ export const IssueDetails = { fromAmino(object: IssueDetailsAmino): IssueDetails { const message = createBaseIssueDetails(); if (object.severity !== undefined && object.severity !== null) { - message.severity = issueDetails_SeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.position !== undefined && object.position !== null) { message.position = SourcePosition.fromAmino(object.position); @@ -1251,9 +1251,9 @@ export const IssueDetails = { }, toAmino(message: IssueDetails): IssueDetailsAmino { const obj: any = {}; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.position = message.position ? SourcePosition.toAmino(message.position) : undefined; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; return obj; }, fromAminoMsg(object: IssueDetailsAminoMsg): IssueDetails { 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 0ac45d4547..422b442ccc 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/checked.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/checked.ts @@ -659,7 +659,7 @@ export const CheckedExpr_ReferenceMapEntry = { }, toAmino(message: CheckedExpr_ReferenceMapEntry): CheckedExpr_ReferenceMapEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Reference.toAmino(message.value) : undefined; return obj; }, @@ -757,7 +757,7 @@ export const CheckedExpr_TypeMapEntry = { }, toAmino(message: CheckedExpr_TypeMapEntry): CheckedExpr_TypeMapEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Type.toAmino(message.value) : undefined; return obj; }, @@ -1003,7 +1003,7 @@ export const CheckedExpr = { }); } obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined; - obj.expr_version = message.exprVersion; + obj.expr_version = message.exprVersion === "" ? undefined : message.exprVersion; obj.expr = message.expr ? Expr.toAmino(message.expr) : undefined; return obj; }, @@ -1245,16 +1245,16 @@ export const Type = { message.dyn = Empty.fromAmino(object.dyn); } if (object.null !== undefined && object.null !== null) { - message.null = nullValueFromJSON(object.null); + message.null = object.null; } if (object.primitive !== undefined && object.primitive !== null) { - message.primitive = type_PrimitiveTypeFromJSON(object.primitive); + message.primitive = object.primitive; } if (object.wrapper !== undefined && object.wrapper !== null) { - message.wrapper = type_PrimitiveTypeFromJSON(object.wrapper); + message.wrapper = object.wrapper; } if (object.well_known !== undefined && object.well_known !== null) { - message.wellKnown = type_WellKnownTypeFromJSON(object.well_known); + message.wellKnown = object.well_known; } if (object.list_type !== undefined && object.list_type !== null) { message.listType = Type_ListType.fromAmino(object.list_type); @@ -1285,15 +1285,15 @@ export const Type = { 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.null = message.null === null ? undefined : message.null; + obj.primitive = message.primitive === null ? undefined : message.primitive; + obj.wrapper = message.wrapper === null ? undefined : message.wrapper; + obj.well_known = message.wellKnown === null ? undefined : 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.message_type = message.messageType === null ? undefined : message.messageType; + obj.type_param = message.typeParam === null ? undefined : 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; @@ -1603,7 +1603,7 @@ export const Type_FunctionType = { if (message.argTypes) { obj.arg_types = message.argTypes.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.arg_types = []; + obj.arg_types = message.argTypes; } return obj; }, @@ -1714,11 +1714,11 @@ export const Type_AbstractType = { }, toAmino(message: Type_AbstractType): Type_AbstractTypeAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.parameterTypes) { obj.parameter_types = message.parameterTypes.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.parameter_types = []; + obj.parameter_types = message.parameterTypes; } return obj; }, @@ -1839,7 +1839,7 @@ export const Decl = { }, toAmino(message: Decl): DeclAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.ident = message.ident ? Decl_IdentDecl.toAmino(message.ident) : undefined; obj.function = message.function ? Decl_FunctionDecl.toAmino(message.function) : undefined; return obj; @@ -1963,7 +1963,7 @@ export const Decl_IdentDecl = { 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; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromAminoMsg(object: Decl_IdentDeclAminoMsg): Decl_IdentDecl { @@ -2060,7 +2060,7 @@ export const Decl_FunctionDecl = { if (message.overloads) { obj.overloads = message.overloads.map(e => e ? Decl_FunctionDecl_Overload.toAmino(e) : undefined); } else { - obj.overloads = []; + obj.overloads = message.overloads; } return obj; }, @@ -2241,20 +2241,20 @@ export const Decl_FunctionDecl_Overload = { }, toAmino(message: Decl_FunctionDecl_Overload): Decl_FunctionDecl_OverloadAmino { const obj: any = {}; - obj.overload_id = message.overloadId; + obj.overload_id = message.overloadId === "" ? undefined : message.overloadId; if (message.params) { obj.params = message.params.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.params = []; + obj.params = message.params; } if (message.typeParams) { obj.type_params = message.typeParams.map(e => e); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } obj.result_type = message.resultType ? Type.toAmino(message.resultType) : undefined; - obj.is_instance_function = message.isInstanceFunction; - obj.doc = message.doc; + obj.is_instance_function = message.isInstanceFunction === false ? undefined : message.isInstanceFunction; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromAminoMsg(object: Decl_FunctionDecl_OverloadAminoMsg): Decl_FunctionDecl_Overload { @@ -2380,11 +2380,11 @@ export const Reference = { }, toAmino(message: Reference): ReferenceAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.overloadId) { obj.overload_id = message.overloadId.map(e => e); } else { - obj.overload_id = []; + obj.overload_id = message.overloadId; } obj.value = message.value ? Constant.toAmino(message.value) : undefined; return obj; 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 00b384245e..19b4d1333c 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/eval.ts @@ -251,12 +251,12 @@ export const EvalState = { if (message.values) { obj.values = message.values.map(e => e ? ExprValue.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.results) { obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e) : undefined); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -361,8 +361,8 @@ export const EvalState_Result = { }, 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; + obj.expr = message.expr !== BigInt(0) ? message.expr.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result { @@ -581,7 +581,7 @@ export const ErrorSet = { if (message.errors) { obj.errors = message.errors.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.errors = []; + obj.errors = message.errors; } return obj; }, @@ -688,7 +688,7 @@ export const UnknownSet = { if (message.exprs) { obj.exprs = message.exprs.map(e => e.toString()); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, 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 8ae5b585a6..a9f3766d08 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/explain.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/explain.ts @@ -153,12 +153,12 @@ export const Explain = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.exprSteps) { obj.expr_steps = message.exprSteps.map(e => e ? Explain_ExprStep.toAmino(e) : undefined); } else { - obj.expr_steps = []; + obj.expr_steps = message.exprSteps; } return obj; }, @@ -263,8 +263,8 @@ export const Explain_ExprStep = { }, toAmino(message: Explain_ExprStep): Explain_ExprStepAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.value_index = message.valueIndex; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.value_index = message.valueIndex === 0 ? undefined : message.valueIndex; return obj; }, fromAminoMsg(object: Explain_ExprStepAminoMsg): Explain_ExprStep { 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 65d90c08d7..5dca79dbde 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/syntax.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/syntax.ts @@ -822,7 +822,7 @@ export const Expr = { }, toAmino(message: Expr): ExprAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? 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; @@ -917,7 +917,7 @@ export const Expr_Ident = { }, toAmino(message: Expr_Ident): Expr_IdentAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident { @@ -1038,8 +1038,8 @@ export const Expr_Select = { 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; + obj.field = message.field === "" ? undefined : message.field; + obj.test_only = message.testOnly === false ? undefined : message.testOnly; return obj; }, fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select { @@ -1166,11 +1166,11 @@ export const Expr_Call = { toAmino(message: Expr_Call): Expr_CallAmino { const obj: any = {}; obj.target = message.target ? Expr.toAmino(message.target) : undefined; - obj.function = message.function; + obj.function = message.function === "" ? undefined : message.function; if (message.args) { obj.args = message.args.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } return obj; }, @@ -1268,7 +1268,7 @@ export const Expr_CreateList = { if (message.elements) { obj.elements = message.elements.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.elements = []; + obj.elements = message.elements; } return obj; }, @@ -1379,11 +1379,11 @@ export const Expr_CreateStruct = { }, toAmino(message: Expr_CreateStruct): Expr_CreateStructAmino { const obj: any = {}; - obj.message_name = message.messageName; + obj.message_name = message.messageName === "" ? undefined : message.messageName; if (message.entries) { obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1520,8 +1520,8 @@ export const Expr_CreateStruct_Entry = { }, 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.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.field_key = message.fieldKey === null ? undefined : message.fieldKey; obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; @@ -1707,9 +1707,9 @@ export const Expr_Comprehension = { }, toAmino(message: Expr_Comprehension): Expr_ComprehensionAmino { const obj: any = {}; - obj.iter_var = message.iterVar; + obj.iter_var = message.iterVar === "" ? undefined : message.iterVar; obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange) : undefined; - obj.accu_var = message.accuVar; + obj.accu_var = message.accuVar === "" ? undefined : 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; @@ -1903,7 +1903,7 @@ export const Constant = { fromAmino(object: ConstantAmino): Constant { const message = createBaseConstant(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -1933,12 +1933,12 @@ export const Constant = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; obj.duration_value = message.durationValue ? Duration.toAmino(message.durationValue) : undefined; obj.timestamp_value = message.timestampValue ? Timestamp.toAmino(toTimestamp(message.timestampValue)) : undefined; @@ -2044,8 +2044,8 @@ export const SourceInfo_PositionsEntry = { }, toAmino(message: SourceInfo_PositionsEntry): SourceInfo_PositionsEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; - obj.value = message.value; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry { @@ -2142,7 +2142,7 @@ export const SourceInfo_MacroCallsEntry = { }, toAmino(message: SourceInfo_MacroCallsEntry): SourceInfo_MacroCallsEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; }, @@ -2390,12 +2390,12 @@ export const SourceInfo = { }, toAmino(message: SourceInfo): SourceInfoAmino { const obj: any = {}; - obj.syntax_version = message.syntaxVersion; - obj.location = message.location; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -2544,10 +2544,10 @@ export const SourcePosition = { }, toAmino(message: SourcePosition): SourcePositionAmino { const obj: any = {}; - obj.location = message.location; - obj.offset = message.offset; - obj.line = message.line; - obj.column = message.column; + obj.location = message.location === "" ? undefined : message.location; + obj.offset = message.offset === 0 ? undefined : message.offset; + obj.line = message.line === 0 ? undefined : message.line; + obj.column = message.column === 0 ? undefined : message.column; return obj; }, fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition { 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 fa7fe25f03..1685c533c3 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/value.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/value.ts @@ -357,7 +357,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -396,18 +396,18 @@ export const 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; 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; + obj.type_value = message.typeValue === null ? undefined : message.typeValue; return obj; }, fromAminoMsg(object: ValueAminoMsg): Value { @@ -511,8 +511,8 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.type = message.type; - obj.value = message.value; + obj.type = message.type === "" ? undefined : message.type; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EnumValueAminoMsg): EnumValue { @@ -609,7 +609,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, @@ -707,7 +707,7 @@ export const MapValue = { if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, 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 7d62e5beb7..3101af0a6f 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/decl.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/decl.ts @@ -227,9 +227,9 @@ export const Decl = { }, toAmino(message: Decl): DeclAmino { const obj: any = {}; - obj.id = message.id; - obj.name = message.name; - obj.doc = message.doc; + obj.id = message.id === 0 ? undefined : message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.doc = message.doc === "" ? undefined : message.doc; obj.ident = message.ident ? IdentDecl.toAmino(message.ident) : undefined; obj.function = message.function ? FunctionDecl.toAmino(message.function) : undefined; return obj; @@ -357,12 +357,12 @@ export const DeclType = { }, toAmino(message: DeclType): DeclTypeAmino { const obj: any = {}; - obj.id = message.id; - obj.type = message.type; + obj.id = message.id === 0 ? undefined : message.id; + obj.type = message.type === "" ? undefined : message.type; if (message.typeParams) { obj.type_params = message.typeParams.map(e => e ? DeclType.toAmino(e) : undefined); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } return obj; }, @@ -597,10 +597,10 @@ export const FunctionDecl = { if (message.args) { obj.args = message.args.map(e => e ? IdentDecl.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } obj.return_type = message.returnType ? DeclType.toAmino(message.returnType) : undefined; - obj.receiver_function = message.receiverFunction; + obj.receiver_function = message.receiverFunction === false ? undefined : message.receiverFunction; return obj; }, fromAminoMsg(object: FunctionDeclAminoMsg): FunctionDecl { 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 dbdaa9be60..c12150cb6f 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/eval.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/eval.ts @@ -264,12 +264,12 @@ export const EvalState = { if (message.values) { obj.values = message.values.map(e => e ? ExprValue.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.results) { obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e) : undefined); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -375,7 +375,7 @@ export const EvalState_Result = { toAmino(message: EvalState_Result): EvalState_ResultAmino { const obj: any = {}; obj.expr = message.expr ? IdRef.toAmino(message.expr) : undefined; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result { @@ -594,7 +594,7 @@ export const ErrorSet = { if (message.errors) { obj.errors = message.errors.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.errors = []; + obj.errors = message.errors; } return obj; }, @@ -692,7 +692,7 @@ export const UnknownSet = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -781,7 +781,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { 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 4fefa5e731..221e99356f 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/expr.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/expr.ts @@ -509,7 +509,7 @@ export const ParsedExpr = { 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; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; return obj; }, fromAminoMsg(object: ParsedExprAminoMsg): ParsedExpr { @@ -709,7 +709,7 @@ export const Expr = { }, toAmino(message: Expr): ExprAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : 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; @@ -804,7 +804,7 @@ export const Expr_Ident = { }, toAmino(message: Expr_Ident): Expr_IdentAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident { @@ -925,8 +925,8 @@ export const Expr_Select = { 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; + obj.field = message.field === "" ? undefined : message.field; + obj.test_only = message.testOnly === false ? undefined : message.testOnly; return obj; }, fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select { @@ -1053,11 +1053,11 @@ export const Expr_Call = { toAmino(message: Expr_Call): Expr_CallAmino { const obj: any = {}; obj.target = message.target ? Expr.toAmino(message.target) : undefined; - obj.function = message.function; + obj.function = message.function === "" ? undefined : message.function; if (message.args) { obj.args = message.args.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } return obj; }, @@ -1155,7 +1155,7 @@ export const Expr_CreateList = { if (message.elements) { obj.elements = message.elements.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.elements = []; + obj.elements = message.elements; } return obj; }, @@ -1266,11 +1266,11 @@ export const Expr_CreateStruct = { }, toAmino(message: Expr_CreateStruct): Expr_CreateStructAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.entries) { obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1407,8 +1407,8 @@ export const Expr_CreateStruct_Entry = { }, toAmino(message: Expr_CreateStruct_Entry): Expr_CreateStruct_EntryAmino { const obj: any = {}; - obj.id = message.id; - obj.field_key = message.fieldKey; + obj.id = message.id === 0 ? undefined : message.id; + obj.field_key = message.fieldKey === null ? undefined : message.fieldKey; obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; @@ -1594,9 +1594,9 @@ export const Expr_Comprehension = { }, toAmino(message: Expr_Comprehension): Expr_ComprehensionAmino { const obj: any = {}; - obj.iter_var = message.iterVar; + obj.iter_var = message.iterVar === "" ? undefined : message.iterVar; obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange) : undefined; - obj.accu_var = message.accuVar; + obj.accu_var = message.accuVar === "" ? undefined : 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; @@ -1764,7 +1764,7 @@ export const Literal = { fromAmino(object: LiteralAmino): Literal { const message = createBaseLiteral(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -1788,12 +1788,12 @@ export const Literal = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; return obj; }, 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 a189638bfc..d16d3661dd 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/source.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/source.ts @@ -163,8 +163,8 @@ export const SourceInfo_PositionsEntry = { }, toAmino(message: SourceInfo_PositionsEntry): SourceInfo_PositionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === 0 ? undefined : message.key; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry { @@ -336,11 +336,11 @@ export const SourceInfo = { }, toAmino(message: SourceInfo): SourceInfoAmino { const obj: any = {}; - obj.location = message.location; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -483,10 +483,10 @@ export const SourcePosition = { }, toAmino(message: SourcePosition): SourcePositionAmino { const obj: any = {}; - obj.location = message.location; - obj.offset = message.offset; - obj.line = message.line; - obj.column = message.column; + obj.location = message.location === "" ? undefined : message.location; + obj.offset = message.offset === 0 ? undefined : message.offset; + obj.line = message.line === 0 ? undefined : message.line; + obj.column = message.column === 0 ? undefined : message.column; return obj; }, fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition { 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 d13b8dd872..c8f1fa9ed9 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/value.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/value.ts @@ -357,7 +357,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -396,18 +396,18 @@ export const 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; 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; + obj.type_value = message.typeValue === null ? undefined : message.typeValue; return obj; }, fromAminoMsg(object: ValueAminoMsg): Value { @@ -511,8 +511,8 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.type = message.type; - obj.value = message.value; + obj.type = message.type === "" ? undefined : message.type; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EnumValueAminoMsg): EnumValue { @@ -609,7 +609,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, @@ -707,7 +707,7 @@ export const MapValue = { if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/api/http.ts b/__fixtures__/v-next/outputosmojs/google/api/http.ts index 8271d37b0f..b28d53472e 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/http.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/http.ts @@ -756,9 +756,9 @@ export const Http = { if (message.rules) { obj.rules = message.rules.map(e => e ? HttpRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion; + obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion === false ? undefined : message.fullyDecodeReservedExpansion; return obj; }, fromAminoMsg(object: HttpAminoMsg): Http { @@ -996,19 +996,19 @@ export const HttpRule = { }, 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.selector = message.selector === "" ? undefined : message.selector; + obj.get = message.get === null ? undefined : message.get; + obj.put = message.put === null ? undefined : message.put; + obj.post = message.post === null ? undefined : message.post; + obj.delete = message.delete === null ? undefined : message.delete; + obj.patch = message.patch === null ? undefined : message.patch; obj.custom = message.custom ? CustomHttpPattern.toAmino(message.custom) : undefined; - obj.body = message.body; - obj.response_body = message.responseBody; + obj.body = message.body === "" ? undefined : message.body; + obj.response_body = message.responseBody === "" ? undefined : message.responseBody; if (message.additionalBindings) { obj.additional_bindings = message.additionalBindings.map(e => e ? HttpRule.toAmino(e) : undefined); } else { - obj.additional_bindings = []; + obj.additional_bindings = message.additionalBindings; } return obj; }, @@ -1113,8 +1113,8 @@ export const CustomHttpPattern = { }, toAmino(message: CustomHttpPattern): CustomHttpPatternAmino { const obj: any = {}; - obj.kind = message.kind; - obj.path = message.path; + obj.kind = message.kind === "" ? undefined : message.kind; + obj.path = message.path === "" ? undefined : message.path; return obj; }, fromAminoMsg(object: CustomHttpPatternAminoMsg): CustomHttpPattern { diff --git a/__fixtures__/v-next/outputosmojs/google/api/httpbody.ts b/__fixtures__/v-next/outputosmojs/google/api/httpbody.ts index 571dc87f46..1f30544a76 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/httpbody.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/httpbody.ts @@ -219,12 +219,12 @@ export const HttpBody = { }, toAmino(message: HttpBody): HttpBodyAmino { const obj: any = {}; - obj.content_type = message.contentType; + obj.content_type = message.contentType === "" ? undefined : message.contentType; obj.data = message.data ? base64FromBytes(message.data) : undefined; if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/api/label.ts b/__fixtures__/v-next/outputosmojs/google/api/label.ts index a9bc884c5a..9296177d0d 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/label.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/label.ts @@ -153,7 +153,7 @@ export const LabelDescriptor = { message.key = object.key; } if (object.value_type !== undefined && object.value_type !== null) { - message.valueType = labelDescriptor_ValueTypeFromJSON(object.value_type); + message.valueType = object.value_type; } if (object.description !== undefined && object.description !== null) { message.description = object.description; @@ -162,9 +162,9 @@ export const LabelDescriptor = { }, toAmino(message: LabelDescriptor): LabelDescriptorAmino { const obj: any = {}; - obj.key = message.key; - obj.value_type = message.valueType; - obj.description = message.description; + obj.key = message.key === "" ? undefined : message.key; + obj.value_type = message.valueType === 0 ? undefined : message.valueType; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: LabelDescriptorAminoMsg): LabelDescriptor { diff --git a/__fixtures__/v-next/outputosmojs/google/api/log.ts b/__fixtures__/v-next/outputosmojs/google/api/log.ts index 278f117371..b09da36df3 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/log.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/log.ts @@ -180,14 +180,14 @@ export const LogDescriptor = { }, toAmino(message: LogDescriptor): LogDescriptorAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.labels; } - obj.description = message.description; - obj.display_name = message.displayName; + obj.description = message.description === "" ? undefined : message.description; + obj.display_name = message.displayName === "" ? undefined : message.displayName; return obj; }, fromAminoMsg(object: LogDescriptorAminoMsg): LogDescriptor { diff --git a/__fixtures__/v-next/outputosmojs/google/api/logging.ts b/__fixtures__/v-next/outputosmojs/google/api/logging.ts index d2e7fbe681..dd24e7d373 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/logging.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/logging.ts @@ -217,12 +217,12 @@ export const Logging = { if (message.producerDestinations) { obj.producer_destinations = message.producerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e) : undefined); } else { - obj.producer_destinations = []; + obj.producer_destinations = message.producerDestinations; } if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -333,11 +333,11 @@ export const Logging_LoggingDestination = { }, toAmino(message: Logging_LoggingDestination): Logging_LoggingDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.logs) { obj.logs = message.logs.map(e => e); } else { - obj.logs = []; + obj.logs = message.logs; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/api/metric.ts b/__fixtures__/v-next/outputosmojs/google/api/metric.ts index 5fbc308f66..794f3be511 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/metric.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/metric.ts @@ -614,10 +614,10 @@ export const MetricDescriptor = { } message.labels = object.labels?.map(e => LabelDescriptor.fromAmino(e)) || []; if (object.metric_kind !== undefined && object.metric_kind !== null) { - message.metricKind = metricDescriptor_MetricKindFromJSON(object.metric_kind); + message.metricKind = object.metric_kind; } if (object.value_type !== undefined && object.value_type !== null) { - message.valueType = metricDescriptor_ValueTypeFromJSON(object.value_type); + message.valueType = object.value_type; } if (object.unit !== undefined && object.unit !== null) { message.unit = object.unit; @@ -632,31 +632,31 @@ export const MetricDescriptor = { message.metadata = MetricDescriptor_MetricDescriptorMetadata.fromAmino(object.metadata); } if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } message.monitoredResourceTypes = object.monitored_resource_types?.map(e => e) || []; return message; }, toAmino(message: MetricDescriptor): MetricDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.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.metric_kind = message.metricKind === 0 ? undefined : message.metricKind; + obj.value_type = message.valueType === 0 ? undefined : message.valueType; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.description = message.description === "" ? undefined : message.description; + obj.display_name = message.displayName === "" ? undefined : message.displayName; obj.metadata = message.metadata ? MetricDescriptor_MetricDescriptorMetadata.toAmino(message.metadata) : undefined; - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; if (message.monitoredResourceTypes) { obj.monitored_resource_types = message.monitoredResourceTypes.map(e => e); } else { - obj.monitored_resource_types = []; + obj.monitored_resource_types = message.monitoredResourceTypes; } return obj; }, @@ -765,7 +765,7 @@ export const MetricDescriptor_MetricDescriptorMetadata = { fromAmino(object: MetricDescriptor_MetricDescriptorMetadataAmino): MetricDescriptor_MetricDescriptorMetadata { const message = createBaseMetricDescriptor_MetricDescriptorMetadata(); if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } if (object.sample_period !== undefined && object.sample_period !== null) { message.samplePeriod = Duration.fromAmino(object.sample_period); @@ -777,7 +777,7 @@ export const MetricDescriptor_MetricDescriptorMetadata = { }, toAmino(message: MetricDescriptor_MetricDescriptorMetadata): MetricDescriptor_MetricDescriptorMetadataAmino { const obj: any = {}; - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; obj.sample_period = message.samplePeriod ? Duration.toAmino(message.samplePeriod) : undefined; obj.ingest_delay = message.ingestDelay ? Duration.toAmino(message.ingestDelay) : undefined; return obj; @@ -882,8 +882,8 @@ export const Metric_LabelsEntry = { }, toAmino(message: Metric_LabelsEntry): Metric_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: Metric_LabelsEntryAminoMsg): Metric_LabelsEntry { @@ -1024,7 +1024,7 @@ export const Metric = { }, toAmino(message: Metric): MetricAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { diff --git a/__fixtures__/v-next/outputosmojs/google/api/monitored_resource.ts b/__fixtures__/v-next/outputosmojs/google/api/monitored_resource.ts index 8da89aef40..50fad02b25 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/monitored_resource.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/monitored_resource.ts @@ -348,22 +348,22 @@ export const MonitoredResourceDescriptor = { } message.labels = object.labels?.map(e => LabelDescriptor.fromAmino(e)) || []; if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } return message; }, toAmino(message: MonitoredResourceDescriptor): MonitoredResourceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.display_name = message.displayName; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; + obj.display_name = message.displayName === "" ? undefined : message.displayName; + obj.description = message.description === "" ? undefined : message.description; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.labels; } - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; return obj; }, fromAminoMsg(object: MonitoredResourceDescriptorAminoMsg): MonitoredResourceDescriptor { @@ -466,8 +466,8 @@ export const MonitoredResource_LabelsEntry = { }, toAmino(message: MonitoredResource_LabelsEntry): MonitoredResource_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MonitoredResource_LabelsEntryAminoMsg): MonitoredResource_LabelsEntry { @@ -608,7 +608,7 @@ export const MonitoredResource = { }, toAmino(message: MonitoredResource): MonitoredResourceAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -717,8 +717,8 @@ export const MonitoredResourceMetadata_UserLabelsEntry = { }, toAmino(message: MonitoredResourceMetadata_UserLabelsEntry): MonitoredResourceMetadata_UserLabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MonitoredResourceMetadata_UserLabelsEntryAminoMsg): MonitoredResourceMetadata_UserLabelsEntry { diff --git a/__fixtures__/v-next/outputosmojs/google/api/monitoring.ts b/__fixtures__/v-next/outputosmojs/google/api/monitoring.ts index 93a94f4b86..3560e4415a 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/monitoring.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/monitoring.ts @@ -265,12 +265,12 @@ export const Monitoring = { if (message.producerDestinations) { obj.producer_destinations = message.producerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e) : undefined); } else { - obj.producer_destinations = []; + obj.producer_destinations = message.producerDestinations; } if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -381,11 +381,11 @@ export const Monitoring_MonitoringDestination = { }, toAmino(message: Monitoring_MonitoringDestination): Monitoring_MonitoringDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.metrics) { obj.metrics = message.metrics.map(e => e); } else { - obj.metrics = []; + obj.metrics = message.metrics; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/api/quota.ts b/__fixtures__/v-next/outputosmojs/google/api/quota.ts index cbbb4921bd..6e30403b15 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/quota.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/quota.ts @@ -401,12 +401,12 @@ export const Quota = { if (message.limits) { obj.limits = message.limits.map(e => e ? QuotaLimit.toAmino(e) : undefined); } else { - obj.limits = []; + obj.limits = message.limits; } if (message.metricRules) { obj.metric_rules = message.metricRules.map(e => e ? MetricRule.toAmino(e) : undefined); } else { - obj.metric_rules = []; + obj.metric_rules = message.metricRules; } return obj; }, @@ -510,8 +510,8 @@ export const MetricRule_MetricCostsEntry = { }, toAmino(message: MetricRule_MetricCostsEntry): MetricRule_MetricCostsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value ? message.value.toString() : undefined; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: MetricRule_MetricCostsEntryAminoMsg): MetricRule_MetricCostsEntry { @@ -652,7 +652,7 @@ export const MetricRule = { }, toAmino(message: MetricRule): MetricRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.metric_costs = {}; if (message.metricCosts) { Object.entries(message.metricCosts).forEach(([k, v]) => { @@ -761,8 +761,8 @@ export const QuotaLimit_ValuesEntry = { }, toAmino(message: QuotaLimit_ValuesEntry): QuotaLimit_ValuesEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value ? message.value.toString() : undefined; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: QuotaLimit_ValuesEntryAminoMsg): QuotaLimit_ValuesEntry { @@ -1031,21 +1031,21 @@ export const QuotaLimit = { }, 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.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.default_limit = message.defaultLimit !== BigInt(0) ? message.defaultLimit.toString() : undefined; + obj.max_limit = message.maxLimit !== BigInt(0) ? message.maxLimit.toString() : undefined; + obj.free_tier = message.freeTier !== BigInt(0) ? message.freeTier.toString() : undefined; + obj.duration = message.duration === "" ? undefined : message.duration; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; obj.values = {}; if (message.values) { Object.entries(message.values).forEach(([k, v]) => { obj.values[k] = v.toString(); }); } - obj.display_name = message.displayName; + obj.display_name = message.displayName === "" ? undefined : message.displayName; return obj; }, fromAminoMsg(object: QuotaLimitAminoMsg): QuotaLimit { diff --git a/__fixtures__/v-next/outputosmojs/google/api/resource.ts b/__fixtures__/v-next/outputosmojs/google/api/resource.ts index a98cf87b07..1617ef9cef 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/resource.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/resource.ts @@ -517,7 +517,7 @@ export const ResourceDescriptor = { message.nameField = object.name_field; } if (object.history !== undefined && object.history !== null) { - message.history = resourceDescriptor_HistoryFromJSON(object.history); + message.history = object.history; } if (object.plural !== undefined && object.plural !== null) { message.plural = object.plural; @@ -525,25 +525,25 @@ export const ResourceDescriptor = { if (object.singular !== undefined && object.singular !== null) { message.singular = object.singular; } - message.style = object.style?.map(e => resourceDescriptor_StyleFromJSON(e)) || []; + message.style = object.style?.map(e => e) || []; return message; }, toAmino(message: ResourceDescriptor): ResourceDescriptorAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.pattern) { obj.pattern = message.pattern.map(e => e); } else { - obj.pattern = []; + obj.pattern = message.pattern; } - obj.name_field = message.nameField; - obj.history = message.history; - obj.plural = message.plural; - obj.singular = message.singular; + obj.name_field = message.nameField === "" ? undefined : message.nameField; + obj.history = message.history === 0 ? undefined : message.history; + obj.plural = message.plural === "" ? undefined : message.plural; + obj.singular = message.singular === "" ? undefined : message.singular; if (message.style) { obj.style = message.style.map(e => e); } else { - obj.style = []; + obj.style = message.style; } return obj; }, @@ -648,8 +648,8 @@ export const ResourceReference = { }, toAmino(message: ResourceReference): ResourceReferenceAmino { const obj: any = {}; - obj.type = message.type; - obj.child_type = message.childType; + obj.type = message.type === "" ? undefined : message.type; + obj.child_type = message.childType === "" ? undefined : message.childType; return obj; }, fromAminoMsg(object: ResourceReferenceAminoMsg): ResourceReference { diff --git a/__fixtures__/v-next/outputosmojs/google/api/routing.ts b/__fixtures__/v-next/outputosmojs/google/api/routing.ts index 1e7b75f52e..925add4d28 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/routing.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/routing.ts @@ -890,7 +890,7 @@ export const RoutingRule = { if (message.routingParameters) { obj.routing_parameters = message.routingParameters.map(e => e ? RoutingParameter.toAmino(e) : undefined); } else { - obj.routing_parameters = []; + obj.routing_parameters = message.routingParameters; } return obj; }, @@ -995,8 +995,8 @@ export const RoutingParameter = { }, toAmino(message: RoutingParameter): RoutingParameterAmino { const obj: any = {}; - obj.field = message.field; - obj.path_template = message.pathTemplate; + obj.field = message.field === "" ? undefined : message.field; + obj.path_template = message.pathTemplate === "" ? undefined : message.pathTemplate; return obj; }, fromAminoMsg(object: RoutingParameterAminoMsg): RoutingParameter { diff --git a/__fixtures__/v-next/outputosmojs/google/api/service.ts b/__fixtures__/v-next/outputosmojs/google/api/service.ts index b1f198756d..4613d841fc 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/service.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/service.ts @@ -694,24 +694,24 @@ export const Service = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; + obj.id = message.id === "" ? undefined : message.id; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } if (message.types) { obj.types = message.types.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.types = []; + obj.types = message.types; } if (message.enums) { obj.enums = message.enums.map(e => e ? Enum.toAmino(e) : undefined); } else { - obj.enums = []; + obj.enums = message.enums; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.backend = message.backend ? Backend.toAmino(message.backend) : undefined; @@ -723,23 +723,23 @@ export const Service = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.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 = []; + obj.logs = message.logs; } if (message.metrics) { obj.metrics = message.metrics.map(e => e ? MetricDescriptor.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.billing = message.billing ? Billing.toAmino(message.billing) : undefined; obj.logging = message.logging ? Logging.toAmino(message.logging) : undefined; 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 b40fcca14c..fc55fd2e0c 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 @@ -331,7 +331,7 @@ export const CheckError = { fromAmino(object: CheckErrorAmino): CheckError { const message = createBaseCheckError(); if (object.code !== undefined && object.code !== null) { - message.code = checkError_CodeFromJSON(object.code); + message.code = object.code; } if (object.subject !== undefined && object.subject !== null) { message.subject = object.subject; @@ -346,9 +346,9 @@ export const CheckError = { }, toAmino(message: CheckError): CheckErrorAmino { const obj: any = {}; - obj.code = message.code; - obj.subject = message.subject; - obj.detail = message.detail; + obj.code = message.code === 0 ? undefined : message.code; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.detail = message.detail === "" ? undefined : message.detail; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, 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 7ef276beae..129860ef8c 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/distribution.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/distribution.ts @@ -408,15 +408,15 @@ export const Distribution = { }, 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; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.mean = message.mean === 0 ? undefined : message.mean; + obj.minimum = message.minimum === 0 ? undefined : message.minimum; + obj.maximum = message.maximum === 0 ? undefined : message.maximum; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation === 0 ? undefined : message.sumOfSquaredDeviation; if (message.bucketCounts) { obj.bucket_counts = message.bucketCounts.map(e => e.toString()); } else { - obj.bucket_counts = []; + obj.bucket_counts = message.bucketCounts; } obj.linear_buckets = message.linearBuckets ? Distribution_LinearBuckets.toAmino(message.linearBuckets) : undefined; obj.exponential_buckets = message.exponentialBuckets ? Distribution_ExponentialBuckets.toAmino(message.exponentialBuckets) : undefined; @@ -424,7 +424,7 @@ export const Distribution = { if (message.exemplars) { obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e) : undefined); } else { - obj.exemplars = []; + obj.exemplars = message.exemplars; } return obj; }, @@ -545,9 +545,9 @@ export const Distribution_LinearBuckets = { }, toAmino(message: Distribution_LinearBuckets): Distribution_LinearBucketsAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.width = message.width; - obj.offset = message.offset; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.width = message.width === 0 ? undefined : message.width; + obj.offset = message.offset === 0 ? undefined : message.offset; return obj; }, fromAminoMsg(object: Distribution_LinearBucketsAminoMsg): Distribution_LinearBuckets { @@ -667,9 +667,9 @@ export const Distribution_ExponentialBuckets = { }, toAmino(message: Distribution_ExponentialBuckets): Distribution_ExponentialBucketsAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.growth_factor = message.growthFactor; - obj.scale = message.scale; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.growth_factor = message.growthFactor === 0 ? undefined : message.growthFactor; + obj.scale = message.scale === 0 ? undefined : message.scale; return obj; }, fromAminoMsg(object: Distribution_ExponentialBucketsAminoMsg): Distribution_ExponentialBuckets { @@ -775,7 +775,7 @@ export const Distribution_ExplicitBuckets = { if (message.bounds) { obj.bounds = message.bounds.map(e => e); } else { - obj.bounds = []; + obj.bounds = message.bounds; } return obj; }, 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 0a1b71bda4..d1b1dca6f6 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 @@ -398,21 +398,21 @@ export const HttpRequest = { }, 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.request_method = message.requestMethod === "" ? undefined : message.requestMethod; + obj.request_url = message.requestUrl === "" ? undefined : message.requestUrl; + obj.request_size = message.requestSize !== BigInt(0) ? message.requestSize.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.response_size = message.responseSize !== BigInt(0) ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent === "" ? undefined : message.userAgent; + obj.remote_ip = message.remoteIp === "" ? undefined : message.remoteIp; + obj.server_ip = message.serverIp === "" ? undefined : message.serverIp; + obj.referer = message.referer === "" ? undefined : 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; + obj.cache_lookup = message.cacheLookup === false ? undefined : message.cacheLookup; + obj.cache_hit = message.cacheHit === false ? undefined : message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer === false ? undefined : message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes !== BigInt(0) ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest { 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 38dc2a1c04..93685dc851 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 @@ -261,8 +261,8 @@ export const LogEntry_LabelsEntry = { }, toAmino(message: LogEntry_LabelsEntry): LogEntry_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry { @@ -525,7 +525,7 @@ export const LogEntry = { message.timestamp = fromTimestamp(Timestamp.fromAmino(object.timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.http_request !== undefined && object.http_request !== null) { message.httpRequest = HttpRequest.fromAmino(object.http_request); @@ -563,12 +563,12 @@ export const LogEntry = { }, toAmino(message: LogEntry): LogEntryAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; - obj.trace = message.trace; - obj.insert_id = message.insertId; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -576,7 +576,7 @@ export const LogEntry = { }); } obj.proto_payload = message.protoPayload ? Any.toAmino(message.protoPayload) : undefined; - obj.text_payload = message.textPayload; + obj.text_payload = message.textPayload === null ? undefined : 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; @@ -715,10 +715,10 @@ export const LogEntryOperation = { }, toAmino(message: LogEntryOperation): LogEntryOperationAmino { const obj: any = {}; - obj.id = message.id; - obj.producer = message.producer; - obj.first = message.first; - obj.last = message.last; + obj.id = message.id === "" ? undefined : message.id; + obj.producer = message.producer === "" ? undefined : message.producer; + obj.first = message.first === false ? undefined : message.first; + obj.last = message.last === false ? undefined : message.last; return obj; }, fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation { @@ -838,9 +838,9 @@ export const LogEntrySourceLocation = { }, toAmino(message: LogEntrySourceLocation): LogEntrySourceLocationAmino { const obj: any = {}; - obj.file = message.file; - obj.line = message.line ? message.line.toString() : undefined; - obj.function = message.function; + obj.file = message.file === "" ? undefined : message.file; + obj.line = message.line !== BigInt(0) ? message.line.toString() : undefined; + obj.function = message.function === "" ? undefined : message.function; return obj; }, fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation { 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 379a026ffb..1464723e1e 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 @@ -176,8 +176,8 @@ export const MetricValue_LabelsEntry = { }, toAmino(message: MetricValue_LabelsEntry): MetricValue_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MetricValue_LabelsEntryAminoMsg): MetricValue_LabelsEntry { @@ -424,10 +424,10 @@ export const MetricValue = { } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; - 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.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.distribution_value = message.distributionValue ? Distribution.toAmino(message.distributionValue) : undefined; return obj; }, @@ -538,11 +538,11 @@ export const MetricValueSet = { }, toAmino(message: MetricValueSet): MetricValueSetAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; if (message.metricValues) { obj.metric_values = message.metricValues.map(e => e ? MetricValue.toAmino(e) : undefined); } else { - obj.metric_values = []; + obj.metric_values = message.metricValues; } return obj; }, 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 779d134aa7..077f27f85d 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/operation.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/operation.ts @@ -243,8 +243,8 @@ export const Operation_LabelsEntry = { }, toAmino(message: Operation_LabelsEntry): Operation_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: Operation_LabelsEntryAminoMsg): Operation_LabelsEntry { @@ -524,16 +524,16 @@ export const Operation = { message.metricValueSets = object.metric_value_sets?.map(e => MetricValueSet.fromAmino(e)) || []; message.logEntries = object.log_entries?.map(e => LogEntry.fromAmino(e)) || []; if (object.importance !== undefined && object.importance !== null) { - message.importance = operation_ImportanceFromJSON(object.importance); + message.importance = object.importance; } message.extensions = object.extensions?.map(e => Any.fromAmino(e)) || []; return message; }, toAmino(message: Operation): OperationAmino { const obj: any = {}; - obj.operation_id = message.operationId; - obj.operation_name = message.operationName; - obj.consumer_id = message.consumerId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; + obj.operation_name = message.operationName === "" ? undefined : message.operationName; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; obj.labels = {}; @@ -545,18 +545,18 @@ export const Operation = { if (message.metricValueSets) { obj.metric_value_sets = message.metricValueSets.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.metric_value_sets = []; + obj.metric_value_sets = message.metricValueSets; } if (message.logEntries) { obj.log_entries = message.logEntries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.log_entries = []; + obj.log_entries = message.logEntries; } - obj.importance = message.importance; + obj.importance = message.importance === 0 ? undefined : message.importance; if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, 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 76f1190040..b69a987f59 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 @@ -451,9 +451,9 @@ export const AllocateQuotaRequest = { }, toAmino(message: AllocateQuotaRequest): AllocateQuotaRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.allocate_operation = message.allocateOperation ? QuotaOperation.toAmino(message.allocateOperation) : undefined; - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: AllocateQuotaRequestAminoMsg): AllocateQuotaRequest { @@ -556,8 +556,8 @@ export const QuotaOperation_LabelsEntry = { }, toAmino(message: QuotaOperation_LabelsEntry): QuotaOperation_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaOperation_LabelsEntryAminoMsg): QuotaOperation_LabelsEntry { @@ -762,15 +762,15 @@ export const QuotaOperation = { }, {}); message.quotaMetrics = object.quota_metrics?.map(e => MetricValueSet.fromAmino(e)) || []; if (object.quota_mode !== undefined && object.quota_mode !== null) { - message.quotaMode = quotaOperation_QuotaModeFromJSON(object.quota_mode); + message.quotaMode = object.quota_mode; } return message; }, toAmino(message: QuotaOperation): QuotaOperationAmino { const obj: any = {}; - obj.operation_id = message.operationId; - obj.method_name = message.methodName; - obj.consumer_id = message.consumerId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; + obj.method_name = message.methodName === "" ? undefined : message.methodName; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -780,9 +780,9 @@ export const QuotaOperation = { if (message.quotaMetrics) { obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.quota_metrics = []; + obj.quota_metrics = message.quotaMetrics; } - obj.quota_mode = message.quotaMode; + obj.quota_mode = message.quotaMode === 0 ? undefined : message.quotaMode; return obj; }, fromAminoMsg(object: QuotaOperationAminoMsg): QuotaOperation { @@ -930,18 +930,18 @@ export const AllocateQuotaResponse = { }, toAmino(message: AllocateQuotaResponse): AllocateQuotaResponseAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; if (message.allocateErrors) { obj.allocate_errors = message.allocateErrors.map(e => e ? QuotaError.toAmino(e) : undefined); } else { - obj.allocate_errors = []; + obj.allocate_errors = message.allocateErrors; } if (message.quotaMetrics) { obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.quota_metrics = []; + obj.quota_metrics = message.quotaMetrics; } - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: AllocateQuotaResponseAminoMsg): AllocateQuotaResponse { @@ -1062,7 +1062,7 @@ export const QuotaError = { fromAmino(object: QuotaErrorAmino): QuotaError { const message = createBaseQuotaError(); if (object.code !== undefined && object.code !== null) { - message.code = quotaError_CodeFromJSON(object.code); + message.code = object.code; } if (object.subject !== undefined && object.subject !== null) { message.subject = object.subject; @@ -1077,9 +1077,9 @@ export const QuotaError = { }, toAmino(message: QuotaError): QuotaErrorAmino { const obj: any = {}; - obj.code = message.code; - obj.subject = message.subject; - obj.description = message.description; + obj.code = message.code === 0 ? undefined : message.code; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, 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 22b711f5ea..4fed73ac79 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 @@ -393,9 +393,9 @@ export const CheckRequest = { }, toAmino(message: CheckRequest): CheckRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.operation = message.operation ? Operation.toAmino(message.operation) : undefined; - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -553,14 +553,14 @@ export const CheckResponse = { }, toAmino(message: CheckResponse): CheckResponseAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; if (message.checkErrors) { obj.check_errors = message.checkErrors.map(e => e ? CheckError.toAmino(e) : undefined); } else { - obj.check_errors = []; + obj.check_errors = message.checkErrors; } - obj.service_config_id = message.serviceConfigId; - obj.service_rollout_id = message.serviceRolloutId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId === "" ? undefined : message.serviceRolloutId; obj.check_info = message.checkInfo ? CheckResponse_CheckInfo.toAmino(message.checkInfo) : undefined; return obj; }, @@ -674,7 +674,7 @@ export const CheckResponse_CheckInfo = { if (message.unusedArguments) { obj.unused_arguments = message.unusedArguments.map(e => e); } else { - obj.unused_arguments = []; + obj.unused_arguments = message.unusedArguments; } obj.consumer_info = message.consumerInfo ? CheckResponse_ConsumerInfo.toAmino(message.consumerInfo) : undefined; return obj; @@ -787,7 +787,7 @@ export const CheckResponse_ConsumerInfo = { message.projectNumber = BigInt(object.project_number); } if (object.type !== undefined && object.type !== null) { - message.type = checkResponse_ConsumerInfo_ConsumerTypeFromJSON(object.type); + message.type = object.type; } if (object.consumer_number !== undefined && object.consumer_number !== null) { message.consumerNumber = BigInt(object.consumer_number); @@ -796,9 +796,9 @@ export const CheckResponse_ConsumerInfo = { }, 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; + obj.project_number = message.projectNumber !== BigInt(0) ? message.projectNumber.toString() : undefined; + obj.type = message.type === 0 ? undefined : message.type; + obj.consumer_number = message.consumerNumber !== BigInt(0) ? message.consumerNumber.toString() : undefined; return obj; }, fromAminoMsg(object: CheckResponse_ConsumerInfoAminoMsg): CheckResponse_ConsumerInfo { @@ -924,13 +924,13 @@ export const ReportRequest = { }, toAmino(message: ReportRequest): ReportRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; if (message.operations) { obj.operations = message.operations.map(e => e ? Operation.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: ReportRequestAminoMsg): ReportRequest { @@ -1059,10 +1059,10 @@ export const ReportResponse = { if (message.reportErrors) { obj.report_errors = message.reportErrors.map(e => e ? ReportResponse_ReportError.toAmino(e) : undefined); } else { - obj.report_errors = []; + obj.report_errors = message.reportErrors; } - obj.service_config_id = message.serviceConfigId; - obj.service_rollout_id = message.serviceRolloutId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId === "" ? undefined : message.serviceRolloutId; return obj; }, fromAminoMsg(object: ReportResponseAminoMsg): ReportResponse { @@ -1166,7 +1166,7 @@ export const ReportResponse_ReportError = { }, toAmino(message: ReportResponse_ReportError): ReportResponse_ReportErrorAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, 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 31bba4bc72..90be68d113 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 @@ -303,15 +303,15 @@ export const CheckRequest = { }, toAmino(message: CheckRequest): CheckRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.service_config_id = message.serviceConfigId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.service_config_id = message.serviceConfigId === "" ? undefined : 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.resources = message.resources; } - obj.flags = message.flags; + obj.flags = message.flags === "" ? undefined : message.flags; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -463,11 +463,11 @@ export const ResourceInfo = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; + obj.permission = message.permission === "" ? undefined : message.permission; + obj.container = message.container === "" ? undefined : message.container; + obj.location = message.location === "" ? undefined : message.location; return obj; }, fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo { @@ -570,8 +570,8 @@ export const CheckResponse_HeadersEntry = { }, toAmino(message: CheckResponse_HeadersEntry): CheckResponse_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: CheckResponse_HeadersEntryAminoMsg): CheckResponse_HeadersEntry { @@ -844,12 +844,12 @@ export const ReportRequest = { }, toAmino(message: ReportRequest): ReportRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.service_config_id = message.serviceConfigId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; if (message.operations) { obj.operations = message.operations.map(e => e ? AttributeContext.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } return obj; }, 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 5022053889..4701289aae 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicemanagement/v1/resources.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicemanagement/v1/resources.ts @@ -682,8 +682,8 @@ export const ManagedService = { }, toAmino(message: ManagedService): ManagedServiceAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.producer_project_id = message.producerProjectId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; return obj; }, fromAminoMsg(object: ManagedServiceAminoMsg): ManagedService { @@ -834,14 +834,14 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } if (message.steps) { obj.steps = message.steps.map(e => e ? OperationMetadata_Step.toAmino(e) : undefined); } else { - obj.steps = []; + obj.steps = message.steps; } - obj.progress_percentage = message.progressPercentage; + obj.progress_percentage = message.progressPercentage === 0 ? undefined : message.progressPercentage; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, @@ -940,14 +940,14 @@ export const OperationMetadata_Step = { message.description = object.description; } if (object.status !== undefined && object.status !== null) { - message.status = operationMetadata_StatusFromJSON(object.status); + message.status = object.status; } return message; }, toAmino(message: OperationMetadata_Step): OperationMetadata_StepAmino { const obj: any = {}; - obj.description = message.description; - obj.status = message.status; + obj.description = message.description === "" ? undefined : message.description; + obj.status = message.status === 0 ? undefined : message.status; return obj; }, fromAminoMsg(object: OperationMetadata_StepAminoMsg): OperationMetadata_Step { @@ -1058,7 +1058,7 @@ export const Diagnostic = { message.location = object.location; } if (object.kind !== undefined && object.kind !== null) { - message.kind = diagnostic_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.message !== undefined && object.message !== null) { message.message = object.message; @@ -1067,9 +1067,9 @@ export const Diagnostic = { }, toAmino(message: Diagnostic): DiagnosticAmino { const obj: any = {}; - obj.location = message.location; - obj.kind = message.kind; - obj.message = message.message; + obj.location = message.location === "" ? undefined : message.location; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: DiagnosticAminoMsg): Diagnostic { @@ -1179,11 +1179,11 @@ export const ConfigSource = { }, toAmino(message: ConfigSource): ConfigSourceAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; if (message.files) { obj.files = message.files.map(e => e ? ConfigFile.toAmino(e) : undefined); } else { - obj.files = []; + obj.files = message.files; } return obj; }, @@ -1298,15 +1298,15 @@ export const ConfigFile = { message.fileContents = bytesFromBase64(object.file_contents); } if (object.file_type !== undefined && object.file_type !== null) { - message.fileType = configFile_FileTypeFromJSON(object.file_type); + message.fileType = object.file_type; } return message; }, toAmino(message: ConfigFile): ConfigFileAmino { const obj: any = {}; - obj.file_path = message.filePath; + obj.file_path = message.filePath === "" ? undefined : message.filePath; obj.file_contents = message.fileContents ? base64FromBytes(message.fileContents) : undefined; - obj.file_type = message.fileType; + obj.file_type = message.fileType === 0 ? undefined : message.fileType; return obj; }, fromAminoMsg(object: ConfigFileAminoMsg): ConfigFile { @@ -1394,7 +1394,7 @@ export const ConfigRef = { }, toAmino(message: ConfigRef): ConfigRefAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: ConfigRefAminoMsg): ConfigRef { @@ -1491,7 +1491,7 @@ export const ChangeReport = { if (message.configChanges) { obj.config_changes = message.configChanges.map(e => e ? ConfigChange.toAmino(e) : undefined); } else { - obj.config_changes = []; + obj.config_changes = message.configChanges; } return obj; }, @@ -1661,7 +1661,7 @@ export const Rollout = { message.createdBy = object.created_by; } if (object.status !== undefined && object.status !== null) { - message.status = rollout_RolloutStatusFromJSON(object.status); + message.status = object.status; } if (object.traffic_percent_strategy !== undefined && object.traffic_percent_strategy !== null) { message.trafficPercentStrategy = Rollout_TrafficPercentStrategy.fromAmino(object.traffic_percent_strategy); @@ -1676,13 +1676,13 @@ export const Rollout = { }, toAmino(message: Rollout): RolloutAmino { const obj: any = {}; - obj.rollout_id = message.rolloutId; + obj.rollout_id = message.rolloutId === "" ? undefined : message.rolloutId; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; - obj.created_by = message.createdBy; - obj.status = message.status; + obj.created_by = message.createdBy === "" ? undefined : message.createdBy; + obj.status = message.status === 0 ? undefined : 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; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: RolloutAminoMsg): Rollout { @@ -1785,8 +1785,8 @@ export const Rollout_TrafficPercentStrategy_PercentagesEntry = { }, toAmino(message: Rollout_TrafficPercentStrategy_PercentagesEntry): Rollout_TrafficPercentStrategy_PercentagesEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: Rollout_TrafficPercentStrategy_PercentagesEntryAminoMsg): Rollout_TrafficPercentStrategy_PercentagesEntry { 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 7a2e51ded0..4811dfe0f8 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicemanagement/v1/servicemanager.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicemanagement/v1/servicemanager.ts @@ -562,10 +562,10 @@ export const ListServicesRequest = { }, 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; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -678,9 +678,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? ManagedService.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -768,7 +768,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -944,7 +944,7 @@ export const DeleteServiceRequest = { }, toAmino(message: DeleteServiceRequest): DeleteServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: DeleteServiceRequestAminoMsg): DeleteServiceRequest { @@ -1032,7 +1032,7 @@ export const UndeleteServiceRequest = { }, toAmino(message: UndeleteServiceRequest): UndeleteServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: UndeleteServiceRequestAminoMsg): UndeleteServiceRequest { @@ -1234,15 +1234,15 @@ export const GetServiceConfigRequest = { message.configId = object.config_id; } if (object.view !== undefined && object.view !== null) { - message.view = getServiceConfigRequest_ConfigViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetServiceConfigRequest): GetServiceConfigRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.config_id = message.configId; - obj.view = message.view; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.config_id = message.configId === "" ? undefined : message.configId; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetServiceConfigRequestAminoMsg): GetServiceConfigRequest { @@ -1362,9 +1362,9 @@ export const ListServiceConfigsRequest = { }, toAmino(message: ListServiceConfigsRequest): ListServiceConfigsRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListServiceConfigsRequestAminoMsg): ListServiceConfigsRequest { @@ -1477,9 +1477,9 @@ export const ListServiceConfigsResponse = { if (message.serviceConfigs) { obj.service_configs = message.serviceConfigs.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.service_configs = []; + obj.service_configs = message.serviceConfigs; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServiceConfigsResponseAminoMsg): ListServiceConfigsResponse { @@ -1583,7 +1583,7 @@ export const CreateServiceConfigRequest = { }, toAmino(message: CreateServiceConfigRequest): CreateServiceConfigRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.service_config = message.serviceConfig ? Service.toAmino(message.serviceConfig) : undefined; return obj; }, @@ -1704,9 +1704,9 @@ export const SubmitConfigSourceRequest = { }, toAmino(message: SubmitConfigSourceRequest): SubmitConfigSourceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.config_source = message.configSource ? ConfigSource.toAmino(message.configSource) : undefined; - obj.validate_only = message.validateOnly; + obj.validate_only = message.validateOnly === false ? undefined : message.validateOnly; return obj; }, fromAminoMsg(object: SubmitConfigSourceRequestAminoMsg): SubmitConfigSourceRequest { @@ -1898,7 +1898,7 @@ export const CreateServiceRolloutRequest = { }, toAmino(message: CreateServiceRolloutRequest): CreateServiceRolloutRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.rollout = message.rollout ? Rollout.toAmino(message.rollout) : undefined; return obj; }, @@ -2035,10 +2035,10 @@ export const ListServiceRolloutsRequest = { }, 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; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServiceRolloutsRequestAminoMsg): ListServiceRolloutsRequest { @@ -2151,9 +2151,9 @@ export const ListServiceRolloutsResponse = { if (message.rollouts) { obj.rollouts = message.rollouts.map(e => e ? Rollout.toAmino(e) : undefined); } else { - obj.rollouts = []; + obj.rollouts = message.rollouts; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServiceRolloutsResponseAminoMsg): ListServiceRolloutsResponse { @@ -2257,8 +2257,8 @@ export const GetServiceRolloutRequest = { }, toAmino(message: GetServiceRolloutRequest): GetServiceRolloutRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.rollout_id = message.rolloutId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.rollout_id = message.rolloutId === "" ? undefined : message.rolloutId; return obj; }, fromAminoMsg(object: GetServiceRolloutRequestAminoMsg): GetServiceRolloutRequest { @@ -2511,17 +2511,17 @@ export const GenerateConfigReportResponse = { }, toAmino(message: GenerateConfigReportResponse): GenerateConfigReportResponseAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.id = message.id; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.id = message.id === "" ? undefined : message.id; if (message.changeReports) { obj.change_reports = message.changeReports.map(e => e ? ChangeReport.toAmino(e) : undefined); } else { - obj.change_reports = []; + obj.change_reports = message.changeReports; } if (message.diagnostics) { obj.diagnostics = message.diagnostics.map(e => e ? Diagnostic.toAmino(e) : undefined); } else { - obj.diagnostics = []; + obj.diagnostics = message.diagnostics; } return obj; }, 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 d67e235a3e..b0f73ac4cd 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1/resources.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1/resources.ts @@ -281,16 +281,16 @@ export const Service = { message.config = ServiceConfig.fromAmino(object.config); } if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: Service): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.parent = message.parent; + obj.name = message.name === "" ? undefined : message.name; + obj.parent = message.parent === "" ? undefined : message.parent; obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: ServiceAminoMsg): Service { @@ -540,12 +540,12 @@ export const ServiceConfig = { }, toAmino(message: ServiceConfig): ServiceConfigAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; @@ -554,12 +554,12 @@ export const ServiceConfig = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; return obj; @@ -658,7 +658,7 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, 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 cb80db1aef..25232cdbb2 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1/serviceusage.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1/serviceusage.ts @@ -414,7 +414,7 @@ export const EnableServiceRequest = { }, toAmino(message: EnableServiceRequest): EnableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest { @@ -616,15 +616,15 @@ export const DisableServiceRequest = { message.disableDependentServices = object.disable_dependent_services; } if (object.check_if_service_has_usage !== undefined && object.check_if_service_has_usage !== null) { - message.checkIfServiceHasUsage = disableServiceRequest_CheckIfServiceHasUsageFromJSON(object.check_if_service_has_usage); + message.checkIfServiceHasUsage = object.check_if_service_has_usage; } return message; }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.disable_dependent_services = message.disableDependentServices === false ? undefined : message.disableDependentServices; + obj.check_if_service_has_usage = message.checkIfServiceHasUsage === 0 ? undefined : message.checkIfServiceHasUsage; return obj; }, fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest { @@ -800,7 +800,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -936,10 +936,10 @@ export const ListServicesRequest = { }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -1052,9 +1052,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -1164,11 +1164,11 @@ export const BatchEnableServicesRequest = { }, toAmino(message: BatchEnableServicesRequest): BatchEnableServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.serviceIds) { obj.service_ids = message.serviceIds.map(e => e); } else { - obj.service_ids = []; + obj.service_ids = message.serviceIds; } return obj; }, @@ -1288,12 +1288,12 @@ export const BatchEnableServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } if (message.failures) { obj.failures = message.failures.map(e => e ? BatchEnableServicesResponse_EnableFailure.toAmino(e) : undefined); } else { - obj.failures = []; + obj.failures = message.failures; } return obj; }, @@ -1398,8 +1398,8 @@ export const BatchEnableServicesResponse_EnableFailure = { }, toAmino(message: BatchEnableServicesResponse_EnableFailure): BatchEnableServicesResponse_EnableFailureAmino { const obj: any = {}; - obj.service_id = message.serviceId; - obj.error_message = message.errorMessage; + obj.service_id = message.serviceId === "" ? undefined : message.serviceId; + obj.error_message = message.errorMessage === "" ? undefined : message.errorMessage; return obj; }, fromAminoMsg(object: BatchEnableServicesResponse_EnableFailureAminoMsg): BatchEnableServicesResponse_EnableFailure { @@ -1509,11 +1509,11 @@ export const BatchGetServicesRequest = { }, toAmino(message: BatchGetServicesRequest): BatchGetServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.names) { obj.names = message.names.map(e => e); } else { - obj.names = []; + obj.names = message.names; } return obj; }, @@ -1611,7 +1611,7 @@ export const BatchGetServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } return obj; }, 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 bdd7d91403..26279523e2 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1beta1/resources.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1beta1/resources.ts @@ -775,16 +775,16 @@ export const Service = { message.config = ServiceConfig.fromAmino(object.config); } if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: Service): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.parent = message.parent; + obj.name = message.name === "" ? undefined : message.name; + obj.parent = message.parent === "" ? undefined : message.parent; obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: ServiceAminoMsg): Service { @@ -1034,12 +1034,12 @@ export const ServiceConfig = { }, toAmino(message: ServiceConfig): ServiceConfigAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; @@ -1048,12 +1048,12 @@ export const ServiceConfig = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; return obj; @@ -1152,7 +1152,7 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, @@ -1333,20 +1333,20 @@ export const ConsumerQuotaMetric = { }, toAmino(message: ConsumerQuotaMetric): ConsumerQuotaMetricAmino { const obj: any = {}; - obj.name = message.name; - obj.metric = message.metric; - obj.display_name = message.displayName; + obj.name = message.name === "" ? undefined : message.name; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.display_name = message.displayName === "" ? undefined : message.displayName; if (message.consumerQuotaLimits) { obj.consumer_quota_limits = message.consumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e) : undefined); } else { - obj.consumer_quota_limits = []; + obj.consumer_quota_limits = message.consumerQuotaLimits; } if (message.descendantConsumerQuotaLimits) { obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e) : undefined); } else { - obj.descendant_consumer_quota_limits = []; + obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits; } - obj.unit = message.unit; + obj.unit = message.unit === "" ? undefined : message.unit; return obj; }, fromAminoMsg(object: ConsumerQuotaMetricAminoMsg): ConsumerQuotaMetric { @@ -1520,15 +1520,15 @@ export const ConsumerQuotaLimit = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.is_precise = message.isPrecise === false ? undefined : message.isPrecise; + obj.allows_admin_overrides = message.allowsAdminOverrides === false ? undefined : message.allowsAdminOverrides; if (message.quotaBuckets) { obj.quota_buckets = message.quotaBuckets.map(e => e ? QuotaBucket.toAmino(e) : undefined); } else { - obj.quota_buckets = []; + obj.quota_buckets = message.quotaBuckets; } return obj; }, @@ -1632,8 +1632,8 @@ export const QuotaBucket_DimensionsEntry = { }, toAmino(message: QuotaBucket_DimensionsEntry): QuotaBucket_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaBucket_DimensionsEntryAminoMsg): QuotaBucket_DimensionsEntry { @@ -1838,8 +1838,8 @@ export const QuotaBucket = { }, 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.effective_limit = message.effectiveLimit !== BigInt(0) ? message.effectiveLimit.toString() : undefined; + obj.default_limit = message.defaultLimit !== BigInt(0) ? 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; @@ -1951,8 +1951,8 @@ export const QuotaOverride_DimensionsEntry = { }, toAmino(message: QuotaOverride_DimensionsEntry): QuotaOverride_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaOverride_DimensionsEntryAminoMsg): QuotaOverride_DimensionsEntry { @@ -2157,17 +2157,17 @@ export const QuotaOverride = { }, toAmino(message: QuotaOverride): QuotaOverrideAmino { const obj: any = {}; - obj.name = message.name; - obj.override_value = message.overrideValue ? message.overrideValue.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.override_value = message.overrideValue !== BigInt(0) ? 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; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.admin_override_ancestor = message.adminOverrideAncestor === "" ? undefined : message.adminOverrideAncestor; return obj; }, fromAminoMsg(object: QuotaOverrideAminoMsg): QuotaOverride { @@ -2264,7 +2264,7 @@ export const OverrideInlineSource = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -2368,8 +2368,8 @@ export const AdminQuotaPolicy_DimensionsEntry = { }, toAmino(message: AdminQuotaPolicy_DimensionsEntry): AdminQuotaPolicy_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AdminQuotaPolicy_DimensionsEntryAminoMsg): AdminQuotaPolicy_DimensionsEntry { @@ -2574,17 +2574,17 @@ export const AdminQuotaPolicy = { }, toAmino(message: AdminQuotaPolicy): AdminQuotaPolicyAmino { const obj: any = {}; - obj.name = message.name; - obj.policy_value = message.policyValue ? message.policyValue.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.policy_value = message.policyValue !== BigInt(0) ? 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; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.container = message.container === "" ? undefined : message.container; return obj; }, fromAminoMsg(object: AdminQuotaPolicyAminoMsg): AdminQuotaPolicy { @@ -2688,8 +2688,8 @@ export const ServiceIdentity = { }, toAmino(message: ServiceIdentity): ServiceIdentityAmino { const obj: any = {}; - obj.email = message.email; - obj.unique_id = message.uniqueId; + obj.email = message.email === "" ? undefined : message.email; + obj.unique_id = message.uniqueId === "" ? undefined : message.uniqueId; return obj; }, fromAminoMsg(object: ServiceIdentityAminoMsg): ServiceIdentity { 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 e0ec73d903..6536a3b8eb 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1beta1/serviceusage.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1beta1/serviceusage.ts @@ -969,7 +969,7 @@ export const EnableServiceRequest = { }, toAmino(message: EnableServiceRequest): EnableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest { @@ -1057,7 +1057,7 @@ export const DisableServiceRequest = { }, toAmino(message: DisableServiceRequest): DisableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest { @@ -1145,7 +1145,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -1281,10 +1281,10 @@ export const ListServicesRequest = { }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -1397,9 +1397,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -1509,11 +1509,11 @@ export const BatchEnableServicesRequest = { }, toAmino(message: BatchEnableServicesRequest): BatchEnableServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.serviceIds) { obj.service_ids = message.serviceIds.map(e => e); } else { - obj.service_ids = []; + obj.service_ids = message.serviceIds; } return obj; }, @@ -1644,16 +1644,16 @@ export const ListConsumerQuotaMetricsRequest = { message.pageToken = object.page_token; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: ListConsumerQuotaMetricsRequestAminoMsg): ListConsumerQuotaMetricsRequest { @@ -1766,9 +1766,9 @@ export const ListConsumerQuotaMetricsResponse = { if (message.metrics) { obj.metrics = message.metrics.map(e => e ? ConsumerQuotaMetric.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListConsumerQuotaMetricsResponseAminoMsg): ListConsumerQuotaMetricsResponse { @@ -1866,14 +1866,14 @@ export const GetConsumerQuotaMetricRequest = { message.name = object.name; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetConsumerQuotaMetricRequest): GetConsumerQuotaMetricRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.view = message.view; + obj.name = message.name === "" ? undefined : message.name; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetConsumerQuotaMetricRequestAminoMsg): GetConsumerQuotaMetricRequest { @@ -1971,14 +1971,14 @@ export const GetConsumerQuotaLimitRequest = { message.name = object.name; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetConsumerQuotaLimitRequest): GetConsumerQuotaLimitRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.view = message.view; + obj.name = message.name === "" ? undefined : message.name; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetConsumerQuotaLimitRequestAminoMsg): GetConsumerQuotaLimitRequest { @@ -2124,18 +2124,18 @@ export const CreateAdminOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: CreateAdminOverrideRequest): CreateAdminOverrideRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2298,19 +2298,19 @@ export const UpdateAdminOverrideRequest = { if (object.update_mask !== undefined && object.update_mask !== null) { message.updateMask = FieldMask.fromAmino(object.update_mask); } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: UpdateAdminOverrideRequest): UpdateAdminOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2441,17 +2441,17 @@ export const DeleteAdminOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: DeleteAdminOverrideRequest): DeleteAdminOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.force = message.force; + obj.name = message.name === "" ? undefined : message.name; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2572,9 +2572,9 @@ export const ListAdminOverridesRequest = { }, toAmino(message: ListAdminOverridesRequest): ListAdminOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListAdminOverridesRequestAminoMsg): ListAdminOverridesRequest { @@ -2687,9 +2687,9 @@ export const ListAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListAdminOverridesResponseAminoMsg): ListAdminOverridesResponse { @@ -2786,7 +2786,7 @@ export const BatchCreateAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -2933,18 +2933,18 @@ export const ImportAdminOverridesRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: ImportAdminOverridesRequest): ImportAdminOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3042,7 +3042,7 @@ export const ImportAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -3256,18 +3256,18 @@ export const CreateConsumerOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: CreateConsumerOverrideRequest): CreateConsumerOverrideRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3430,19 +3430,19 @@ export const UpdateConsumerOverrideRequest = { if (object.update_mask !== undefined && object.update_mask !== null) { message.updateMask = FieldMask.fromAmino(object.update_mask); } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: UpdateConsumerOverrideRequest): UpdateConsumerOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3573,17 +3573,17 @@ export const DeleteConsumerOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: DeleteConsumerOverrideRequest): DeleteConsumerOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.force = message.force; + obj.name = message.name === "" ? undefined : message.name; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3704,9 +3704,9 @@ export const ListConsumerOverridesRequest = { }, toAmino(message: ListConsumerOverridesRequest): ListConsumerOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListConsumerOverridesRequestAminoMsg): ListConsumerOverridesRequest { @@ -3819,9 +3819,9 @@ export const ListConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListConsumerOverridesResponseAminoMsg): ListConsumerOverridesResponse { @@ -3918,7 +3918,7 @@ export const BatchCreateConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -4065,18 +4065,18 @@ export const ImportConsumerOverridesRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: ImportConsumerOverridesRequest): ImportConsumerOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -4174,7 +4174,7 @@ export const ImportConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -4339,7 +4339,7 @@ export const ImportAdminQuotaPoliciesResponse = { if (message.policies) { obj.policies = message.policies.map(e => e ? AdminQuotaPolicy.toAmino(e) : undefined); } else { - obj.policies = []; + obj.policies = message.policies; } return obj; }, @@ -4696,7 +4696,7 @@ export const GenerateServiceIdentityRequest = { }, toAmino(message: GenerateServiceIdentityRequest): GenerateServiceIdentityRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; return obj; }, fromAminoMsg(object: GenerateServiceIdentityRequestAminoMsg): GenerateServiceIdentityRequest { @@ -4794,14 +4794,14 @@ export const GetServiceIdentityResponse = { message.identity = ServiceIdentity.fromAmino(object.identity); } if (object.state !== undefined && object.state !== null) { - message.state = getServiceIdentityResponse_IdentityStateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: GetServiceIdentityResponse): GetServiceIdentityResponseAmino { const obj: any = {}; obj.identity = message.identity ? ServiceIdentity.toAmino(message.identity) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: GetServiceIdentityResponseAminoMsg): GetServiceIdentityResponse { diff --git a/__fixtures__/v-next/outputosmojs/google/api/source_info.ts b/__fixtures__/v-next/outputosmojs/google/api/source_info.ts index 1246be15fc..cad7fccdb0 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/source_info.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/source_info.ts @@ -93,7 +93,7 @@ export const SourceInfo = { if (message.sourceFiles) { obj.source_files = message.sourceFiles.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.source_files = []; + obj.source_files = message.sourceFiles; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/api/system_parameter.ts b/__fixtures__/v-next/outputosmojs/google/api/system_parameter.ts index da9c19b092..18e24e53f9 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/system_parameter.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/system_parameter.ts @@ -202,7 +202,7 @@ export const SystemParameters = { if (message.rules) { obj.rules = message.rules.map(e => e ? SystemParameterRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -313,11 +313,11 @@ export const SystemParameterRule = { }, toAmino(message: SystemParameterRule): SystemParameterRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; if (message.parameters) { obj.parameters = message.parameters.map(e => e ? SystemParameter.toAmino(e) : undefined); } else { - obj.parameters = []; + obj.parameters = message.parameters; } return obj; }, @@ -438,9 +438,9 @@ export const SystemParameter = { }, toAmino(message: SystemParameter): SystemParameterAmino { const obj: any = {}; - obj.name = message.name; - obj.http_header = message.httpHeader; - obj.url_query_parameter = message.urlQueryParameter; + obj.name = message.name === "" ? undefined : message.name; + obj.http_header = message.httpHeader === "" ? undefined : message.httpHeader; + obj.url_query_parameter = message.urlQueryParameter === "" ? undefined : message.urlQueryParameter; return obj; }, fromAminoMsg(object: SystemParameterAminoMsg): SystemParameter { diff --git a/__fixtures__/v-next/outputosmojs/google/api/usage.ts b/__fixtures__/v-next/outputosmojs/google/api/usage.ts index 3b56e7579e..d5a8062601 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/usage.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/usage.ts @@ -243,14 +243,14 @@ export const Usage = { if (message.requirements) { obj.requirements = message.requirements.map(e => e); } else { - obj.requirements = []; + obj.requirements = message.requirements; } if (message.rules) { obj.rules = message.rules.map(e => e ? UsageRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.producer_notification_channel = message.producerNotificationChannel; + obj.producer_notification_channel = message.producerNotificationChannel === "" ? undefined : message.producerNotificationChannel; return obj; }, fromAminoMsg(object: UsageAminoMsg): Usage { @@ -370,9 +370,9 @@ export const UsageRule = { }, toAmino(message: UsageRule): UsageRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.allow_unregistered_calls = message.allowUnregisteredCalls; - obj.skip_service_control = message.skipServiceControl; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.allow_unregistered_calls = message.allowUnregisteredCalls === false ? undefined : message.allowUnregisteredCalls; + obj.skip_service_control = message.skipServiceControl === false ? undefined : message.skipServiceControl; return obj; }, fromAminoMsg(object: UsageRuleAminoMsg): UsageRule { diff --git a/__fixtures__/v-next/outputosmojs/google/api/visibility.ts b/__fixtures__/v-next/outputosmojs/google/api/visibility.ts index 47508b31b9..2fb45ec310 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/visibility.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/visibility.ts @@ -184,7 +184,7 @@ export const Visibility = { if (message.rules) { obj.rules = message.rules.map(e => e ? VisibilityRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -289,8 +289,8 @@ export const VisibilityRule = { }, toAmino(message: VisibilityRule): VisibilityRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.restriction = message.restriction; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.restriction = message.restriction === "" ? undefined : message.restriction; return obj; }, fromAminoMsg(object: VisibilityRuleAminoMsg): VisibilityRule { 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 42eb849461..982a8b1e82 100644 --- a/__fixtures__/v-next/outputosmojs/google/logging/type/http_request.ts +++ b/__fixtures__/v-next/outputosmojs/google/logging/type/http_request.ts @@ -400,21 +400,21 @@ export const HttpRequest = { }, 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.request_method = message.requestMethod === "" ? undefined : message.requestMethod; + obj.request_url = message.requestUrl === "" ? undefined : message.requestUrl; + obj.request_size = message.requestSize !== BigInt(0) ? message.requestSize.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.response_size = message.responseSize !== BigInt(0) ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent === "" ? undefined : message.userAgent; + obj.remote_ip = message.remoteIp === "" ? undefined : message.remoteIp; + obj.server_ip = message.serverIp === "" ? undefined : message.serverIp; + obj.referer = message.referer === "" ? undefined : 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; + obj.cache_lookup = message.cacheLookup === false ? undefined : message.cacheLookup; + obj.cache_hit = message.cacheHit === false ? undefined : message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer === false ? undefined : message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes !== BigInt(0) ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest { 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 d90950278f..3874e2ab8e 100644 --- a/__fixtures__/v-next/outputosmojs/google/logging/v2/log_entry.ts +++ b/__fixtures__/v-next/outputosmojs/google/logging/v2/log_entry.ts @@ -385,8 +385,8 @@ export const LogEntry_LabelsEntry = { }, toAmino(message: LogEntry_LabelsEntry): LogEntry_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry { @@ -729,7 +729,7 @@ export const LogEntry = { message.receiveTimestamp = fromTimestamp(Timestamp.fromAmino(object.receive_timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.insert_id !== undefined && object.insert_id !== null) { message.insertId = object.insert_id; @@ -767,15 +767,15 @@ export const LogEntry = { }, toAmino(message: LogEntry): LogEntryAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : 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.text_payload = message.textPayload === null ? undefined : message.textPayload; obj.json_payload = message.jsonPayload ? Struct.toAmino(message.jsonPayload) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.receive_timestamp = message.receiveTimestamp ? Timestamp.toAmino(toTimestamp(message.receiveTimestamp)) : undefined; - obj.severity = message.severity; - obj.insert_id = message.insertId; + obj.severity = message.severity === 0 ? undefined : message.severity; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; obj.labels = {}; if (message.labels) { @@ -784,9 +784,9 @@ export const LogEntry = { }); } obj.operation = message.operation ? LogEntryOperation.toAmino(message.operation) : undefined; - obj.trace = message.trace; - obj.span_id = message.spanId; - obj.trace_sampled = message.traceSampled; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.span_id = message.spanId === "" ? undefined : message.spanId; + obj.trace_sampled = message.traceSampled === false ? undefined : message.traceSampled; obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toAmino(message.sourceLocation) : undefined; obj.split = message.split ? LogSplit.toAmino(message.split) : undefined; return obj; @@ -924,10 +924,10 @@ export const LogEntryOperation = { }, toAmino(message: LogEntryOperation): LogEntryOperationAmino { const obj: any = {}; - obj.id = message.id; - obj.producer = message.producer; - obj.first = message.first; - obj.last = message.last; + obj.id = message.id === "" ? undefined : message.id; + obj.producer = message.producer === "" ? undefined : message.producer; + obj.first = message.first === false ? undefined : message.first; + obj.last = message.last === false ? undefined : message.last; return obj; }, fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation { @@ -1047,9 +1047,9 @@ export const LogEntrySourceLocation = { }, toAmino(message: LogEntrySourceLocation): LogEntrySourceLocationAmino { const obj: any = {}; - obj.file = message.file; - obj.line = message.line ? message.line.toString() : undefined; - obj.function = message.function; + obj.file = message.file === "" ? undefined : message.file; + obj.line = message.line !== BigInt(0) ? message.line.toString() : undefined; + obj.function = message.function === "" ? undefined : message.function; return obj; }, fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation { @@ -1169,9 +1169,9 @@ export const LogSplit = { }, toAmino(message: LogSplit): LogSplitAmino { const obj: any = {}; - obj.uid = message.uid; - obj.index = message.index; - obj.total_splits = message.totalSplits; + obj.uid = message.uid === "" ? undefined : message.uid; + obj.index = message.index === 0 ? undefined : message.index; + obj.total_splits = message.totalSplits === 0 ? undefined : message.totalSplits; return obj; }, fromAminoMsg(object: LogSplitAminoMsg): LogSplit { diff --git a/__fixtures__/v-next/outputosmojs/google/logging/v2/logging.ts b/__fixtures__/v-next/outputosmojs/google/logging/v2/logging.ts index b2c6670412..9fa9802575 100644 --- a/__fixtures__/v-next/outputosmojs/google/logging/v2/logging.ts +++ b/__fixtures__/v-next/outputosmojs/google/logging/v2/logging.ts @@ -612,7 +612,7 @@ export const DeleteLogRequest = { }, toAmino(message: DeleteLogRequest): DeleteLogRequestAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; return obj; }, fromAminoMsg(object: DeleteLogRequestAminoMsg): DeleteLogRequest { @@ -715,8 +715,8 @@ export const WriteLogEntriesRequest_LabelsEntry = { }, toAmino(message: WriteLogEntriesRequest_LabelsEntry): WriteLogEntriesRequest_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: WriteLogEntriesRequest_LabelsEntryAminoMsg): WriteLogEntriesRequest_LabelsEntry { @@ -927,7 +927,7 @@ export const WriteLogEntriesRequest = { }, toAmino(message: WriteLogEntriesRequest): WriteLogEntriesRequestAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; obj.resource = message.resource ? MonitoredResource.toAmino(message.resource) : undefined; obj.labels = {}; if (message.labels) { @@ -938,10 +938,10 @@ export const WriteLogEntriesRequest = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } - obj.partial_success = message.partialSuccess; - obj.dry_run = message.dryRun; + obj.partial_success = message.partialSuccess === false ? undefined : message.partialSuccess; + obj.dry_run = message.dryRun === false ? undefined : message.dryRun; return obj; }, fromAminoMsg(object: WriteLogEntriesRequestAminoMsg): WriteLogEntriesRequest { @@ -1111,7 +1111,7 @@ export const WriteLogEntriesPartialErrors_LogEntryErrorsEntry = { }, toAmino(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntry): WriteLogEntriesPartialErrors_LogEntryErrorsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === 0 ? undefined : message.key; obj.value = message.value ? Status.toAmino(message.value) : undefined; return obj; }, @@ -1403,12 +1403,12 @@ export const ListLogEntriesRequest = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } - obj.filter = message.filter; - obj.order_by = message.orderBy; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.order_by = message.orderBy === "" ? undefined : message.orderBy; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListLogEntriesRequestAminoMsg): ListLogEntriesRequest { @@ -1521,9 +1521,9 @@ export const ListLogEntriesResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogEntriesResponseAminoMsg): ListLogEntriesResponse { @@ -1627,8 +1627,8 @@ export const ListMonitoredResourceDescriptorsRequest = { }, toAmino(message: ListMonitoredResourceDescriptorsRequest): ListMonitoredResourceDescriptorsRequestAmino { const obj: any = {}; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListMonitoredResourceDescriptorsRequestAminoMsg): ListMonitoredResourceDescriptorsRequest { @@ -1741,9 +1741,9 @@ export const ListMonitoredResourceDescriptorsResponse = { if (message.resourceDescriptors) { obj.resource_descriptors = message.resourceDescriptors.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.resource_descriptors = []; + obj.resource_descriptors = message.resourceDescriptors; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListMonitoredResourceDescriptorsResponseAminoMsg): ListMonitoredResourceDescriptorsResponse { @@ -1885,13 +1885,13 @@ export const ListLogsRequest = { }, toAmino(message: ListLogsRequest): ListLogsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, @@ -2005,9 +2005,9 @@ export const ListLogsResponse = { if (message.logNames) { obj.log_names = message.logNames.map(e => e); } else { - obj.log_names = []; + obj.log_names = message.logNames; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogsResponseAminoMsg): ListLogsResponse { @@ -2136,9 +2136,9 @@ export const TailLogEntriesRequest = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } - obj.filter = message.filter; + obj.filter = message.filter === "" ? undefined : message.filter; obj.buffer_window = message.bufferWindow ? Duration.toAmino(message.bufferWindow) : undefined; return obj; }, @@ -2258,12 +2258,12 @@ export const TailLogEntriesResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.suppressionInfo) { obj.suppression_info = message.suppressionInfo.map(e => e ? TailLogEntriesResponse_SuppressionInfo.toAmino(e) : undefined); } else { - obj.suppression_info = []; + obj.suppression_info = message.suppressionInfo; } return obj; }, @@ -2359,7 +2359,7 @@ export const TailLogEntriesResponse_SuppressionInfo = { fromAmino(object: TailLogEntriesResponse_SuppressionInfoAmino): TailLogEntriesResponse_SuppressionInfo { const message = createBaseTailLogEntriesResponse_SuppressionInfo(); if (object.reason !== undefined && object.reason !== null) { - message.reason = tailLogEntriesResponse_SuppressionInfo_ReasonFromJSON(object.reason); + message.reason = object.reason; } if (object.suppressed_count !== undefined && object.suppressed_count !== null) { message.suppressedCount = object.suppressed_count; @@ -2368,8 +2368,8 @@ export const TailLogEntriesResponse_SuppressionInfo = { }, toAmino(message: TailLogEntriesResponse_SuppressionInfo): TailLogEntriesResponse_SuppressionInfoAmino { const obj: any = {}; - obj.reason = message.reason; - obj.suppressed_count = message.suppressedCount; + obj.reason = message.reason === 0 ? undefined : message.reason; + obj.suppressed_count = message.suppressedCount === 0 ? undefined : message.suppressedCount; return obj; }, fromAminoMsg(object: TailLogEntriesResponse_SuppressionInfoAminoMsg): TailLogEntriesResponse_SuppressionInfo { 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 0d440d1a42..6d537e65c7 100644 --- a/__fixtures__/v-next/outputosmojs/google/logging/v2/logging_config.ts +++ b/__fixtures__/v-next/outputosmojs/google/logging/v2/logging_config.ts @@ -1934,7 +1934,7 @@ export const LogBucket = { message.locked = object.locked; } if (object.lifecycle_state !== undefined && object.lifecycle_state !== null) { - message.lifecycleState = lifecycleStateFromJSON(object.lifecycle_state); + message.lifecycleState = object.lifecycle_state; } message.restrictedFields = object.restricted_fields?.map(e => e) || []; if (object.cmek_settings !== undefined && object.cmek_settings !== null) { @@ -1944,17 +1944,17 @@ export const LogBucket = { }, toAmino(message: LogBucket): LogBucketAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.retention_days = message.retentionDays; - obj.locked = message.locked; - obj.lifecycle_state = message.lifecycleState; + obj.retention_days = message.retentionDays === 0 ? undefined : message.retentionDays; + obj.locked = message.locked === false ? undefined : message.locked; + obj.lifecycle_state = message.lifecycleState === 0 ? undefined : message.lifecycleState; if (message.restrictedFields) { obj.restricted_fields = message.restrictedFields.map(e => e); } else { - obj.restricted_fields = []; + obj.restricted_fields = message.restrictedFields; } obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined; return obj; @@ -2108,11 +2108,11 @@ export const LogView = { }, toAmino(message: LogView): LogViewAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.filter = message.filter; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: LogViewAminoMsg): LogView { @@ -2361,7 +2361,7 @@ export const LogSink = { } message.exclusions = object.exclusions?.map(e => LogExclusion.fromAmino(e)) || []; if (object.output_version_format !== undefined && object.output_version_format !== null) { - message.outputVersionFormat = logSink_VersionFormatFromJSON(object.output_version_format); + message.outputVersionFormat = object.output_version_format; } if (object.writer_identity !== undefined && object.writer_identity !== null) { message.writerIdentity = object.writer_identity; @@ -2382,19 +2382,19 @@ export const LogSink = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.destination = message.destination === "" ? undefined : message.destination; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.description = message.description === "" ? undefined : message.description; + obj.disabled = message.disabled === false ? undefined : message.disabled; if (message.exclusions) { obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e) : undefined); } else { - obj.exclusions = []; + obj.exclusions = message.exclusions; } - obj.output_version_format = message.outputVersionFormat; - obj.writer_identity = message.writerIdentity; - obj.include_children = message.includeChildren; + obj.output_version_format = message.outputVersionFormat === 0 ? undefined : message.outputVersionFormat; + obj.writer_identity = message.writerIdentity === "" ? undefined : message.writerIdentity; + obj.include_children = message.includeChildren === false ? undefined : message.includeChildren; obj.bigquery_options = message.bigqueryOptions ? BigQueryOptions.toAmino(message.bigqueryOptions) : undefined; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; @@ -2501,8 +2501,8 @@ export const BigQueryOptions = { }, toAmino(message: BigQueryOptions): BigQueryOptionsAmino { const obj: any = {}; - obj.use_partitioned_tables = message.usePartitionedTables; - obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning; + obj.use_partitioned_tables = message.usePartitionedTables === false ? undefined : message.usePartitionedTables; + obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning === false ? undefined : message.usesTimestampColumnPartitioning; return obj; }, fromAminoMsg(object: BigQueryOptionsAminoMsg): BigQueryOptions { @@ -2622,9 +2622,9 @@ export const ListBucketsRequest = { }, toAmino(message: ListBucketsRequest): ListBucketsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListBucketsRequestAminoMsg): ListBucketsRequest { @@ -2737,9 +2737,9 @@ export const ListBucketsResponse = { if (message.buckets) { obj.buckets = message.buckets.map(e => e ? LogBucket.toAmino(e) : undefined); } else { - obj.buckets = []; + obj.buckets = message.buckets; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListBucketsResponseAminoMsg): ListBucketsResponse { @@ -2859,8 +2859,8 @@ export const CreateBucketRequest = { }, toAmino(message: CreateBucketRequest): CreateBucketRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.bucket_id = message.bucketId; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.bucket_id = message.bucketId === "" ? undefined : message.bucketId; obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined; return obj; }, @@ -2981,7 +2981,7 @@ export const UpdateBucketRequest = { }, toAmino(message: UpdateBucketRequest): UpdateBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -3071,7 +3071,7 @@ export const GetBucketRequest = { }, toAmino(message: GetBucketRequest): GetBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetBucketRequestAminoMsg): GetBucketRequest { @@ -3159,7 +3159,7 @@ export const DeleteBucketRequest = { }, toAmino(message: DeleteBucketRequest): DeleteBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteBucketRequestAminoMsg): DeleteBucketRequest { @@ -3247,7 +3247,7 @@ export const UndeleteBucketRequest = { }, toAmino(message: UndeleteBucketRequest): UndeleteBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: UndeleteBucketRequestAminoMsg): UndeleteBucketRequest { @@ -3367,9 +3367,9 @@ export const ListViewsRequest = { }, toAmino(message: ListViewsRequest): ListViewsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListViewsRequestAminoMsg): ListViewsRequest { @@ -3482,9 +3482,9 @@ export const ListViewsResponse = { if (message.views) { obj.views = message.views.map(e => e ? LogView.toAmino(e) : undefined); } else { - obj.views = []; + obj.views = message.views; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListViewsResponseAminoMsg): ListViewsResponse { @@ -3604,8 +3604,8 @@ export const CreateViewRequest = { }, toAmino(message: CreateViewRequest): CreateViewRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.view_id = message.viewId; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.view_id = message.viewId === "" ? undefined : message.viewId; obj.view = message.view ? LogView.toAmino(message.view) : undefined; return obj; }, @@ -3726,7 +3726,7 @@ export const UpdateViewRequest = { }, toAmino(message: UpdateViewRequest): UpdateViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.view = message.view ? LogView.toAmino(message.view) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -3816,7 +3816,7 @@ export const GetViewRequest = { }, toAmino(message: GetViewRequest): GetViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetViewRequestAminoMsg): GetViewRequest { @@ -3904,7 +3904,7 @@ export const DeleteViewRequest = { }, toAmino(message: DeleteViewRequest): DeleteViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteViewRequestAminoMsg): DeleteViewRequest { @@ -4024,9 +4024,9 @@ export const ListSinksRequest = { }, toAmino(message: ListSinksRequest): ListSinksRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListSinksRequestAminoMsg): ListSinksRequest { @@ -4139,9 +4139,9 @@ export const ListSinksResponse = { if (message.sinks) { obj.sinks = message.sinks.map(e => e ? LogSink.toAmino(e) : undefined); } else { - obj.sinks = []; + obj.sinks = message.sinks; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListSinksResponseAminoMsg): ListSinksResponse { @@ -4229,7 +4229,7 @@ export const GetSinkRequest = { }, toAmino(message: GetSinkRequest): GetSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; return obj; }, fromAminoMsg(object: GetSinkRequestAminoMsg): GetSinkRequest { @@ -4349,9 +4349,9 @@ export const CreateSinkRequest = { }, toAmino(message: CreateSinkRequest): CreateSinkRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined; - obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.unique_writer_identity = message.uniqueWriterIdentity === false ? undefined : message.uniqueWriterIdentity; return obj; }, fromAminoMsg(object: CreateSinkRequestAminoMsg): CreateSinkRequest { @@ -4487,9 +4487,9 @@ export const UpdateSinkRequest = { }, toAmino(message: UpdateSinkRequest): UpdateSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined; - obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.unique_writer_identity = message.uniqueWriterIdentity === false ? undefined : message.uniqueWriterIdentity; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; }, @@ -4578,7 +4578,7 @@ export const DeleteSinkRequest = { }, toAmino(message: DeleteSinkRequest): DeleteSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; return obj; }, fromAminoMsg(object: DeleteSinkRequestAminoMsg): DeleteSinkRequest { @@ -4746,10 +4746,10 @@ export const LogExclusion = { }, toAmino(message: LogExclusion): LogExclusionAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; - obj.filter = message.filter; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.disabled = message.disabled === false ? undefined : message.disabled; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; return obj; @@ -4871,9 +4871,9 @@ export const ListExclusionsRequest = { }, toAmino(message: ListExclusionsRequest): ListExclusionsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListExclusionsRequestAminoMsg): ListExclusionsRequest { @@ -4986,9 +4986,9 @@ export const ListExclusionsResponse = { if (message.exclusions) { obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e) : undefined); } else { - obj.exclusions = []; + obj.exclusions = message.exclusions; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListExclusionsResponseAminoMsg): ListExclusionsResponse { @@ -5076,7 +5076,7 @@ export const GetExclusionRequest = { }, toAmino(message: GetExclusionRequest): GetExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetExclusionRequestAminoMsg): GetExclusionRequest { @@ -5180,7 +5180,7 @@ export const CreateExclusionRequest = { }, toAmino(message: CreateExclusionRequest): CreateExclusionRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined; return obj; }, @@ -5301,7 +5301,7 @@ export const UpdateExclusionRequest = { }, toAmino(message: UpdateExclusionRequest): UpdateExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -5391,7 +5391,7 @@ export const DeleteExclusionRequest = { }, toAmino(message: DeleteExclusionRequest): DeleteExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteExclusionRequestAminoMsg): DeleteExclusionRequest { @@ -5479,7 +5479,7 @@ export const GetCmekSettingsRequest = { }, toAmino(message: GetCmekSettingsRequest): GetCmekSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetCmekSettingsRequestAminoMsg): GetCmekSettingsRequest { @@ -5599,7 +5599,7 @@ export const UpdateCmekSettingsRequest = { }, toAmino(message: UpdateCmekSettingsRequest): UpdateCmekSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -5721,9 +5721,9 @@ export const CmekSettings = { }, toAmino(message: CmekSettings): CmekSettingsAmino { const obj: any = {}; - obj.name = message.name; - obj.kms_key_name = message.kmsKeyName; - obj.service_account_id = message.serviceAccountId; + obj.name = message.name === "" ? undefined : message.name; + obj.kms_key_name = message.kmsKeyName === "" ? undefined : message.kmsKeyName; + obj.service_account_id = message.serviceAccountId === "" ? undefined : message.serviceAccountId; return obj; }, fromAminoMsg(object: CmekSettingsAminoMsg): CmekSettings { @@ -5811,7 +5811,7 @@ export const GetSettingsRequest = { }, toAmino(message: GetSettingsRequest): GetSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetSettingsRequestAminoMsg): GetSettingsRequest { @@ -5931,7 +5931,7 @@ export const UpdateSettingsRequest = { }, toAmino(message: UpdateSettingsRequest): UpdateSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.settings = message.settings ? Settings.toAmino(message.settings) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -6085,11 +6085,11 @@ export const Settings = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.kms_key_name = message.kmsKeyName === "" ? undefined : message.kmsKeyName; + obj.kms_service_account_id = message.kmsServiceAccountId === "" ? undefined : message.kmsServiceAccountId; + obj.storage_location = message.storageLocation === "" ? undefined : message.storageLocation; + obj.disable_default_sink = message.disableDefaultSink === false ? undefined : message.disableDefaultSink; return obj; }, fromAminoMsg(object: SettingsAminoMsg): Settings { @@ -6209,9 +6209,9 @@ export const CopyLogEntriesRequest = { }, toAmino(message: CopyLogEntriesRequest): CopyLogEntriesRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.filter = message.filter; - obj.destination = message.destination; + obj.name = message.name === "" ? undefined : message.name; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.destination = message.destination === "" ? undefined : message.destination; return obj; }, fromAminoMsg(object: CopyLogEntriesRequestAminoMsg): CopyLogEntriesRequest { @@ -6377,7 +6377,7 @@ export const CopyLogEntriesMetadata = { message.endTime = fromTimestamp(Timestamp.fromAmino(object.end_time)); } if (object.state !== undefined && object.state !== null) { - message.state = operationStateFromJSON(object.state); + message.state = object.state; } if (object.cancellation_requested !== undefined && object.cancellation_requested !== null) { message.cancellationRequested = object.cancellation_requested; @@ -6397,11 +6397,11 @@ export const CopyLogEntriesMetadata = { const obj: any = {}; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; - obj.state = message.state; - obj.cancellation_requested = message.cancellationRequested; + obj.state = message.state === 0 ? undefined : message.state; + obj.cancellation_requested = message.cancellationRequested === false ? undefined : message.cancellationRequested; obj.request = message.request ? CopyLogEntriesRequest.toAmino(message.request) : undefined; - obj.progress = message.progress; - obj.writer_identity = message.writerIdentity; + obj.progress = message.progress === 0 ? undefined : message.progress; + obj.writer_identity = message.writerIdentity === "" ? undefined : message.writerIdentity; return obj; }, fromAminoMsg(object: CopyLogEntriesMetadataAminoMsg): CopyLogEntriesMetadata { @@ -6489,7 +6489,7 @@ export const CopyLogEntriesResponse = { }, toAmino(message: CopyLogEntriesResponse): CopyLogEntriesResponseAmino { const obj: any = {}; - obj.log_entries_copied_count = message.logEntriesCopiedCount ? message.logEntriesCopiedCount.toString() : undefined; + obj.log_entries_copied_count = message.logEntriesCopiedCount !== BigInt(0) ? message.logEntriesCopiedCount.toString() : undefined; return obj; }, fromAminoMsg(object: CopyLogEntriesResponseAminoMsg): CopyLogEntriesResponse { 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 f3631783a9..cdc0b64526 100644 --- a/__fixtures__/v-next/outputosmojs/google/logging/v2/logging_metrics.ts +++ b/__fixtures__/v-next/outputosmojs/google/logging/v2/logging_metrics.ts @@ -434,8 +434,8 @@ export const LogMetric_LabelExtractorsEntry = { }, toAmino(message: LogMetric_LabelExtractorsEntry): LogMetric_LabelExtractorsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogMetric_LabelExtractorsEntryAminoMsg): LogMetric_LabelExtractorsEntry { @@ -714,18 +714,18 @@ export const LogMetric = { message.updateTime = fromTimestamp(Timestamp.fromAmino(object.update_time)); } if (object.version !== undefined && object.version !== null) { - message.version = logMetric_ApiVersionFromJSON(object.version); + message.version = object.version; } return message; }, toAmino(message: LogMetric): LogMetricAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; - obj.filter = message.filter; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.disabled = message.disabled === false ? undefined : message.disabled; obj.metric_descriptor = message.metricDescriptor ? MetricDescriptor.toAmino(message.metricDescriptor) : undefined; - obj.value_extractor = message.valueExtractor; + obj.value_extractor = message.valueExtractor === "" ? undefined : message.valueExtractor; obj.label_extractors = {}; if (message.labelExtractors) { Object.entries(message.labelExtractors).forEach(([k, v]) => { @@ -735,7 +735,7 @@ export const LogMetric = { obj.bucket_options = message.bucketOptions ? Distribution_BucketOptions.toAmino(message.bucketOptions) : undefined; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.version = message.version; + obj.version = message.version === 0 ? undefined : message.version; return obj; }, fromAminoMsg(object: LogMetricAminoMsg): LogMetric { @@ -855,9 +855,9 @@ export const ListLogMetricsRequest = { }, toAmino(message: ListLogMetricsRequest): ListLogMetricsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListLogMetricsRequestAminoMsg): ListLogMetricsRequest { @@ -970,9 +970,9 @@ export const ListLogMetricsResponse = { if (message.metrics) { obj.metrics = message.metrics.map(e => e ? LogMetric.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogMetricsResponseAminoMsg): ListLogMetricsResponse { @@ -1060,7 +1060,7 @@ export const GetLogMetricRequest = { }, toAmino(message: GetLogMetricRequest): GetLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; return obj; }, fromAminoMsg(object: GetLogMetricRequestAminoMsg): GetLogMetricRequest { @@ -1164,7 +1164,7 @@ export const CreateLogMetricRequest = { }, toAmino(message: CreateLogMetricRequest): CreateLogMetricRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined; return obj; }, @@ -1269,7 +1269,7 @@ export const UpdateLogMetricRequest = { }, toAmino(message: UpdateLogMetricRequest): UpdateLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined; return obj; }, @@ -1358,7 +1358,7 @@ export const DeleteLogMetricRequest = { }, toAmino(message: DeleteLogMetricRequest): DeleteLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; return obj; }, fromAminoMsg(object: DeleteLogMetricRequestAminoMsg): DeleteLogMetricRequest { diff --git a/__fixtures__/v-next/outputosmojs/google/longrunning/operations.ts b/__fixtures__/v-next/outputosmojs/google/longrunning/operations.ts index 5d397b2f79..3be3b9ca1e 100644 --- a/__fixtures__/v-next/outputosmojs/google/longrunning/operations.ts +++ b/__fixtures__/v-next/outputosmojs/google/longrunning/operations.ts @@ -344,9 +344,9 @@ export const Operation = { }, toAmino(message: Operation): OperationAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.metadata = message.metadata ? Any.toAmino(message.metadata) : undefined; - obj.done = message.done; + obj.done = message.done === false ? undefined : message.done; obj.error = message.error ? Status.toAmino(message.error) : undefined; obj.response = message.response ? Any.toAmino(message.response) : undefined; return obj; @@ -436,7 +436,7 @@ export const GetOperationRequest = { }, toAmino(message: GetOperationRequest): GetOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetOperationRequestAminoMsg): GetOperationRequest { @@ -572,10 +572,10 @@ export const ListOperationsRequest = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListOperationsRequestAminoMsg): ListOperationsRequest { @@ -688,9 +688,9 @@ export const ListOperationsResponse = { if (message.operations) { obj.operations = message.operations.map(e => e ? Operation.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListOperationsResponseAminoMsg): ListOperationsResponse { @@ -778,7 +778,7 @@ export const CancelOperationRequest = { }, toAmino(message: CancelOperationRequest): CancelOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: CancelOperationRequestAminoMsg): CancelOperationRequest { @@ -866,7 +866,7 @@ export const DeleteOperationRequest = { }, toAmino(message: DeleteOperationRequest): DeleteOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteOperationRequestAminoMsg): DeleteOperationRequest { @@ -970,7 +970,7 @@ export const WaitOperationRequest = { }, toAmino(message: WaitOperationRequest): WaitOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timeout = message.timeout ? Duration.toAmino(message.timeout) : undefined; return obj; }, @@ -1075,8 +1075,8 @@ export const OperationInfo = { }, toAmino(message: OperationInfo): OperationInfoAmino { const obj: any = {}; - obj.response_type = message.responseType; - obj.metadata_type = message.metadataType; + obj.response_type = message.responseType === "" ? undefined : message.responseType; + obj.metadata_type = message.metadataType === "" ? undefined : message.metadataType; return obj; }, fromAminoMsg(object: OperationInfoAminoMsg): OperationInfo { diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/api.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/api.ts index f99afbc32f..12bd7ef7fe 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/api.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/api.ts @@ -465,31 +465,31 @@ export const Api = { } message.mixins = object.mixins?.map(e => Mixin.fromAmino(e)) || []; if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Api): ApiAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.methods) { obj.methods = message.methods.map(e => e ? Method.toAmino(e) : undefined); } else { - obj.methods = []; + obj.methods = message.methods; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.version = message.version; + obj.version = message.version === "" ? undefined : 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.mixins = message.mixins; } - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: ApiAminoMsg): Api { @@ -673,23 +673,23 @@ export const Method = { } message.options = object.options?.map(e => Option.fromAmino(e)) || []; if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.request_type_url = message.requestTypeUrl === "" ? undefined : message.requestTypeUrl; + obj.request_streaming = message.requestStreaming === false ? undefined : message.requestStreaming; + obj.response_type_url = message.responseTypeUrl === "" ? undefined : message.responseTypeUrl; + obj.response_streaming = message.responseStreaming === false ? undefined : message.responseStreaming; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: MethodAminoMsg): Method { @@ -793,8 +793,8 @@ export const Mixin = { }, toAmino(message: Mixin): MixinAmino { const obj: any = {}; - obj.name = message.name; - obj.root = message.root; + obj.name = message.name === "" ? undefined : message.name; + obj.root = message.root === "" ? undefined : message.root; return obj; }, fromAminoMsg(object: MixinAminoMsg): Mixin { diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/compiler/plugin.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/compiler/plugin.ts index 5f938674d1..d14334f31a 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/compiler/plugin.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/compiler/plugin.ts @@ -275,10 +275,10 @@ export const Version = { }, toAmino(message: Version): VersionAmino { const obj: any = {}; - obj.major = message.major; - obj.minor = message.minor; - obj.patch = message.patch; - obj.suffix = message.suffix; + obj.major = message.major === 0 ? undefined : message.major; + obj.minor = message.minor === 0 ? undefined : message.minor; + obj.patch = message.patch === 0 ? undefined : message.patch; + obj.suffix = message.suffix === "" ? undefined : message.suffix; return obj; }, fromAminoMsg(object: VersionAminoMsg): Version { @@ -429,13 +429,13 @@ export const CodeGeneratorRequest = { if (message.fileToGenerate) { obj.file_to_generate = message.fileToGenerate.map(e => e); } else { - obj.file_to_generate = []; + obj.file_to_generate = message.fileToGenerate; } - obj.parameter = message.parameter; + obj.parameter = message.parameter === "" ? undefined : message.parameter; if (message.protoFile) { obj.proto_file = message.protoFile.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.proto_file = []; + obj.proto_file = message.protoFile; } obj.compiler_version = message.compilerVersion ? Version.toAmino(message.compilerVersion) : undefined; return obj; @@ -547,11 +547,11 @@ export const CodeGeneratorResponse = { }, toAmino(message: CodeGeneratorResponse): CodeGeneratorResponseAmino { const obj: any = {}; - obj.error = message.error; + obj.error = message.error === "" ? undefined : message.error; if (message.file) { obj.file = message.file.map(e => e ? CodeGeneratorResponse_File.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -672,9 +672,9 @@ export const CodeGeneratorResponse_File = { }, toAmino(message: CodeGeneratorResponse_File): CodeGeneratorResponse_FileAmino { const obj: any = {}; - obj.name = message.name; - obj.insertion_point = message.insertionPoint; - obj.content = message.content; + obj.name = message.name === "" ? undefined : message.name; + obj.insertion_point = message.insertionPoint === "" ? undefined : message.insertionPoint; + obj.content = message.content === "" ? undefined : message.content; return obj; }, fromAminoMsg(object: CodeGeneratorResponse_FileAminoMsg): CodeGeneratorResponse_File { diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/descriptor.ts index 71833af965..9fee1d5d09 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/descriptor.ts @@ -1464,7 +1464,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -1789,46 +1789,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2108,47 +2108,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -2269,8 +2269,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -2375,8 +2375,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -2473,7 +2473,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -2679,10 +2679,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -2706,15 +2706,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -2819,7 +2819,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -2990,22 +2990,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3110,8 +3110,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -3231,8 +3231,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -3359,11 +3359,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -3533,12 +3533,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -3903,7 +3903,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -3952,30 +3952,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4134,14 +4134,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4310,13 +4310,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -4332,16 +4332,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4439,7 +4439,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4566,12 +4566,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4682,11 +4682,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4797,11 +4797,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4921,19 +4921,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5127,14 +5127,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -5238,8 +5238,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -5336,7 +5336,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -5528,19 +5528,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -5638,7 +5638,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -5793,11 +5793,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/field_mask.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/field_mask.ts index c4a3a96871..d37614db1b 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/field_mask.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/field_mask.ts @@ -492,7 +492,7 @@ export const FieldMask = { if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/source_context.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/source_context.ts index 7d448f8619..15dbabdc65 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/source_context.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/source_context.ts @@ -92,7 +92,7 @@ export const SourceContext = { }, toAmino(message: SourceContext): SourceContextAmino { const obj: any = {}; - obj.file_name = message.fileName; + obj.file_name = message.fileName === "" ? undefined : message.fileName; return obj; }, fromAminoMsg(object: SourceContextAminoMsg): SourceContext { diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/struct.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/struct.ts index 7e5633c13d..554554bf3c 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/struct.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/struct.ts @@ -227,7 +227,7 @@ export const Struct_FieldsEntry = { }, toAmino(message: Struct_FieldsEntry): Struct_FieldsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? Value.toAmino(message.value) : undefined; return obj; }, @@ -505,7 +505,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.number_value !== undefined && object.number_value !== null) { message.numberValue = object.number_value; @@ -526,10 +526,10 @@ export const Value = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.number_value = message.numberValue === null ? undefined : message.numberValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; obj.struct_value = message.structValue ? Struct.toAmino(message.structValue) : undefined; obj.list_value = message.listValue ? ListValue.toAmino(message.listValue) : undefined; return obj; @@ -628,7 +628,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/type.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/type.ts index af96a55763..117434b38d 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/type.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/type.ts @@ -549,30 +549,30 @@ export const Type = { message.sourceContext = SourceContext.fromAmino(object.source_context); } if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Type): TypeAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.fields) { obj.fields = message.fields.map(e => e ? Field.toAmino(e) : undefined); } else { - obj.fields = []; + obj.fields = message.fields; } if (message.oneofs) { obj.oneofs = message.oneofs.map(e => e); } else { - obj.oneofs = []; + obj.oneofs = message.oneofs; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: TypeAminoMsg): Type { @@ -779,10 +779,10 @@ export const Field = { fromAmino(object: FieldAmino): Field { const message = createBaseField(); if (object.kind !== undefined && object.kind !== null) { - message.kind = field_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.cardinality !== undefined && object.cardinality !== null) { - message.cardinality = field_CardinalityFromJSON(object.cardinality); + message.cardinality = object.cardinality; } if (object.number !== undefined && object.number !== null) { message.number = object.number; @@ -810,20 +810,20 @@ export const Field = { }, 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; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.cardinality = message.cardinality === 0 ? undefined : message.cardinality; + obj.number = message.number === 0 ? undefined : message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.type_url = message.typeUrl === "" ? undefined : message.typeUrl; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.packed = message.packed === false ? undefined : message.packed; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.json_name = message.jsonName; - obj.default_value = message.defaultValue; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; return obj; }, fromAminoMsg(object: FieldAminoMsg): Field { @@ -981,25 +981,25 @@ export const Enum = { message.sourceContext = SourceContext.fromAmino(object.source_context); } if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Enum): EnumAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.enumvalue) { obj.enumvalue = message.enumvalue.map(e => e ? EnumValue.toAmino(e) : undefined); } else { - obj.enumvalue = []; + obj.enumvalue = message.enumvalue; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: EnumAminoMsg): Enum { @@ -1125,12 +1125,12 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -1235,7 +1235,7 @@ export const Option = { }, toAmino(message: Option): OptionAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.value = message.value ? Any.toAmino(message.value) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/wrappers.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/wrappers.ts index 5529f3d403..ad662746fc 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/wrappers.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/wrappers.ts @@ -259,7 +259,7 @@ export const DoubleValue = { }, toAmino(message: DoubleValue): DoubleValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: DoubleValueAminoMsg): DoubleValue { @@ -347,7 +347,7 @@ export const FloatValue = { }, toAmino(message: FloatValue): FloatValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: FloatValueAminoMsg): FloatValue { @@ -435,7 +435,7 @@ export const Int64Value = { }, toAmino(message: Int64Value): Int64ValueAmino { const obj: any = {}; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: Int64ValueAminoMsg): Int64Value { @@ -523,7 +523,7 @@ export const UInt64Value = { }, toAmino(message: UInt64Value): UInt64ValueAmino { const obj: any = {}; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: UInt64ValueAminoMsg): UInt64Value { @@ -611,7 +611,7 @@ export const Int32Value = { }, toAmino(message: Int32Value): Int32ValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: Int32ValueAminoMsg): Int32Value { @@ -699,7 +699,7 @@ export const UInt32Value = { }, toAmino(message: UInt32Value): UInt32ValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: UInt32ValueAminoMsg): UInt32Value { @@ -787,7 +787,7 @@ export const BoolValue = { }, toAmino(message: BoolValue): BoolValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === false ? undefined : message.value; return obj; }, fromAminoMsg(object: BoolValueAminoMsg): BoolValue { @@ -875,7 +875,7 @@ export const StringValue = { }, toAmino(message: StringValue): StringValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: StringValueAminoMsg): StringValue { 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 9a5bd4cfa8..e752e7c45d 100644 --- a/__fixtures__/v-next/outputosmojs/google/rpc/context/attribute_context.ts +++ b/__fixtures__/v-next/outputosmojs/google/rpc/context/attribute_context.ts @@ -774,7 +774,7 @@ export const AttributeContext = { if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, @@ -878,8 +878,8 @@ export const AttributeContext_Peer_LabelsEntry = { }, toAmino(message: AttributeContext_Peer_LabelsEntry): AttributeContext_Peer_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Peer_LabelsEntryAminoMsg): AttributeContext_Peer_LabelsEntry { @@ -1068,16 +1068,16 @@ export const AttributeContext_Peer = { }, toAmino(message: AttributeContext_Peer): AttributeContext_PeerAmino { const obj: any = {}; - obj.ip = message.ip; - obj.port = message.port ? message.port.toString() : undefined; + obj.ip = message.ip === "" ? undefined : message.ip; + obj.port = message.port !== BigInt(0) ? 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; + obj.principal = message.principal === "" ? undefined : message.principal; + obj.region_code = message.regionCode === "" ? undefined : message.regionCode; return obj; }, fromAminoMsg(object: AttributeContext_PeerAminoMsg): AttributeContext_Peer { @@ -1213,10 +1213,10 @@ export const AttributeContext_Api = { }, 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; + obj.service = message.service === "" ? undefined : message.service; + obj.operation = message.operation === "" ? undefined : message.operation; + obj.protocol = message.protocol === "" ? undefined : message.protocol; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: AttributeContext_ApiAminoMsg): AttributeContext_Api { @@ -1380,18 +1380,18 @@ export const AttributeContext_Auth = { }, toAmino(message: AttributeContext_Auth): AttributeContext_AuthAmino { const obj: any = {}; - obj.principal = message.principal; + obj.principal = message.principal === "" ? undefined : message.principal; if (message.audiences) { obj.audiences = message.audiences.map(e => e); } else { - obj.audiences = []; + obj.audiences = message.audiences; } - obj.presenter = message.presenter; + obj.presenter = message.presenter === "" ? undefined : 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 = []; + obj.access_levels = message.accessLevels; } return obj; }, @@ -1495,8 +1495,8 @@ export const AttributeContext_Request_HeadersEntry = { }, toAmino(message: AttributeContext_Request_HeadersEntry): AttributeContext_Request_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Request_HeadersEntryAminoMsg): AttributeContext_Request_HeadersEntry { @@ -1797,22 +1797,22 @@ export const AttributeContext_Request = { }, toAmino(message: AttributeContext_Request): AttributeContext_RequestAmino { const obj: any = {}; - obj.id = message.id; - obj.method = message.method; + obj.id = message.id === "" ? undefined : message.id; + obj.method = message.method === "" ? undefined : 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.path = message.path === "" ? undefined : message.path; + obj.host = message.host === "" ? undefined : message.host; + obj.scheme = message.scheme === "" ? undefined : message.scheme; + obj.query = message.query === "" ? undefined : message.query; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.size = message.size ? message.size.toString() : undefined; - obj.protocol = message.protocol; - obj.reason = message.reason; + obj.size = message.size !== BigInt(0) ? message.size.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; + obj.reason = message.reason === "" ? undefined : message.reason; obj.auth = message.auth ? AttributeContext_Auth.toAmino(message.auth) : undefined; return obj; }, @@ -1916,8 +1916,8 @@ export const AttributeContext_Response_HeadersEntry = { }, toAmino(message: AttributeContext_Response_HeadersEntry): AttributeContext_Response_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Response_HeadersEntryAminoMsg): AttributeContext_Response_HeadersEntry { @@ -2106,8 +2106,8 @@ export const AttributeContext_Response = { }, 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.code = message.code !== BigInt(0) ? message.code.toString() : undefined; + obj.size = message.size !== BigInt(0) ? message.size.toString() : undefined; obj.headers = {}; if (message.headers) { Object.entries(message.headers).forEach(([k, v]) => { @@ -2218,8 +2218,8 @@ export const AttributeContext_Resource_LabelsEntry = { }, toAmino(message: AttributeContext_Resource_LabelsEntry): AttributeContext_Resource_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Resource_LabelsEntryAminoMsg): AttributeContext_Resource_LabelsEntry { @@ -2316,8 +2316,8 @@ export const AttributeContext_Resource_AnnotationsEntry = { }, toAmino(message: AttributeContext_Resource_AnnotationsEntry): AttributeContext_Resource_AnnotationsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Resource_AnnotationsEntryAminoMsg): AttributeContext_Resource_AnnotationsEntry { @@ -2661,28 +2661,28 @@ export const AttributeContext_Resource = { }, toAmino(message: AttributeContext_Resource): AttributeContext_ResourceAmino { const obj: any = {}; - obj.service = message.service; - obj.name = message.name; - obj.type = message.type; + obj.service = message.service === "" ? undefined : message.service; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { obj.labels[k] = v; }); } - obj.uid = message.uid; + obj.uid = message.uid === "" ? undefined : message.uid; obj.annotations = {}; if (message.annotations) { Object.entries(message.annotations).forEach(([k, v]) => { obj.annotations[k] = v; }); } - obj.display_name = message.displayName; + obj.display_name = message.displayName === "" ? undefined : message.displayName; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; obj.delete_time = message.deleteTime ? Timestamp.toAmino(toTimestamp(message.deleteTime)) : undefined; - obj.etag = message.etag; - obj.location = message.location; + obj.etag = message.etag === "" ? undefined : message.etag; + obj.location = message.location === "" ? undefined : message.location; return obj; }, fromAminoMsg(object: AttributeContext_ResourceAminoMsg): AttributeContext_Resource { diff --git a/__fixtures__/v-next/outputosmojs/google/rpc/error_details.ts b/__fixtures__/v-next/outputosmojs/google/rpc/error_details.ts index 290b0c6f3f..7d413eb8ee 100644 --- a/__fixtures__/v-next/outputosmojs/google/rpc/error_details.ts +++ b/__fixtures__/v-next/outputosmojs/google/rpc/error_details.ts @@ -647,9 +647,9 @@ export const DebugInfo = { if (message.stackEntries) { obj.stack_entries = message.stackEntries.map(e => e); } else { - obj.stack_entries = []; + obj.stack_entries = message.stackEntries; } - obj.detail = message.detail; + obj.detail = message.detail === "" ? undefined : message.detail; return obj; }, fromAminoMsg(object: DebugInfoAminoMsg): DebugInfo { @@ -746,7 +746,7 @@ export const QuotaFailure = { if (message.violations) { obj.violations = message.violations.map(e => e ? QuotaFailure_Violation.toAmino(e) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -851,8 +851,8 @@ export const QuotaFailure_Violation = { }, toAmino(message: QuotaFailure_Violation): QuotaFailure_ViolationAmino { const obj: any = {}; - obj.subject = message.subject; - obj.description = message.description; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: QuotaFailure_ViolationAminoMsg): QuotaFailure_Violation { @@ -955,8 +955,8 @@ export const ErrorInfo_MetadataEntry = { }, toAmino(message: ErrorInfo_MetadataEntry): ErrorInfo_MetadataEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: ErrorInfo_MetadataEntryAminoMsg): ErrorInfo_MetadataEntry { @@ -1113,8 +1113,8 @@ export const ErrorInfo = { }, toAmino(message: ErrorInfo): ErrorInfoAmino { const obj: any = {}; - obj.reason = message.reason; - obj.domain = message.domain; + obj.reason = message.reason === "" ? undefined : message.reason; + obj.domain = message.domain === "" ? undefined : message.domain; obj.metadata = {}; if (message.metadata) { Object.entries(message.metadata).forEach(([k, v]) => { @@ -1217,7 +1217,7 @@ export const PreconditionFailure = { if (message.violations) { obj.violations = message.violations.map(e => e ? PreconditionFailure_Violation.toAmino(e) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -1338,9 +1338,9 @@ export const PreconditionFailure_Violation = { }, toAmino(message: PreconditionFailure_Violation): PreconditionFailure_ViolationAmino { const obj: any = {}; - obj.type = message.type; - obj.subject = message.subject; - obj.description = message.description; + obj.type = message.type === "" ? undefined : message.type; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: PreconditionFailure_ViolationAminoMsg): PreconditionFailure_Violation { @@ -1437,7 +1437,7 @@ export const BadRequest = { if (message.fieldViolations) { obj.field_violations = message.fieldViolations.map(e => e ? BadRequest_FieldViolation.toAmino(e) : undefined); } else { - obj.field_violations = []; + obj.field_violations = message.fieldViolations; } return obj; }, @@ -1542,8 +1542,8 @@ export const BadRequest_FieldViolation = { }, toAmino(message: BadRequest_FieldViolation): BadRequest_FieldViolationAmino { const obj: any = {}; - obj.field = message.field; - obj.description = message.description; + obj.field = message.field === "" ? undefined : message.field; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: BadRequest_FieldViolationAminoMsg): BadRequest_FieldViolation { @@ -1647,8 +1647,8 @@ export const RequestInfo = { }, toAmino(message: RequestInfo): RequestInfoAmino { const obj: any = {}; - obj.request_id = message.requestId; - obj.serving_data = message.servingData; + obj.request_id = message.requestId === "" ? undefined : message.requestId; + obj.serving_data = message.servingData === "" ? undefined : message.servingData; return obj; }, fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo { @@ -1784,10 +1784,10 @@ export const ResourceInfo = { }, 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; + obj.resource_type = message.resourceType === "" ? undefined : message.resourceType; + obj.resource_name = message.resourceName === "" ? undefined : message.resourceName; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo { @@ -1884,7 +1884,7 @@ export const Help = { if (message.links) { obj.links = message.links.map(e => e ? Help_Link.toAmino(e) : undefined); } else { - obj.links = []; + obj.links = message.links; } return obj; }, @@ -1989,8 +1989,8 @@ export const Help_Link = { }, toAmino(message: Help_Link): Help_LinkAmino { const obj: any = {}; - obj.description = message.description; - obj.url = message.url; + obj.description = message.description === "" ? undefined : message.description; + obj.url = message.url === "" ? undefined : message.url; return obj; }, fromAminoMsg(object: Help_LinkAminoMsg): Help_Link { @@ -2094,8 +2094,8 @@ export const LocalizedMessage = { }, toAmino(message: LocalizedMessage): LocalizedMessageAmino { const obj: any = {}; - obj.locale = message.locale; - obj.message = message.message; + obj.locale = message.locale === "" ? undefined : message.locale; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: LocalizedMessageAminoMsg): LocalizedMessage { diff --git a/__fixtures__/v-next/outputosmojs/google/rpc/status.ts b/__fixtures__/v-next/outputosmojs/google/rpc/status.ts index 9d49b6aa51..f2f15145dc 100644 --- a/__fixtures__/v-next/outputosmojs/google/rpc/status.ts +++ b/__fixtures__/v-next/outputosmojs/google/rpc/status.ts @@ -151,12 +151,12 @@ export const Status = { }, toAmino(message: Status): StatusAmino { const obj: any = {}; - obj.code = message.code; - obj.message = message.message; + obj.code = message.code === 0 ? undefined : message.code; + obj.message = message.message === "" ? undefined : message.message; if (message.details) { obj.details = message.details.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.details = []; + obj.details = message.details; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/helpers.ts b/__fixtures__/v-next/outputosmojs/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/v-next/outputosmojs/helpers.ts +++ b/__fixtures__/v-next/outputosmojs/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } 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 9da00ba60a..10ad52d8ee 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/ack.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/ack.ts @@ -122,8 +122,8 @@ export const IncentivizedAcknowledgement = { toAmino(message: IncentivizedAcknowledgement): IncentivizedAcknowledgementAmino { const obj: any = {}; obj.app_acknowledgement = message.appAcknowledgement ? base64FromBytes(message.appAcknowledgement) : undefined; - obj.forward_relayer_address = message.forwardRelayerAddress; - obj.underlying_app_success = message.underlyingAppSuccess; + obj.forward_relayer_address = message.forwardRelayerAddress === "" ? undefined : message.forwardRelayerAddress; + obj.underlying_app_success = message.underlyingAppSuccess === false ? undefined : message.underlyingAppSuccess; return obj; }, fromAminoMsg(object: IncentivizedAcknowledgementAminoMsg): IncentivizedAcknowledgement { 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 60607bf27d..4fd9bc8e02 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/fee.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/fee.ts @@ -188,17 +188,17 @@ export const Fee = { if (message.recvFee) { obj.recv_fee = message.recvFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.recv_fee = []; + obj.recv_fee = message.recvFee; } if (message.ackFee) { obj.ack_fee = message.ackFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.ack_fee = []; + obj.ack_fee = message.ackFee; } if (message.timeoutFee) { obj.timeout_fee = message.timeoutFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.timeout_fee = []; + obj.timeout_fee = message.timeoutFee; } return obj; }, @@ -332,11 +332,11 @@ export const PacketFee = { toAmino(message: PacketFee): PacketFeeAmino { const obj: any = {}; obj.fee = message.fee ? Fee.toAmino(message.fee) : undefined; - obj.refund_address = message.refundAddress; + obj.refund_address = message.refundAddress === "" ? undefined : message.refundAddress; if (message.relayers) { obj.relayers = message.relayers.map(e => e); } else { - obj.relayers = []; + obj.relayers = message.relayers; } return obj; }, @@ -440,7 +440,7 @@ export const PacketFees = { if (message.packetFees) { obj.packet_fees = message.packetFees.map(e => e ? PacketFee.toAmino(e) : undefined); } else { - obj.packet_fees = []; + obj.packet_fees = message.packetFees; } return obj; }, @@ -544,7 +544,7 @@ export const IdentifiedPacketFees = { if (message.packetFees) { obj.packet_fees = message.packetFees.map(e => e ? PacketFee.toAmino(e) : undefined); } else { - obj.packet_fees = []; + obj.packet_fees = message.packetFees; } return obj; }, 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 bbba06257f..45171de156 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/genesis.ts @@ -266,27 +266,27 @@ export const GenesisState = { if (message.identifiedFees) { obj.identified_fees = message.identifiedFees.map(e => e ? IdentifiedPacketFees.toAmino(e) : undefined); } else { - obj.identified_fees = []; + obj.identified_fees = message.identifiedFees; } if (message.feeEnabledChannels) { obj.fee_enabled_channels = message.feeEnabledChannels.map(e => e ? FeeEnabledChannel.toAmino(e) : undefined); } else { - obj.fee_enabled_channels = []; + obj.fee_enabled_channels = message.feeEnabledChannels; } if (message.registeredPayees) { obj.registered_payees = message.registeredPayees.map(e => e ? RegisteredPayee.toAmino(e) : undefined); } else { - obj.registered_payees = []; + obj.registered_payees = message.registeredPayees; } if (message.registeredCounterpartyPayees) { obj.registered_counterparty_payees = message.registeredCounterpartyPayees.map(e => e ? RegisteredCounterpartyPayee.toAmino(e) : undefined); } else { - obj.registered_counterparty_payees = []; + obj.registered_counterparty_payees = message.registeredCounterpartyPayees; } if (message.forwardRelayers) { obj.forward_relayers = message.forwardRelayers.map(e => e ? ForwardRelayerAddress.toAmino(e) : undefined); } else { - obj.forward_relayers = []; + obj.forward_relayers = message.forwardRelayers; } return obj; }, @@ -397,8 +397,8 @@ export const FeeEnabledChannel = { }, toAmino(message: FeeEnabledChannel): FeeEnabledChannelAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: FeeEnabledChannelAminoMsg): FeeEnabledChannel { @@ -524,9 +524,9 @@ export const RegisteredPayee = { }, toAmino(message: RegisteredPayee): RegisteredPayeeAmino { const obj: any = {}; - obj.channel_id = message.channelId; - obj.relayer = message.relayer; - obj.payee = message.payee; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.relayer = message.relayer === "" ? undefined : message.relayer; + obj.payee = message.payee === "" ? undefined : message.payee; return obj; }, fromAminoMsg(object: RegisteredPayeeAminoMsg): RegisteredPayee { @@ -652,9 +652,9 @@ export const RegisteredCounterpartyPayee = { }, toAmino(message: RegisteredCounterpartyPayee): RegisteredCounterpartyPayeeAmino { const obj: any = {}; - obj.channel_id = message.channelId; - obj.relayer = message.relayer; - obj.counterparty_payee = message.counterpartyPayee; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.relayer = message.relayer === "" ? undefined : message.relayer; + obj.counterparty_payee = message.counterpartyPayee === "" ? undefined : message.counterpartyPayee; return obj; }, fromAminoMsg(object: RegisteredCounterpartyPayeeAminoMsg): RegisteredCounterpartyPayee { @@ -748,7 +748,7 @@ export const ForwardRelayerAddress = { }, toAmino(message: ForwardRelayerAddress): ForwardRelayerAddressAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: ForwardRelayerAddressAminoMsg): ForwardRelayerAddress { 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 28f3c248a8..1f7ea72df3 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/metadata.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/metadata.ts @@ -108,8 +108,8 @@ export const Metadata = { }, toAmino(message: Metadata): MetadataAmino { const obj: any = {}; - obj.fee_version = message.feeVersion; - obj.app_version = message.appVersion; + obj.fee_version = message.feeVersion === "" ? undefined : message.feeVersion; + obj.app_version = message.appVersion === "" ? undefined : message.appVersion; return obj; }, fromAminoMsg(object: MetadataAminoMsg): Metadata { 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 1eceaa7e1b..d19c90e8d6 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/query.ts @@ -373,7 +373,7 @@ export const QueryIncentivizedPacketsRequest = { 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; + obj.query_height = message.queryHeight !== BigInt(0) ? message.queryHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryIncentivizedPacketsRequestAminoMsg): QueryIncentivizedPacketsRequest { @@ -492,7 +492,7 @@ export const QueryIncentivizedPacketsResponse = { if (message.incentivizedPackets) { obj.incentivized_packets = message.incentivizedPackets.map(e => e ? IdentifiedPacketFees.toAmino(e) : undefined); } else { - obj.incentivized_packets = []; + obj.incentivized_packets = message.incentivizedPackets; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -588,7 +588,7 @@ export const QueryIncentivizedPacketRequest = { }, toAmino(message: QueryIncentivizedPacketRequest): QueryIncentivizedPacketRequestAmino { const obj: any = {}; - obj.query_height = message.queryHeight ? message.queryHeight.toString() : undefined; + obj.query_height = message.queryHeight !== BigInt(0) ? message.queryHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryIncentivizedPacketRequestAminoMsg): QueryIncentivizedPacketRequest { @@ -825,9 +825,9 @@ export const QueryIncentivizedPacketsForChannelRequest = { 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.query_height = message.queryHeight !== BigInt(0) ? message.queryHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryIncentivizedPacketsForChannelRequestAminoMsg): QueryIncentivizedPacketsForChannelRequest { @@ -946,7 +946,7 @@ export const QueryIncentivizedPacketsForChannelResponse = { if (message.incentivizedPackets) { obj.incentivized_packets = message.incentivizedPackets.map(e => e ? IdentifiedPacketFees.toAmino(e) : undefined); } else { - obj.incentivized_packets = []; + obj.incentivized_packets = message.incentivizedPackets; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1124,7 +1124,7 @@ export const QueryTotalRecvFeesResponse = { if (message.recvFees) { obj.recv_fees = message.recvFees.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.recv_fees = []; + obj.recv_fees = message.recvFees; } return obj; }, @@ -1301,7 +1301,7 @@ export const QueryTotalAckFeesResponse = { if (message.ackFees) { obj.ack_fees = message.ackFees.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.ack_fees = []; + obj.ack_fees = message.ackFees; } return obj; }, @@ -1478,7 +1478,7 @@ export const QueryTotalTimeoutFeesResponse = { if (message.timeoutFees) { obj.timeout_fees = message.timeoutFees.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.timeout_fees = []; + obj.timeout_fees = message.timeoutFees; } return obj; }, @@ -1589,8 +1589,8 @@ export const QueryPayeeRequest = { }, toAmino(message: QueryPayeeRequest): QueryPayeeRequestAmino { const obj: any = {}; - obj.channel_id = message.channelId; - obj.relayer = message.relayer; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.relayer = message.relayer === "" ? undefined : message.relayer; return obj; }, fromAminoMsg(object: QueryPayeeRequestAminoMsg): QueryPayeeRequest { @@ -1684,7 +1684,7 @@ export const QueryPayeeResponse = { }, toAmino(message: QueryPayeeResponse): QueryPayeeResponseAmino { const obj: any = {}; - obj.payee_address = message.payeeAddress; + obj.payee_address = message.payeeAddress === "" ? undefined : message.payeeAddress; return obj; }, fromAminoMsg(object: QueryPayeeResponseAminoMsg): QueryPayeeResponse { @@ -1794,8 +1794,8 @@ export const QueryCounterpartyPayeeRequest = { }, toAmino(message: QueryCounterpartyPayeeRequest): QueryCounterpartyPayeeRequestAmino { const obj: any = {}; - obj.channel_id = message.channelId; - obj.relayer = message.relayer; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.relayer = message.relayer === "" ? undefined : message.relayer; return obj; }, fromAminoMsg(object: QueryCounterpartyPayeeRequestAminoMsg): QueryCounterpartyPayeeRequest { @@ -1889,7 +1889,7 @@ export const QueryCounterpartyPayeeResponse = { }, toAmino(message: QueryCounterpartyPayeeResponse): QueryCounterpartyPayeeResponseAmino { const obj: any = {}; - obj.counterparty_payee = message.counterpartyPayee; + obj.counterparty_payee = message.counterpartyPayee === "" ? undefined : message.counterpartyPayee; return obj; }, fromAminoMsg(object: QueryCounterpartyPayeeResponseAminoMsg): QueryCounterpartyPayeeResponse { @@ -2000,7 +2000,7 @@ export const QueryFeeEnabledChannelsRequest = { 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; + obj.query_height = message.queryHeight !== BigInt(0) ? message.queryHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryFeeEnabledChannelsRequestAminoMsg): QueryFeeEnabledChannelsRequest { @@ -2119,7 +2119,7 @@ export const QueryFeeEnabledChannelsResponse = { if (message.feeEnabledChannels) { obj.fee_enabled_channels = message.feeEnabledChannels.map(e => e ? FeeEnabledChannel.toAmino(e) : undefined); } else { - obj.fee_enabled_channels = []; + obj.fee_enabled_channels = message.feeEnabledChannels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2231,8 +2231,8 @@ export const QueryFeeEnabledChannelRequest = { }, toAmino(message: QueryFeeEnabledChannelRequest): QueryFeeEnabledChannelRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryFeeEnabledChannelRequestAminoMsg): QueryFeeEnabledChannelRequest { @@ -2326,7 +2326,7 @@ export const QueryFeeEnabledChannelResponse = { }, toAmino(message: QueryFeeEnabledChannelResponse): QueryFeeEnabledChannelResponseAmino { const obj: any = {}; - obj.fee_enabled = message.feeEnabled; + obj.fee_enabled = message.feeEnabled === false ? undefined : message.feeEnabled; return obj; }, fromAminoMsg(object: QueryFeeEnabledChannelResponseAminoMsg): QueryFeeEnabledChannelResponse { 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 819f242c27..2f5d0fecab 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/tx.ts @@ -247,10 +247,10 @@ export const MsgRegisterPayee = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.relayer = message.relayer === "" ? undefined : message.relayer; + obj.payee = message.payee === "" ? undefined : message.payee; return obj; }, fromAminoMsg(object: MsgRegisterPayeeAminoMsg): MsgRegisterPayee { @@ -465,10 +465,10 @@ export const MsgRegisterCounterpartyPayee = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.relayer = message.relayer === "" ? undefined : message.relayer; + obj.counterparty_payee = message.counterpartyPayee === "" ? undefined : message.counterpartyPayee; return obj; }, fromAminoMsg(object: MsgRegisterCounterpartyPayeeAminoMsg): MsgRegisterCounterpartyPayee { @@ -706,13 +706,13 @@ export const MsgPayPacketFee = { 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; + obj.source_port_id = message.sourcePortId === "" ? undefined : message.sourcePortId; + obj.source_channel_id = message.sourceChannelId === "" ? undefined : message.sourceChannelId; + obj.signer = message.signer === "" ? undefined : message.signer; if (message.relayers) { obj.relayers = message.relayers.map(e => e); } else { - obj.relayers = []; + obj.relayers = message.relayers; } return obj; }, 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 967f3fc9a1..dfdf65050f 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 @@ -89,7 +89,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.controller_enabled = message.controllerEnabled; + obj.controller_enabled = message.controllerEnabled === false ? undefined : message.controllerEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { 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 3dfdc8d6c6..01691fb2a2 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 @@ -134,8 +134,8 @@ export const QueryInterchainAccountRequest = { }, toAmino(message: QueryInterchainAccountRequest): QueryInterchainAccountRequestAmino { const obj: any = {}; - obj.owner = message.owner; - obj.connection_id = message.connectionId; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromAminoMsg(object: QueryInterchainAccountRequestAminoMsg): QueryInterchainAccountRequest { @@ -229,7 +229,7 @@ export const QueryInterchainAccountResponse = { }, toAmino(message: QueryInterchainAccountResponse): QueryInterchainAccountResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryInterchainAccountResponseAminoMsg): QueryInterchainAccountResponse { 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 23cfa63998..401848ea43 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 @@ -167,9 +167,9 @@ export const MsgRegisterInterchainAccount = { }, toAmino(message: MsgRegisterInterchainAccount): MsgRegisterInterchainAccountAmino { const obj: any = {}; - obj.owner = message.owner; - obj.connection_id = message.connectionId; - obj.version = message.version; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: MsgRegisterInterchainAccountAminoMsg): MsgRegisterInterchainAccount { @@ -279,8 +279,8 @@ export const MsgRegisterInterchainAccountResponse = { }, toAmino(message: MsgRegisterInterchainAccountResponse): MsgRegisterInterchainAccountResponseAmino { const obj: any = {}; - obj.channel_id = message.channelId; - obj.port_id = message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; return obj; }, fromAminoMsg(object: MsgRegisterInterchainAccountResponseAminoMsg): MsgRegisterInterchainAccountResponse { @@ -422,10 +422,10 @@ export const MsgSendTx = { }, toAmino(message: MsgSendTx): MsgSendTxAmino { const obj: any = {}; - obj.owner = message.owner; - obj.connection_id = message.connectionId; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.packet_data = message.packetData ? InterchainAccountPacketData.toAmino(message.packetData) : undefined; - obj.relative_timeout = message.relativeTimeout ? message.relativeTimeout.toString() : undefined; + obj.relative_timeout = message.relativeTimeout !== BigInt(0) ? message.relativeTimeout.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSendTxAminoMsg): MsgSendTx { @@ -519,7 +519,7 @@ export const MsgSendTxResponse = { }, toAmino(message: MsgSendTxResponse): MsgSendTxResponseAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSendTxResponseAminoMsg): MsgSendTxResponse { 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 4e4b34faa9..2bd4eae1d3 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 @@ -344,17 +344,17 @@ export const ControllerGenesisState = { if (message.activeChannels) { obj.active_channels = message.activeChannels.map(e => e ? ActiveChannel.toAmino(e) : undefined); } else { - obj.active_channels = []; + obj.active_channels = message.activeChannels; } if (message.interchainAccounts) { obj.interchain_accounts = message.interchainAccounts.map(e => e ? RegisteredInterchainAccount.toAmino(e) : undefined); } else { - obj.interchain_accounts = []; + obj.interchain_accounts = message.interchainAccounts; } if (message.ports) { obj.ports = message.ports.map(e => e); } else { - obj.ports = []; + obj.ports = message.ports; } obj.params = message.params ? Params1.toAmino(message.params) : undefined; return obj; @@ -513,14 +513,14 @@ export const HostGenesisState = { if (message.activeChannels) { obj.active_channels = message.activeChannels.map(e => e ? ActiveChannel.toAmino(e) : undefined); } else { - obj.active_channels = []; + obj.active_channels = message.activeChannels; } if (message.interchainAccounts) { obj.interchain_accounts = message.interchainAccounts.map(e => e ? RegisteredInterchainAccount.toAmino(e) : undefined); } else { - obj.interchain_accounts = []; + obj.interchain_accounts = message.interchainAccounts; } - obj.port = message.port; + obj.port = message.port === "" ? undefined : message.port; obj.params = message.params ? Params2.toAmino(message.params) : undefined; return obj; }, @@ -663,10 +663,10 @@ export const ActiveChannel = { }, 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; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.is_middleware_enabled = message.isMiddlewareEnabled === false ? undefined : message.isMiddlewareEnabled; return obj; }, fromAminoMsg(object: ActiveChannelAminoMsg): ActiveChannel { @@ -792,9 +792,9 @@ export const RegisteredInterchainAccount = { }, toAmino(message: RegisteredInterchainAccount): RegisteredInterchainAccountAmino { const obj: any = {}; - obj.connection_id = message.connectionId; - obj.port_id = message.portId; - obj.account_address = message.accountAddress; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.account_address = message.accountAddress === "" ? undefined : message.accountAddress; return obj; }, fromAminoMsg(object: RegisteredInterchainAccountAminoMsg): RegisteredInterchainAccount { 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 fbcf9eded7..818d23bf26 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 @@ -114,11 +114,11 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.host_enabled = message.hostEnabled; + obj.host_enabled = message.hostEnabled === false ? undefined : message.hostEnabled; if (message.allowMessages) { obj.allow_messages = message.allowMessages.map(e => e); } else { - obj.allow_messages = []; + obj.allow_messages = message.allowMessages; } return obj; }, 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 6fe24052a4..5393bc1bbc 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 @@ -102,7 +102,7 @@ export const InterchainAccount = { toAmino(message: InterchainAccount): InterchainAccountAmino { const obj: any = {}; obj.base_account = message.baseAccount ? BaseAccount.toAmino(message.baseAccount) : undefined; - obj.account_owner = message.accountOwner; + obj.account_owner = message.accountOwner === "" ? undefined : message.accountOwner; return obj; }, fromAminoMsg(object: InterchainAccountAminoMsg): InterchainAccount { 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 55bbe2d3a3..cfaf45769a 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 @@ -187,12 +187,12 @@ export const Metadata = { }, 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; + obj.version = message.version === "" ? undefined : message.version; + obj.controller_connection_id = message.controllerConnectionId === "" ? undefined : message.controllerConnectionId; + obj.host_connection_id = message.hostConnectionId === "" ? undefined : message.hostConnectionId; + obj.address = message.address === "" ? undefined : message.address; + obj.encoding = message.encoding === "" ? undefined : message.encoding; + obj.tx_type = message.txType === "" ? undefined : message.txType; return obj; }, fromAminoMsg(object: MetadataAminoMsg): Metadata { 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 7dedfd8761..795036fb32 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 @@ -156,7 +156,7 @@ export const InterchainAccountPacketData = { fromAmino(object: InterchainAccountPacketDataAmino): InterchainAccountPacketData { const message = createBaseInterchainAccountPacketData(); if (object.type !== undefined && object.type !== null) { - message.type = typeFromJSON(object.type); + message.type = object.type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -168,9 +168,9 @@ export const InterchainAccountPacketData = { }, toAmino(message: InterchainAccountPacketData): InterchainAccountPacketDataAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.memo = message.memo; + obj.memo = message.memo === "" ? undefined : message.memo; return obj; }, fromAminoMsg(object: InterchainAccountPacketDataAminoMsg): InterchainAccountPacketData { @@ -273,7 +273,7 @@ export const CosmosTx = { if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } return obj; }, 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 46ccd816a5..b30e6e69d7 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/authz.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/authz.ts @@ -172,17 +172,17 @@ export const Allocation = { }, toAmino(message: Allocation): AllocationAmino { const obj: any = {}; - obj.source_port = message.sourcePort; - obj.source_channel = message.sourceChannel; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } if (message.allowList) { obj.allow_list = message.allowList.map(e => e); } else { - obj.allow_list = []; + obj.allow_list = message.allowList; } return obj; }, @@ -286,7 +286,7 @@ export const TransferAuthorization = { if (message.allocations) { obj.allocations = message.allocations.map(e => e ? Allocation.toAmino(e) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } return obj; }, 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 a8648f7d5f..0d52808a1d 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/genesis.ts @@ -125,11 +125,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.port_id = message.portId; + obj.port_id = message.portId === "" ? undefined : message.portId; if (message.denomTraces) { obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e) : undefined); } else { - obj.denom_traces = []; + obj.denom_traces = message.denomTraces; } obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; 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 383824ce1f..9a66d4f0a4 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/query.ts @@ -172,7 +172,7 @@ export const QueryDenomTraceRequest = { }, toAmino(message: QueryDenomTraceRequest): QueryDenomTraceRequestAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === "" ? undefined : message.hash; return obj; }, fromAminoMsg(object: QueryDenomTraceRequestAminoMsg): QueryDenomTraceRequest { @@ -479,7 +479,7 @@ export const QueryDenomTracesResponse = { if (message.denomTraces) { obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e) : undefined); } else { - obj.denom_traces = []; + obj.denom_traces = message.denomTraces; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; 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 810ec4142f..b8c72af2b3 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/transfer.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/transfer.ts @@ -143,8 +143,8 @@ export const DenomTrace = { }, toAmino(message: DenomTrace): DenomTraceAmino { const obj: any = {}; - obj.path = message.path; - obj.base_denom = message.baseDenom; + obj.path = message.path === "" ? undefined : message.path; + obj.base_denom = message.baseDenom === "" ? undefined : message.baseDenom; return obj; }, fromAminoMsg(object: DenomTraceAminoMsg): DenomTrace { @@ -254,8 +254,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.send_enabled = message.sendEnabled; - obj.receive_enabled = message.receiveEnabled; + obj.send_enabled = message.sendEnabled === false ? undefined : message.sendEnabled; + obj.receive_enabled = message.receiveEnabled === false ? undefined : message.receiveEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { 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 a0a557a713..2d13b3ccf7 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/tx.ts @@ -221,13 +221,13 @@ export const MsgTransfer = { }, toAmino(message: MsgTransfer): MsgTransferAmino { const obj: any = {}; - obj.source_port = message.sourcePort; - obj.source_channel = message.sourceChannel; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; obj.token = message.token ? Coin.toAmino(message.token) : undefined; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromAminoMsg(object: MsgTransferAminoMsg): MsgTransfer { 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 1737cc85ab..5edc323bdf 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v2/packet.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v2/packet.ts @@ -148,10 +148,10 @@ export const FungibleTokenPacketData = { }, toAmino(message: FungibleTokenPacketData): FungibleTokenPacketDataAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: FungibleTokenPacketDataAminoMsg): FungibleTokenPacketData { 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 def912e0a3..eb1ac45eee 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/channel.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/channel.ts @@ -425,10 +425,10 @@ export const Channel = { fromAmino(object: ChannelAmino): Channel { const message = createBaseChannel(); if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -441,15 +441,15 @@ export const Channel = { }, toAmino(message: Channel): ChannelAmino { const obj: any = {}; - obj.state = message.state; - obj.ordering = message.ordering; + obj.state = message.state === 0 ? undefined : message.state; + obj.ordering = message.ordering === 0 ? undefined : 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.connection_hops = message.connectionHops; } - obj.version = message.version; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: ChannelAminoMsg): Channel { @@ -623,10 +623,10 @@ export const IdentifiedChannel = { fromAmino(object: IdentifiedChannelAmino): IdentifiedChannel { const message = createBaseIdentifiedChannel(); if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -645,17 +645,17 @@ export const IdentifiedChannel = { }, toAmino(message: IdentifiedChannel): IdentifiedChannelAmino { const obj: any = {}; - obj.state = message.state; - obj.ordering = message.ordering; + obj.state = message.state === 0 ? undefined : message.state; + obj.ordering = message.ordering === 0 ? undefined : 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.connection_hops = message.connectionHops; } - obj.version = message.version; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.version = message.version === "" ? undefined : message.version; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: IdentifiedChannelAminoMsg): IdentifiedChannel { @@ -765,8 +765,8 @@ export const Counterparty = { }, toAmino(message: Counterparty): CounterpartyAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: CounterpartyAminoMsg): Counterparty { @@ -972,14 +972,14 @@ export const Packet = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; + obj.destination_port = message.destinationPort === "" ? undefined : message.destinationPort; + obj.destination_channel = message.destinationChannel === "" ? undefined : message.destinationChannel; obj.data = message.data ? base64FromBytes(message.data) : undefined; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromAminoMsg(object: PacketAminoMsg): Packet { @@ -1121,9 +1121,9 @@ export const PacketState = { }, 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.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1235,7 +1235,7 @@ export const Acknowledgement = { toAmino(message: Acknowledgement): AcknowledgementAmino { const obj: any = {}; obj.result = message.result ? base64FromBytes(message.result) : undefined; - obj.error = message.error; + obj.error = message.error === null ? undefined : message.error; return obj; }, fromAminoMsg(object: AcknowledgementAminoMsg): Acknowledgement { 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 1268b713b8..38122814c8 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/genesis.ts @@ -277,39 +277,39 @@ export const GenesisState = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } if (message.acknowledgements) { obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.acknowledgements = []; + obj.acknowledgements = message.acknowledgements; } if (message.commitments) { obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.commitments = []; + obj.commitments = message.commitments; } if (message.receipts) { obj.receipts = message.receipts.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.receipts = []; + obj.receipts = message.receipts; } if (message.sendSequences) { obj.send_sequences = message.sendSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.send_sequences = []; + obj.send_sequences = message.sendSequences; } if (message.recvSequences) { obj.recv_sequences = message.recvSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.recv_sequences = []; + obj.recv_sequences = message.recvSequences; } if (message.ackSequences) { obj.ack_sequences = message.ackSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.ack_sequences = []; + obj.ack_sequences = message.ackSequences; } - obj.next_channel_sequence = message.nextChannelSequence ? message.nextChannelSequence.toString() : undefined; + obj.next_channel_sequence = message.nextChannelSequence !== BigInt(0) ? message.nextChannelSequence.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -435,9 +435,9 @@ export const PacketSequence = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: PacketSequenceAminoMsg): PacketSequence { 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 29eb38ee06..8b69156c77 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/query.ts @@ -713,8 +713,8 @@ export const QueryChannelRequest = { }, toAmino(message: QueryChannelRequest): QueryChannelRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryChannelRequestAminoMsg): QueryChannelRequest { @@ -1071,7 +1071,7 @@ export const QueryChannelsResponse = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -1184,7 +1184,7 @@ export const QueryConnectionChannelsRequest = { }, toAmino(message: QueryConnectionChannelsRequest): QueryConnectionChannelsRequestAmino { const obj: any = {}; - obj.connection = message.connection; + obj.connection = message.connection === "" ? undefined : message.connection; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1320,7 +1320,7 @@ export const QueryConnectionChannelsResponse = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -1433,8 +1433,8 @@ export const QueryChannelClientStateRequest = { }, toAmino(message: QueryChannelClientStateRequest): QueryChannelClientStateRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryChannelClientStateRequestAminoMsg): QueryChannelClientStateRequest { @@ -1704,10 +1704,10 @@ export const QueryChannelConsensusStateRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryChannelConsensusStateRequestAminoMsg): QueryChannelConsensusStateRequest { @@ -1850,7 +1850,7 @@ export const QueryChannelConsensusStateResponse = { toAmino(message: QueryChannelConsensusStateResponse): QueryChannelConsensusStateResponseAmino { const obj: any = {}; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; @@ -1978,9 +1978,9 @@ export const QueryPacketCommitmentRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketCommitmentRequestAminoMsg): QueryPacketCommitmentRequest { @@ -2234,8 +2234,8 @@ export const QueryPacketCommitmentsRequest = { }, toAmino(message: QueryPacketCommitmentsRequest): QueryPacketCommitmentsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2371,7 +2371,7 @@ export const QueryPacketCommitmentsResponse = { if (message.commitments) { obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.commitments = []; + obj.commitments = message.commitments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -2500,9 +2500,9 @@ export const QueryPacketReceiptRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketReceiptRequestAminoMsg): QueryPacketReceiptRequest { @@ -2628,7 +2628,7 @@ export const QueryPacketReceiptResponse = { }, toAmino(message: QueryPacketReceiptResponse): QueryPacketReceiptResponseAmino { const obj: any = {}; - obj.received = message.received; + obj.received = message.received === false ? undefined : message.received; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; @@ -2756,9 +2756,9 @@ export const QueryPacketAcknowledgementRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketAcknowledgementRequestAminoMsg): QueryPacketAcknowledgementRequest { @@ -3043,13 +3043,13 @@ export const QueryPacketAcknowledgementsRequest = { }, toAmino(message: QueryPacketAcknowledgementsRequest): QueryPacketAcknowledgementsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : 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 = []; + obj.packet_commitment_sequences = message.packetCommitmentSequences; } return obj; }, @@ -3185,7 +3185,7 @@ export const QueryPacketAcknowledgementsResponse = { if (message.acknowledgements) { obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.acknowledgements = []; + obj.acknowledgements = message.acknowledgements; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -3329,12 +3329,12 @@ export const QueryUnreceivedPacketsRequest = { }, toAmino(message: QueryUnreceivedPacketsRequest): QueryUnreceivedPacketsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; if (message.packetCommitmentSequences) { obj.packet_commitment_sequences = message.packetCommitmentSequences.map(e => e.toString()); } else { - obj.packet_commitment_sequences = []; + obj.packet_commitment_sequences = message.packetCommitmentSequences; } return obj; }, @@ -3463,7 +3463,7 @@ export const QueryUnreceivedPacketsResponse = { if (message.sequences) { obj.sequences = message.sequences.map(e => e.toString()); } else { - obj.sequences = []; + obj.sequences = message.sequences; } obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; @@ -3606,12 +3606,12 @@ export const QueryUnreceivedAcksRequest = { }, toAmino(message: QueryUnreceivedAcksRequest): QueryUnreceivedAcksRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; if (message.packetAckSequences) { obj.packet_ack_sequences = message.packetAckSequences.map(e => e.toString()); } else { - obj.packet_ack_sequences = []; + obj.packet_ack_sequences = message.packetAckSequences; } return obj; }, @@ -3740,7 +3740,7 @@ export const QueryUnreceivedAcksResponse = { if (message.sequences) { obj.sequences = message.sequences.map(e => e.toString()); } else { - obj.sequences = []; + obj.sequences = message.sequences; } obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; @@ -3852,8 +3852,8 @@ export const QueryNextSequenceReceiveRequest = { }, toAmino(message: QueryNextSequenceReceiveRequest): QueryNextSequenceReceiveRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryNextSequenceReceiveRequestAminoMsg): QueryNextSequenceReceiveRequest { @@ -3979,7 +3979,7 @@ export const QueryNextSequenceReceiveResponse = { }, toAmino(message: QueryNextSequenceReceiveResponse): QueryNextSequenceReceiveResponseAmino { const obj: any = {}; - obj.next_sequence_receive = message.nextSequenceReceive ? message.nextSequenceReceive.toString() : undefined; + obj.next_sequence_receive = message.nextSequenceReceive !== BigInt(0) ? message.nextSequenceReceive.toString() : undefined; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; 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 8c049fb2d5..f3ae6c81fd 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/tx.ts @@ -436,9 +436,9 @@ export const MsgChannelOpenInit = { }, toAmino(message: MsgChannelOpenInit): MsgChannelOpenInitAmino { const obj: any = {}; - obj.port_id = message.portId; + obj.port_id = message.portId === "" ? undefined : message.portId; obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenInitAminoMsg): MsgChannelOpenInit { @@ -701,13 +701,13 @@ export const MsgChannelOpenTry = { }, toAmino(message: MsgChannelOpenTry): MsgChannelOpenTryAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.previous_channel_id = message.previousChannelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.previous_channel_id = message.previousChannelId === "" ? undefined : message.previousChannelId; obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; - obj.counterparty_version = message.counterpartyVersion; + obj.counterparty_version = message.counterpartyVersion === "" ? undefined : message.counterpartyVersion; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenTryAminoMsg): MsgChannelOpenTry { @@ -970,13 +970,13 @@ export const MsgChannelOpenAck = { }, 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.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.counterparty_channel_id = message.counterpartyChannelId === "" ? undefined : message.counterpartyChannelId; + obj.counterparty_version = message.counterpartyVersion === "" ? undefined : message.counterpartyVersion; obj.proof_try = message.proofTry ? base64FromBytes(message.proofTry) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenAckAminoMsg): MsgChannelOpenAck { @@ -1207,11 +1207,11 @@ export const MsgChannelOpenConfirm = { }, toAmino(message: MsgChannelOpenConfirm): MsgChannelOpenConfirmAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.proof_ack = message.proofAck ? base64FromBytes(message.proofAck) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenConfirmAminoMsg): MsgChannelOpenConfirm { @@ -1410,9 +1410,9 @@ export const MsgChannelCloseInit = { }, toAmino(message: MsgChannelCloseInit): MsgChannelCloseInitAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; - obj.signer = message.signer; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelCloseInitAminoMsg): MsgChannelCloseInit { @@ -1643,11 +1643,11 @@ export const MsgChannelCloseConfirm = { }, toAmino(message: MsgChannelCloseConfirm): MsgChannelCloseConfirmAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelCloseConfirmAminoMsg): MsgChannelCloseConfirm { @@ -1865,7 +1865,7 @@ export const MsgRecvPacket = { obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; obj.proof_commitment = message.proofCommitment ? base64FromBytes(message.proofCommitment) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgRecvPacketAminoMsg): MsgRecvPacket { @@ -2099,8 +2099,8 @@ export const MsgTimeout = { obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; obj.proof_unreceived = message.proofUnreceived ? base64FromBytes(message.proofUnreceived) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; - obj.signer = message.signer; + obj.next_sequence_recv = message.nextSequenceRecv !== BigInt(0) ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgTimeoutAminoMsg): MsgTimeout { @@ -2351,8 +2351,8 @@ export const MsgTimeoutOnClose = { obj.proof_unreceived = message.proofUnreceived ? base64FromBytes(message.proofUnreceived) : undefined; obj.proof_close = message.proofClose ? base64FromBytes(message.proofClose) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; - obj.signer = message.signer; + obj.next_sequence_recv = message.nextSequenceRecv !== BigInt(0) ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgTimeoutOnCloseAminoMsg): MsgTimeoutOnClose { @@ -2587,7 +2587,7 @@ export const MsgAcknowledgement = { obj.acknowledgement = message.acknowledgement ? base64FromBytes(message.acknowledgement) : undefined; obj.proof_acked = message.proofAcked ? base64FromBytes(message.proofAcked) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgAcknowledgementAminoMsg): MsgAcknowledgement { 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 c16ff4fd1f..156bad00e1 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/client.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/client.ts @@ -272,7 +272,7 @@ export const IdentifiedClientState = { }, toAmino(message: IdentifiedClientState): IdentifiedClientStateAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; return obj; }, @@ -500,11 +500,11 @@ export const ClientConsensusStates = { }, toAmino(message: ClientConsensusStates): ClientConsensusStatesAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.consensusStates) { obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e) : undefined); } else { - obj.consensus_states = []; + obj.consensus_states = message.consensusStates; } return obj; }, @@ -647,10 +647,10 @@ export const ClientUpdateProposal = { }, 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; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.subject_client_id = message.subjectClientId === "" ? undefined : message.subjectClientId; + obj.substitute_client_id = message.substituteClientId === "" ? undefined : message.substituteClientId; return obj; }, fromAminoMsg(object: ClientUpdateProposalAminoMsg): ClientUpdateProposal { @@ -792,8 +792,8 @@ export const UpgradeProposal = { }, toAmino(message: UpgradeProposal): UpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; return obj; @@ -901,8 +901,8 @@ export const Height = { }, 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; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: HeightAminoMsg): Height { @@ -1005,7 +1005,7 @@ export const Params = { if (message.allowedClients) { obj.allowed_clients = message.allowedClients.map(e => e); } else { - obj.allowed_clients = []; + obj.allowed_clients = message.allowedClients; } return obj; }, 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 c8e5159a58..d22142a5a2 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/genesis.ts @@ -241,21 +241,21 @@ export const GenesisState = { if (message.clients) { obj.clients = message.clients.map(e => e ? IdentifiedClientState.toAmino(e) : undefined); } else { - obj.clients = []; + obj.clients = message.clients; } if (message.clientsConsensus) { obj.clients_consensus = message.clientsConsensus.map(e => e ? ClientConsensusStates.toAmino(e) : undefined); } else { - obj.clients_consensus = []; + obj.clients_consensus = message.clientsConsensus; } if (message.clientsMetadata) { obj.clients_metadata = message.clientsMetadata.map(e => e ? IdentifiedGenesisMetadata.toAmino(e) : undefined); } else { - obj.clients_metadata = []; + obj.clients_metadata = message.clientsMetadata; } obj.params = message.params ? Params.toAmino(message.params) : undefined; - obj.create_localhost = message.createLocalhost; - obj.next_client_sequence = message.nextClientSequence ? message.nextClientSequence.toString() : undefined; + obj.create_localhost = message.createLocalhost === false ? undefined : message.createLocalhost; + obj.next_client_sequence = message.nextClientSequence !== BigInt(0) ? message.nextClientSequence.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -482,11 +482,11 @@ export const IdentifiedGenesisMetadata = { }, toAmino(message: IdentifiedGenesisMetadata): IdentifiedGenesisMetadataAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.clientMetadata) { obj.client_metadata = message.clientMetadata.map(e => e ? GenesisMetadata.toAmino(e) : undefined); } else { - obj.client_metadata = []; + obj.client_metadata = message.clientMetadata; } return obj; }, 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 4bf14961a2..c7f77c84cc 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/query.ts @@ -398,7 +398,7 @@ export const QueryClientStateRequest = { }, toAmino(message: QueryClientStateRequest): QueryClientStateRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientStateRequestAminoMsg): QueryClientStateRequest { @@ -739,7 +739,7 @@ export const QueryClientStatesResponse = { if (message.clientStates) { obj.client_states = message.clientStates.map(e => e ? IdentifiedClientState.toAmino(e) : undefined); } else { - obj.client_states = []; + obj.client_states = message.clientStates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -883,10 +883,10 @@ export const QueryConsensusStateRequest = { }, 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; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; + obj.latest_height = message.latestHeight === false ? undefined : message.latestHeight; return obj; }, fromAminoMsg(object: QueryConsensusStateRequestAminoMsg): QueryConsensusStateRequest { @@ -1124,7 +1124,7 @@ export const QueryConsensusStatesRequest = { }, toAmino(message: QueryConsensusStatesRequest): QueryConsensusStatesRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1244,7 +1244,7 @@ export const QueryConsensusStatesResponse = { if (message.consensusStates) { obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e) : undefined); } else { - obj.consensus_states = []; + obj.consensus_states = message.consensusStates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1340,7 +1340,7 @@ export const QueryClientStatusRequest = { }, toAmino(message: QueryClientStatusRequest): QueryClientStatusRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientStatusRequestAminoMsg): QueryClientStatusRequest { @@ -1434,7 +1434,7 @@ export const QueryClientStatusResponse = { }, toAmino(message: QueryClientStatusResponse): QueryClientStatusResponseAmino { const obj: any = {}; - obj.status = message.status; + obj.status = message.status === "" ? undefined : message.status; return obj; }, fromAminoMsg(object: QueryClientStatusResponseAminoMsg): QueryClientStatusResponse { 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 a8e1070cd2..d0c0c67c1b 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/tx.ts @@ -252,7 +252,7 @@ export const MsgCreateClient = { 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; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgCreateClientAminoMsg): MsgCreateClient { @@ -451,9 +451,9 @@ export const MsgUpdateClient = { }, toAmino(message: MsgUpdateClient): MsgUpdateClientAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.header = message.header ? Any.toAmino(message.header) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgUpdateClientAminoMsg): MsgUpdateClient { @@ -700,12 +700,12 @@ export const MsgUpgradeClient = { }, toAmino(message: MsgUpgradeClient): MsgUpgradeClientAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : 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 ? base64FromBytes(message.proofUpgradeClient) : undefined; obj.proof_upgrade_consensus_state = message.proofUpgradeConsensusState ? base64FromBytes(message.proofUpgradeConsensusState) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgUpgradeClientAminoMsg): MsgUpgradeClient { @@ -904,9 +904,9 @@ export const MsgSubmitMisbehaviour = { }, toAmino(message: MsgSubmitMisbehaviour): MsgSubmitMisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.misbehaviour = message.misbehaviour ? Any.toAmino(message.misbehaviour) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgSubmitMisbehaviourAminoMsg): MsgSubmitMisbehaviour { 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 b5dbf998d5..dcb3d37f40 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/commitment/v1/commitment.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/commitment/v1/commitment.ts @@ -350,7 +350,7 @@ export const MerklePath = { if (message.keyPath) { obj.key_path = message.keyPath.map(e => e); } else { - obj.key_path = []; + obj.key_path = message.keyPath; } return obj; }, @@ -454,7 +454,7 @@ export const MerkleProof = { if (message.proofs) { obj.proofs = message.proofs.map(e => e ? CommitmentProof.toAmino(e) : undefined); } else { - obj.proofs = []; + obj.proofs = message.proofs; } return obj; }, 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 4a36ec920a..431d96329e 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/connection.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/connection.ts @@ -355,7 +355,7 @@ export const ConnectionEnd = { } message.versions = object.versions?.map(e => Version.fromAmino(e)) || []; if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -367,15 +367,15 @@ export const ConnectionEnd = { }, toAmino(message: ConnectionEnd): ConnectionEndAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.versions) { obj.versions = message.versions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.versions = []; + obj.versions = message.versions; } - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; return obj; }, fromAminoMsg(object: ConnectionEndAminoMsg): ConnectionEnd { @@ -543,7 +543,7 @@ export const IdentifiedConnection = { } message.versions = object.versions?.map(e => Version.fromAmino(e)) || []; if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -555,16 +555,16 @@ export const IdentifiedConnection = { }, toAmino(message: IdentifiedConnection): IdentifiedConnectionAmino { const obj: any = {}; - obj.id = message.id; - obj.client_id = message.clientId; + obj.id = message.id === "" ? undefined : message.id; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.versions) { obj.versions = message.versions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.versions = []; + obj.versions = message.versions; } - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; return obj; }, fromAminoMsg(object: IdentifiedConnectionAminoMsg): IdentifiedConnection { @@ -690,8 +690,8 @@ export const Counterparty = { }, toAmino(message: Counterparty): CounterpartyAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.connection_id = message.connectionId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.prefix = message.prefix ? MerklePrefix.toAmino(message.prefix) : undefined; return obj; }, @@ -795,7 +795,7 @@ export const ClientPaths = { if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, @@ -912,11 +912,11 @@ export const ConnectionPaths = { }, toAmino(message: ConnectionPaths): ConnectionPathsAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, @@ -1033,11 +1033,11 @@ export const Version = { }, toAmino(message: Version): VersionAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; if (message.features) { obj.features = message.features.map(e => e); } else { - obj.features = []; + obj.features = message.features; } return obj; }, @@ -1132,7 +1132,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.max_expected_time_per_block = message.maxExpectedTimePerBlock ? message.maxExpectedTimePerBlock.toString() : undefined; + obj.max_expected_time_per_block = message.maxExpectedTimePerBlock !== BigInt(0) ? message.maxExpectedTimePerBlock.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { 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 d8f9d4fc85..ee20700a6d 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/genesis.ts @@ -153,14 +153,14 @@ export const GenesisState = { if (message.connections) { obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e) : undefined); } else { - obj.connections = []; + obj.connections = message.connections; } if (message.clientConnectionPaths) { obj.client_connection_paths = message.clientConnectionPaths.map(e => e ? ConnectionPaths.toAmino(e) : undefined); } else { - obj.client_connection_paths = []; + obj.client_connection_paths = message.clientConnectionPaths; } - obj.next_connection_sequence = message.nextConnectionSequence ? message.nextConnectionSequence.toString() : undefined; + obj.next_connection_sequence = message.nextConnectionSequence !== BigInt(0) ? message.nextConnectionSequence.toString() : undefined; obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; }, 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 24551eefb0..4d68e1bffb 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/query.ts @@ -302,7 +302,7 @@ export const QueryConnectionRequest = { }, toAmino(message: QueryConnectionRequest): QueryConnectionRequestAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromAminoMsg(object: QueryConnectionRequestAminoMsg): QueryConnectionRequest { @@ -659,7 +659,7 @@ export const QueryConnectionsResponse = { if (message.connections) { obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e) : undefined); } else { - obj.connections = []; + obj.connections = message.connections; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -756,7 +756,7 @@ export const QueryClientConnectionsRequest = { }, toAmino(message: QueryClientConnectionsRequest): QueryClientConnectionsRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientConnectionsRequestAminoMsg): QueryClientConnectionsRequest { @@ -891,7 +891,7 @@ export const QueryClientConnectionsResponse = { if (message.connectionPaths) { obj.connection_paths = message.connectionPaths.map(e => e); } else { - obj.connection_paths = []; + obj.connection_paths = message.connectionPaths; } obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; @@ -988,7 +988,7 @@ export const QueryConnectionClientStateRequest = { }, toAmino(message: QueryConnectionClientStateRequest): QueryConnectionClientStateRequestAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromAminoMsg(object: QueryConnectionClientStateRequestAminoMsg): QueryConnectionClientStateRequest { @@ -1242,9 +1242,9 @@ export const QueryConnectionConsensusStateRequest = { }, 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; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryConnectionConsensusStateRequestAminoMsg): QueryConnectionConsensusStateRequest { @@ -1387,7 +1387,7 @@ export const QueryConnectionConsensusStateResponse = { toAmino(message: QueryConnectionConsensusStateResponse): QueryConnectionConsensusStateResponseAmino { const obj: any = {}; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; 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 3d29493cd2..e591d22038 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/tx.ts @@ -324,11 +324,11 @@ export const MsgConnectionOpenInit = { }, toAmino(message: MsgConnectionOpenInit): MsgConnectionOpenInitAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : 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; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenInitAminoMsg): MsgConnectionOpenInit { @@ -677,22 +677,22 @@ export const MsgConnectionOpenTry = { }, toAmino(message: MsgConnectionOpenTry): MsgConnectionOpenTryAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.previous_connection_id = message.previousConnectionId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.previous_connection_id = message.previousConnectionId === "" ? undefined : 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; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; if (message.counterpartyVersions) { obj.counterparty_versions = message.counterpartyVersions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.counterparty_versions = []; + obj.counterparty_versions = message.counterpartyVersions; } obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_client = message.proofClient ? base64FromBytes(message.proofClient) : undefined; obj.proof_consensus = message.proofConsensus ? base64FromBytes(message.proofConsensus) : undefined; obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenTryAminoMsg): MsgConnectionOpenTry { @@ -1003,8 +1003,8 @@ export const MsgConnectionOpenAck = { }, toAmino(message: MsgConnectionOpenAck): MsgConnectionOpenAckAmino { const obj: any = {}; - obj.connection_id = message.connectionId; - obj.counterparty_connection_id = message.counterpartyConnectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.counterparty_connection_id = message.counterpartyConnectionId === "" ? undefined : 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) : {}; @@ -1012,7 +1012,7 @@ export const MsgConnectionOpenAck = { obj.proof_client = message.proofClient ? base64FromBytes(message.proofClient) : undefined; obj.proof_consensus = message.proofConsensus ? base64FromBytes(message.proofConsensus) : undefined; obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenAckAminoMsg): MsgConnectionOpenAck { @@ -1227,10 +1227,10 @@ export const MsgConnectionOpenConfirm = { }, toAmino(message: MsgConnectionOpenConfirm): MsgConnectionOpenConfirmAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.proof_ack = message.proofAck ? base64FromBytes(message.proofAck) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenConfirmAminoMsg): MsgConnectionOpenConfirm { 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 3307ffa0c3..15c9cc17af 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/port/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/port/v1/query.ts @@ -164,7 +164,7 @@ export const QueryAppVersionRequest = { message.connectionId = object.connection_id; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -176,11 +176,11 @@ export const QueryAppVersionRequest = { }, toAmino(message: QueryAppVersionRequest): QueryAppVersionRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.connection_id = message.connectionId; - obj.ordering = message.ordering; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.ordering = message.ordering === 0 ? undefined : message.ordering; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.proposed_version = message.proposedVersion; + obj.proposed_version = message.proposedVersion === "" ? undefined : message.proposedVersion; return obj; }, fromAminoMsg(object: QueryAppVersionRequestAminoMsg): QueryAppVersionRequest { @@ -290,8 +290,8 @@ export const QueryAppVersionResponse = { }, toAmino(message: QueryAppVersionResponse): QueryAppVersionResponseAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.version = message.version; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: QueryAppVersionResponseAminoMsg): QueryAppVersionResponse { 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 992196799a..df2e455eba 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/lightclients/localhost/v1/localhost.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/lightclients/localhost/v1/localhost.ts @@ -109,7 +109,7 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; }, 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 6c7e1d7634..a89558ef7b 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v1/solomachine.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v1/solomachine.ts @@ -553,10 +553,10 @@ export const ClientState = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.frozen_sequence = message.frozenSequence !== BigInt(0) ? message.frozenSequence.toString() : undefined; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; - obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal === false ? undefined : message.allowUpdateAfterProposal; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -683,8 +683,8 @@ export const ConsensusState = { 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; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { @@ -842,11 +842,11 @@ export const Header = { }, toAmino(message: Header): HeaderAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderAminoMsg): Header { @@ -988,8 +988,8 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.sequence = message.sequence !== BigInt(0) ? 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; @@ -1121,7 +1121,7 @@ export const SignatureAndData = { message.signature = bytesFromBase64(object.signature); } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1134,9 +1134,9 @@ export const SignatureAndData = { toAmino(message: SignatureAndData): SignatureAndDataAmino { const obj: any = {}; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; - obj.data_type = message.dataType; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { @@ -1247,7 +1247,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { @@ -1396,7 +1396,7 @@ export const SignBytes = { message.diversifier = object.diversifier; } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1405,10 +1405,10 @@ export const SignBytes = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1520,7 +1520,7 @@ export const HeaderData = { toAmino(message: HeaderData): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { @@ -2391,7 +2391,7 @@ export const NextSequenceRecvData = { toAmino(message: NextSequenceRecvData): NextSequenceRecvDataAmino { const obj: any = {}; obj.path = message.path ? base64FromBytes(message.path) : undefined; - obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + obj.next_seq_recv = message.nextSeqRecv !== BigInt(0) ? message.nextSeqRecv.toString() : undefined; return obj; }, fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData { 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 f46cfe49e0..dcbafb6c77 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v2/solomachine.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v2/solomachine.ts @@ -553,10 +553,10 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.is_frozen = message.isFrozen; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.is_frozen = message.isFrozen === false ? undefined : message.isFrozen; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; - obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal === false ? undefined : message.allowUpdateAfterProposal; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -683,8 +683,8 @@ export const ConsensusState = { 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; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { @@ -842,11 +842,11 @@ export const Header = { }, toAmino(message: Header): HeaderAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderAminoMsg): Header { @@ -988,8 +988,8 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.sequence = message.sequence !== BigInt(0) ? 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; @@ -1121,7 +1121,7 @@ export const SignatureAndData = { message.signature = bytesFromBase64(object.signature); } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1134,9 +1134,9 @@ export const SignatureAndData = { toAmino(message: SignatureAndData): SignatureAndDataAmino { const obj: any = {}; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; - obj.data_type = message.dataType; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { @@ -1247,7 +1247,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { @@ -1396,7 +1396,7 @@ export const SignBytes = { message.diversifier = object.diversifier; } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1405,10 +1405,10 @@ export const SignBytes = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1520,7 +1520,7 @@ export const HeaderData = { toAmino(message: HeaderData): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { @@ -2391,7 +2391,7 @@ export const NextSequenceRecvData = { toAmino(message: NextSequenceRecvData): NextSequenceRecvDataAmino { const obj: any = {}; obj.path = message.path ? base64FromBytes(message.path) : undefined; - obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + obj.next_seq_recv = message.nextSeqRecv !== BigInt(0) ? message.nextSeqRecv.toString() : undefined; return obj; }, fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData { 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 4d1c8113b3..6655597b1b 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v3/solomachine.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v3/solomachine.ts @@ -282,8 +282,8 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.is_frozen = message.isFrozen; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.is_frozen = message.isFrozen === false ? undefined : message.isFrozen; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; return obj; }, @@ -411,8 +411,8 @@ export const ConsensusState = { 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; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { @@ -554,10 +554,10 @@ export const Header = { }, toAmino(message: Header): HeaderAmino { const obj: any = {}; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderAminoMsg): Header { @@ -683,7 +683,7 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? 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; @@ -830,7 +830,7 @@ export const SignatureAndData = { obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.path = message.path ? base64FromBytes(message.path) : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { @@ -941,7 +941,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { @@ -1099,9 +1099,9 @@ export const SignBytes = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; obj.path = message.path ? base64FromBytes(message.path) : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; @@ -1214,7 +1214,7 @@ export const HeaderData = { toAmino(message: HeaderData): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { 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 800b54f3fc..126c61fda1 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/lightclients/tendermint/v1/tendermint.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/lightclients/tendermint/v1/tendermint.ts @@ -420,7 +420,7 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : 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; @@ -430,15 +430,15 @@ export const ClientState = { if (message.proofSpecs) { obj.proof_specs = message.proofSpecs.map(e => e ? ProofSpec.toAmino(e) : undefined); } else { - obj.proof_specs = []; + obj.proof_specs = message.proofSpecs; } if (message.upgradePath) { obj.upgrade_path = message.upgradePath.map(e => e); } else { - obj.upgrade_path = []; + obj.upgrade_path = message.upgradePath; } - obj.allow_update_after_expiry = message.allowUpdateAfterExpiry; - obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour; + obj.allow_update_after_expiry = message.allowUpdateAfterExpiry === false ? undefined : message.allowUpdateAfterExpiry; + obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour === false ? undefined : message.allowUpdateAfterMisbehaviour; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -692,7 +692,7 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.header_1 = message.header1 ? Header.toAmino(message.header1) : undefined; obj.header_2 = message.header2 ? Header.toAmino(message.header2) : undefined; return obj; @@ -949,8 +949,8 @@ export const Fraction = { }, toAmino(message: Fraction): FractionAmino { const obj: any = {}; - obj.numerator = message.numerator ? message.numerator.toString() : undefined; - obj.denominator = message.denominator ? message.denominator.toString() : undefined; + obj.numerator = message.numerator !== BigInt(0) ? message.numerator.toString() : undefined; + obj.denominator = message.denominator !== BigInt(0) ? message.denominator.toString() : undefined; return obj; }, fromAminoMsg(object: FractionAminoMsg): Fraction { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/accum/v1beta1/accum.ts b/__fixtures__/v-next/outputosmojs/osmosis/accum/v1beta1/accum.ts index 1cb7c1f807..e80a7e2fc9 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/accum/v1beta1/accum.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/accum/v1beta1/accum.ts @@ -131,9 +131,9 @@ export const AccumulatorContent = { if (message.accumValue) { obj.accum_value = message.accumValue.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.accum_value = []; + obj.accum_value = message.accumValue; } - obj.total_shares = message.totalShares; + obj.total_shares = message.totalShares === "" ? undefined : message.totalShares; return obj; }, fromAminoMsg(object: AccumulatorContentAminoMsg): AccumulatorContent { @@ -360,16 +360,16 @@ export const Record = { }, toAmino(message: Record): RecordAmino { const obj: any = {}; - obj.num_shares = message.numShares; + obj.num_shares = message.numShares === "" ? undefined : message.numShares; if (message.initAccumValue) { obj.init_accum_value = message.initAccumValue.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.init_accum_value = []; + obj.init_accum_value = message.initAccumValue; } if (message.unclaimedRewards) { obj.unclaimed_rewards = message.unclaimedRewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.unclaimed_rewards = []; + obj.unclaimed_rewards = message.unclaimedRewards; } obj.options = message.options ? Options.toAmino(message.options) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/claim.ts b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/claim.ts index 3e4961398f..952b6e0de0 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/claim.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/claim.ts @@ -189,16 +189,16 @@ export const ClaimRecord = { }, toAmino(message: ClaimRecord): ClaimRecordAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.initialClaimableAmount) { obj.initial_claimable_amount = message.initialClaimableAmount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_claimable_amount = []; + obj.initial_claimable_amount = message.initialClaimableAmount; } if (message.actionCompleted) { obj.action_completed = message.actionCompleted.map(e => e); } else { - obj.action_completed = []; + obj.action_completed = message.actionCompleted; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/genesis.ts index 8edd18bc55..a052f4eef6 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/genesis.ts @@ -135,7 +135,7 @@ export const GenesisState = { if (message.claimRecords) { obj.claim_records = message.claimRecords.map(e => e ? ClaimRecord.toAmino(e) : undefined); } else { - obj.claim_records = []; + obj.claim_records = message.claimRecords; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/params.ts index 5c1b0f5437..496eaecee8 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/params.ts @@ -142,7 +142,7 @@ export const Params = { obj.airdrop_start_time = message.airdropStartTime ? Timestamp.toAmino(toTimestamp(message.airdropStartTime)) : undefined; 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; + obj.claim_denom = message.claimDenom === "" ? undefined : message.claimDenom; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/query.ts index 670d57c1ad..c6a484e2b8 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/query.ts @@ -259,7 +259,7 @@ export const QueryModuleAccountBalanceResponse = { if (message.moduleAccountBalance) { obj.moduleAccountBalance = message.moduleAccountBalance.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.moduleAccountBalance = []; + obj.moduleAccountBalance = message.moduleAccountBalance; } return obj; }, @@ -521,7 +521,7 @@ export const QueryClaimRecordRequest = { }, toAmino(message: QueryClaimRecordRequest): QueryClaimRecordRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryClaimRecordRequestAminoMsg): QueryClaimRecordRequest { @@ -719,14 +719,14 @@ export const QueryClaimableForActionRequest = { message.address = object.address; } if (object.action !== undefined && object.action !== null) { - message.action = actionFromJSON(object.action); + message.action = object.action; } return message; }, toAmino(message: QueryClaimableForActionRequest): QueryClaimableForActionRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.action = message.action; + obj.address = message.address === "" ? undefined : message.address; + obj.action = message.action === 0 ? undefined : message.action; return obj; }, fromAminoMsg(object: QueryClaimableForActionRequestAminoMsg): QueryClaimableForActionRequest { @@ -829,7 +829,7 @@ export const QueryClaimableForActionResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -924,7 +924,7 @@ export const QueryTotalClaimableRequest = { }, toAmino(message: QueryTotalClaimableRequest): QueryTotalClaimableRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryTotalClaimableRequestAminoMsg): QueryTotalClaimableRequest { @@ -1027,7 +1027,7 @@ export const QueryTotalClaimableResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/genesis.ts index 22f8a314ea..04a0e7e74c 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/genesis.ts @@ -195,8 +195,8 @@ export const FullTick = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.tick_index = message.tickIndex !== BigInt(0) ? message.tickIndex.toString() : undefined; obj.info = message.info ? TickInfo.toAmino(message.info) : undefined; return obj; }, @@ -377,18 +377,18 @@ export const PoolData = { if (message.ticks) { obj.ticks = message.ticks.map(e => e ? FullTick.toAmino(e) : undefined); } else { - obj.ticks = []; + obj.ticks = message.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 = []; + obj.incentives_accumulators = message.incentivesAccumulators; } if (message.incentiveRecords) { obj.incentive_records = message.incentiveRecords.map(e => e ? IncentiveRecord.toAmino(e) : undefined); } else { - obj.incentive_records = []; + obj.incentive_records = message.incentiveRecords; } return obj; }, @@ -547,14 +547,14 @@ export const GenesisState = { if (message.poolData) { obj.pool_data = message.poolData.map(e => e ? PoolData.toAmino(e) : undefined); } else { - obj.pool_data = []; + obj.pool_data = message.poolData; } if (message.positions) { obj.positions = message.positions.map(e => e ? Position.toAmino(e) : undefined); } else { - obj.positions = []; + obj.positions = message.positions; } - obj.next_position_id = message.nextPositionId ? message.nextPositionId.toString() : undefined; + obj.next_position_id = message.nextPositionId !== BigInt(0) ? message.nextPositionId.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -664,7 +664,7 @@ export const AccumObject = { }, toAmino(message: AccumObject): AccumObjectAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.accum_content = message.accumContent ? AccumulatorContent.toAmino(message.accumContent) : undefined; return obj; }, 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 b834432bfa..a1e1a33d3c 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/incentive_record.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/incentive_record.ts @@ -207,9 +207,9 @@ export const IncentiveRecord = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.incentive_denom = message.incentiveDenom === "" ? undefined : message.incentiveDenom; + obj.incentive_creator_addr = message.incentiveCreatorAddr === "" ? undefined : 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; @@ -337,8 +337,8 @@ export const IncentiveRecordBody = { }, toAmino(message: IncentiveRecordBody): IncentiveRecordBodyAmino { const obj: any = {}; - obj.remaining_amount = message.remainingAmount; - obj.emission_rate = message.emissionRate; + obj.remaining_amount = message.remainingAmount === "" ? undefined : message.remainingAmount; + obj.emission_rate = message.emissionRate === "" ? undefined : message.emissionRate; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/params.ts index 917cc3c33d..2c08b3f9ef 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/params.ts @@ -129,12 +129,12 @@ export const Params = { if (message.authorizedTickSpacing) { obj.authorized_tick_spacing = message.authorizedTickSpacing.map(e => e.toString()); } else { - obj.authorized_tick_spacing = []; + obj.authorized_tick_spacing = message.authorizedTickSpacing; } if (message.authorizedSwapFees) { obj.authorized_swap_fees = message.authorizedSwapFees.map(e => e); } else { - obj.authorized_swap_fees = []; + obj.authorized_swap_fees = message.authorizedSwapFees; } return obj; }, 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 a24817aebe..f7f9dc3e38 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 @@ -284,8 +284,8 @@ export const QueryUserPositionsRequest = { }, toAmino(message: QueryUserPositionsRequest): QueryUserPositionsRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryUserPositionsRequestAminoMsg): QueryUserPositionsRequest { @@ -388,7 +388,7 @@ export const QueryUserPositionsResponse = { if (message.positions) { obj.positions = message.positions.map(e => e ? PositionWithUnderlyingAssetBreakdown.toAmino(e) : undefined); } else { - obj.positions = []; + obj.positions = message.positions; } return obj; }, @@ -483,7 +483,7 @@ export const QueryPositionByIdRequest = { }, toAmino(message: QueryPositionByIdRequest): QueryPositionByIdRequestAmino { const obj: any = {}; - obj.position_id = message.positionId ? message.positionId.toString() : undefined; + obj.position_id = message.positionId !== BigInt(0) ? message.positionId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPositionByIdRequestAminoMsg): QueryPositionByIdRequest { @@ -790,7 +790,7 @@ export const QueryPoolsResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1069,8 +1069,8 @@ export const TickLiquidityNet = { }, toAmino(message: TickLiquidityNet): TickLiquidityNetAmino { const obj: any = {}; - obj.liquidity_net = message.liquidityNet; - obj.tick_index = message.tickIndex; + obj.liquidity_net = message.liquidityNet === "" ? undefined : message.liquidityNet; + obj.tick_index = message.tickIndex === "" ? undefined : message.tickIndex; return obj; }, fromAminoMsg(object: TickLiquidityNetAminoMsg): TickLiquidityNet { @@ -1196,9 +1196,9 @@ export const LiquidityDepthWithRange = { }, toAmino(message: LiquidityDepthWithRange): LiquidityDepthWithRangeAmino { const obj: any = {}; - obj.liquidity_amount = message.liquidityAmount; - obj.lower_tick = message.lowerTick; - obj.upper_tick = message.upperTick; + obj.liquidity_amount = message.liquidityAmount === "" ? undefined : message.liquidityAmount; + obj.lower_tick = message.lowerTick === "" ? undefined : message.lowerTick; + obj.upper_tick = message.upperTick === "" ? undefined : message.upperTick; return obj; }, fromAminoMsg(object: LiquidityDepthWithRangeAminoMsg): LiquidityDepthWithRange { @@ -1340,10 +1340,10 @@ export const QueryLiquidityNetInDirectionRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn === "" ? undefined : message.tokenIn; + obj.start_tick = message.startTick === null ? undefined : message.startTick; + obj.bound_tick = message.boundTick === null ? undefined : message.boundTick; return obj; }, fromAminoMsg(object: QueryLiquidityNetInDirectionRequestAminoMsg): QueryLiquidityNetInDirectionRequest { @@ -1478,10 +1478,10 @@ export const QueryLiquidityNetInDirectionResponse = { if (message.liquidityDepths) { obj.liquidity_depths = message.liquidityDepths.map(e => e ? TickLiquidityNet.toAmino(e) : undefined); } else { - obj.liquidity_depths = []; + obj.liquidity_depths = message.liquidityDepths; } - obj.current_tick = message.currentTick ? message.currentTick.toString() : undefined; - obj.current_liquidity = message.currentLiquidity; + obj.current_tick = message.currentTick !== BigInt(0) ? message.currentTick.toString() : undefined; + obj.current_liquidity = message.currentLiquidity === "" ? undefined : message.currentLiquidity; return obj; }, fromAminoMsg(object: QueryLiquidityNetInDirectionResponseAminoMsg): QueryLiquidityNetInDirectionResponse { @@ -1575,7 +1575,7 @@ export const QueryTotalLiquidityForRangeRequest = { }, toAmino(message: QueryTotalLiquidityForRangeRequest): QueryTotalLiquidityForRangeRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTotalLiquidityForRangeRequestAminoMsg): QueryTotalLiquidityForRangeRequest { @@ -1678,7 +1678,7 @@ export const QueryTotalLiquidityForRangeResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? LiquidityDepthWithRange.toAmino(e) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, @@ -1773,7 +1773,7 @@ export const QueryClaimableFeesRequest = { }, toAmino(message: QueryClaimableFeesRequest): QueryClaimableFeesRequestAmino { const obj: any = {}; - obj.position_id = message.positionId ? message.positionId.toString() : undefined; + obj.position_id = message.positionId !== BigInt(0) ? message.positionId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryClaimableFeesRequestAminoMsg): QueryClaimableFeesRequest { @@ -1876,7 +1876,7 @@ export const QueryClaimableFeesResponse = { if (message.claimableFees) { obj.claimable_fees = message.claimableFees.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.claimable_fees = []; + obj.claimable_fees = message.claimableFees; } return obj; }, 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 488d99fbd2..031c606271 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 @@ -185,12 +185,12 @@ export const MsgCreateConcentratedPool = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.denom0 = message.denom0 === "" ? undefined : message.denom0; + obj.denom1 = message.denom1 === "" ? undefined : message.denom1; + obj.tick_spacing = message.tickSpacing !== BigInt(0) ? message.tickSpacing.toString() : undefined; + obj.exponent_at_price_one = message.exponentAtPriceOne === "" ? undefined : message.exponentAtPriceOne; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; return obj; }, fromAminoMsg(object: MsgCreateConcentratedPoolAminoMsg): MsgCreateConcentratedPool { @@ -284,7 +284,7 @@ export const MsgCreateConcentratedPoolResponse = { }, toAmino(message: MsgCreateConcentratedPoolResponse): MsgCreateConcentratedPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateConcentratedPoolResponseAminoMsg): MsgCreateConcentratedPoolResponse { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool.ts index 118ad3bb25..47d52209a3 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool.ts @@ -292,17 +292,17 @@ export const Pool = { }, 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.address = message.address === "" ? undefined : message.address; + obj.incentives_address = message.incentivesAddress === "" ? undefined : message.incentivesAddress; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.current_tick_liquidity = message.currentTickLiquidity === "" ? undefined : message.currentTickLiquidity; + obj.token0 = message.token0 === "" ? undefined : message.token0; + obj.token1 = message.token1 === "" ? undefined : message.token1; + obj.current_sqrt_price = message.currentSqrtPrice === "" ? undefined : message.currentSqrtPrice; + obj.current_tick = message.currentTick === "" ? undefined : message.currentTick; + obj.tick_spacing = message.tickSpacing !== BigInt(0) ? message.tickSpacing.toString() : undefined; + obj.exponent_at_price_one = message.exponentAtPriceOne === "" ? undefined : message.exponentAtPriceOne; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; obj.last_liquidity_update = message.lastLiquidityUpdate ? Timestamp.toAmino(toTimestamp(message.lastLiquidityUpdate)) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/position.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/position.ts index 57dac2422e..5d32d51c16 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/position.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/position.ts @@ -213,13 +213,13 @@ export const Position = { }, 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.position_id = message.positionId !== BigInt(0) ? message.positionId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.lower_tick = message.lowerTick !== BigInt(0) ? message.lowerTick.toString() : undefined; + obj.upper_tick = message.upperTick !== BigInt(0) ? message.upperTick.toString() : undefined; obj.join_time = message.joinTime ? Timestamp.toAmino(toTimestamp(message.joinTime)) : undefined; - obj.liquidity = message.liquidity; + obj.liquidity = message.liquidity === "" ? undefined : message.liquidity; return obj; }, fromAminoMsg(object: PositionAminoMsg): Position { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tickInfo.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tickInfo.ts index 6283a1814c..4e996e98a6 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tickInfo.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tickInfo.ts @@ -158,17 +158,17 @@ export const TickInfo = { }, toAmino(message: TickInfo): TickInfoAmino { const obj: any = {}; - obj.liquidity_gross = message.liquidityGross; - obj.liquidity_net = message.liquidityNet; + obj.liquidity_gross = message.liquidityGross === "" ? undefined : message.liquidityGross; + obj.liquidity_net = message.liquidityNet === "" ? undefined : message.liquidityNet; if (message.feeGrowthOutside) { obj.fee_growth_outside = message.feeGrowthOutside.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.fee_growth_outside = []; + obj.fee_growth_outside = message.feeGrowthOutside; } if (message.uptimeTrackers) { obj.uptime_trackers = message.uptimeTrackers.map(e => e ? UptimeTracker.toAmino(e) : undefined); } else { - obj.uptime_trackers = []; + obj.uptime_trackers = message.uptimeTrackers; } return obj; }, @@ -272,7 +272,7 @@ export const UptimeTracker = { if (message.uptimeGrowthOutside) { obj.uptime_growth_outside = message.uptimeGrowthOutside.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.uptime_growth_outside = []; + obj.uptime_growth_outside = message.uptimeGrowthOutside; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tx.ts index 3e431df2d5..4653ddcd7a 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tx.ts @@ -372,14 +372,14 @@ export const MsgCreatePosition = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lower_tick = message.lowerTick !== BigInt(0) ? message.lowerTick.toString() : undefined; + obj.upper_tick = message.upperTick !== BigInt(0) ? 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; + obj.token_min_amount0 = message.tokenMinAmount0 === "" ? undefined : message.tokenMinAmount0; + obj.token_min_amount1 = message.tokenMinAmount1 === "" ? undefined : message.tokenMinAmount1; return obj; }, fromAminoMsg(object: MsgCreatePositionAminoMsg): MsgCreatePosition { @@ -537,11 +537,11 @@ export const MsgCreatePositionResponse = { }, 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.position_id = message.positionId !== BigInt(0) ? message.positionId.toString() : undefined; + obj.amount0 = message.amount0 === "" ? undefined : message.amount0; + obj.amount1 = message.amount1 === "" ? undefined : message.amount1; obj.join_time = message.joinTime ? Timestamp.toAmino(toTimestamp(message.joinTime)) : undefined; - obj.liquidity_created = message.liquidityCreated; + obj.liquidity_created = message.liquidityCreated === "" ? undefined : message.liquidityCreated; return obj; }, fromAminoMsg(object: MsgCreatePositionResponseAminoMsg): MsgCreatePositionResponse { @@ -667,9 +667,9 @@ export const MsgWithdrawPosition = { }, 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; + obj.position_id = message.positionId !== BigInt(0) ? message.positionId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.liquidity_amount = message.liquidityAmount === "" ? undefined : message.liquidityAmount; return obj; }, fromAminoMsg(object: MsgWithdrawPositionAminoMsg): MsgWithdrawPosition { @@ -779,8 +779,8 @@ export const MsgWithdrawPositionResponse = { }, toAmino(message: MsgWithdrawPositionResponse): MsgWithdrawPositionResponseAmino { const obj: any = {}; - obj.amount0 = message.amount0; - obj.amount1 = message.amount1; + obj.amount0 = message.amount0 === "" ? undefined : message.amount0; + obj.amount1 = message.amount1 === "" ? undefined : message.amount1; return obj; }, fromAminoMsg(object: MsgWithdrawPositionResponseAminoMsg): MsgWithdrawPositionResponse { @@ -908,9 +908,9 @@ export const MsgCollectFees = { if (message.positionIds) { obj.position_ids = message.positionIds.map(e => e.toString()); } else { - obj.position_ids = []; + obj.position_ids = message.positionIds; } - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgCollectFeesAminoMsg): MsgCollectFees { @@ -1013,7 +1013,7 @@ export const MsgCollectFeesResponse = { if (message.collectedFees) { obj.collected_fees = message.collectedFees.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.collected_fees = []; + obj.collected_fees = message.collectedFees; } return obj; }, @@ -1142,9 +1142,9 @@ export const MsgCollectIncentives = { if (message.positionIds) { obj.position_ids = message.positionIds.map(e => e.toString()); } else { - obj.position_ids = []; + obj.position_ids = message.positionIds; } - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgCollectIncentivesAminoMsg): MsgCollectIncentives { @@ -1247,7 +1247,7 @@ export const MsgCollectIncentivesResponse = { if (message.collectedIncentives) { obj.collected_incentives = message.collectedIncentives.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.collected_incentives = []; + obj.collected_incentives = message.collectedIncentives; } return obj; }, @@ -1438,11 +1438,11 @@ export const MsgCreateIncentive = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.incentive_denom = message.incentiveDenom === "" ? undefined : message.incentiveDenom; + obj.incentive_amount = message.incentiveAmount === "" ? undefined : message.incentiveAmount; + obj.emission_rate = message.emissionRate === "" ? undefined : message.emissionRate; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.min_uptime = message.minUptime ? Duration.toAmino(message.minUptime) : undefined; return obj; @@ -1602,9 +1602,9 @@ export const MsgCreateIncentiveResponse = { }, toAmino(message: MsgCreateIncentiveResponse): MsgCreateIncentiveResponseAmino { const obj: any = {}; - obj.incentive_denom = message.incentiveDenom; - obj.incentive_amount = message.incentiveAmount; - obj.emission_rate = message.emissionRate; + obj.incentive_denom = message.incentiveDenom === "" ? undefined : message.incentiveDenom; + obj.incentive_amount = message.incentiveAmount === "" ? undefined : message.incentiveAmount; + obj.emission_rate = message.emissionRate === "" ? undefined : message.emissionRate; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.min_uptime = message.minUptime ? Duration.toAmino(message.minUptime) : undefined; return obj; @@ -1734,9 +1734,9 @@ export const MsgFungifyChargedPositions = { if (message.positionIds) { obj.position_ids = message.positionIds.map(e => e.toString()); } else { - obj.position_ids = []; + obj.position_ids = message.positionIds; } - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgFungifyChargedPositionsAminoMsg): MsgFungifyChargedPositions { @@ -1830,7 +1830,7 @@ export const MsgFungifyChargedPositionsResponse = { }, toAmino(message: MsgFungifyChargedPositionsResponse): MsgFungifyChargedPositionsResponseAmino { const obj: any = {}; - obj.new_position_id = message.newPositionId ? message.newPositionId.toString() : undefined; + obj.new_position_id = message.newPositionId !== BigInt(0) ? message.newPositionId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgFungifyChargedPositionsResponseAminoMsg): MsgFungifyChargedPositionsResponse { 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 f2a51dd1c2..12d605fdef 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/model/pool.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/model/pool.ts @@ -134,10 +134,10 @@ export const CosmWasmPool = { }, 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; + obj.pool_address = message.poolAddress === "" ? undefined : message.poolAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromAminoMsg(object: CosmWasmPoolAminoMsg): CosmWasmPool { 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 c379ac62b6..327adf8a92 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/model/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/model/tx.ts @@ -130,9 +130,9 @@ export const MsgCreateCosmWasmPool = { }, toAmino(message: MsgCreateCosmWasmPool): MsgCreateCosmWasmPoolAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.instantiate_msg = message.instantiateMsg ? base64FromBytes(message.instantiateMsg) : undefined; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgCreateCosmWasmPoolAminoMsg): MsgCreateCosmWasmPool { @@ -226,7 +226,7 @@ export const MsgCreateCosmWasmPoolResponse = { }, toAmino(message: MsgCreateCosmWasmPoolResponse): MsgCreateCosmWasmPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateCosmWasmPoolResponseAminoMsg): MsgCreateCosmWasmPoolResponse { 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 25e82bf24a..615b86610e 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/downtime-detector/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/downtime-detector/v1beta1/genesis.ts @@ -105,7 +105,7 @@ export const GenesisDowntimeEntry = { fromAmino(object: GenesisDowntimeEntryAmino): GenesisDowntimeEntry { const message = createBaseGenesisDowntimeEntry(); if (object.duration !== undefined && object.duration !== null) { - message.duration = downtimeFromJSON(object.duration); + message.duration = object.duration; } if (object.last_downtime !== undefined && object.last_downtime !== null) { message.lastDowntime = fromTimestamp(Timestamp.fromAmino(object.last_downtime)); @@ -114,7 +114,7 @@ export const GenesisDowntimeEntry = { }, toAmino(message: GenesisDowntimeEntry): GenesisDowntimeEntryAmino { const obj: any = {}; - obj.duration = message.duration; + obj.duration = message.duration === 0 ? undefined : message.duration; obj.last_downtime = message.lastDowntime ? Timestamp.toAmino(toTimestamp(message.lastDowntime)) : undefined; return obj; }, @@ -234,7 +234,7 @@ export const GenesisState = { if (message.downtimes) { obj.downtimes = message.downtimes.map(e => e ? GenesisDowntimeEntry.toAmino(e) : undefined); } else { - obj.downtimes = []; + obj.downtimes = message.downtimes; } obj.last_block_time = message.lastBlockTime ? Timestamp.toAmino(toTimestamp(message.lastBlockTime)) : undefined; return obj; 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 32e037a7b6..7481746680 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/downtime-detector/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/downtime-detector/v1beta1/query.ts @@ -109,7 +109,7 @@ export const RecoveredSinceDowntimeOfLengthRequest = { fromAmino(object: RecoveredSinceDowntimeOfLengthRequestAmino): RecoveredSinceDowntimeOfLengthRequest { const message = createBaseRecoveredSinceDowntimeOfLengthRequest(); if (object.downtime !== undefined && object.downtime !== null) { - message.downtime = downtimeFromJSON(object.downtime); + message.downtime = object.downtime; } if (object.recovery !== undefined && object.recovery !== null) { message.recovery = Duration.fromAmino(object.recovery); @@ -118,7 +118,7 @@ export const RecoveredSinceDowntimeOfLengthRequest = { }, toAmino(message: RecoveredSinceDowntimeOfLengthRequest): RecoveredSinceDowntimeOfLengthRequestAmino { const obj: any = {}; - obj.downtime = message.downtime; + obj.downtime = message.downtime === 0 ? undefined : message.downtime; obj.recovery = message.recovery ? Duration.toAmino(message.recovery) : undefined; return obj; }, @@ -213,7 +213,7 @@ export const RecoveredSinceDowntimeOfLengthResponse = { }, toAmino(message: RecoveredSinceDowntimeOfLengthResponse): RecoveredSinceDowntimeOfLengthResponseAmino { const obj: any = {}; - obj.succesfully_recovered = message.succesfullyRecovered; + obj.succesfully_recovered = message.succesfullyRecovered === false ? undefined : message.succesfullyRecovered; return obj; }, fromAminoMsg(object: RecoveredSinceDowntimeOfLengthResponseAminoMsg): RecoveredSinceDowntimeOfLengthResponse { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/epochs/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/epochs/genesis.ts index 041844a8bd..46bc729a2d 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/epochs/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/epochs/genesis.ts @@ -255,13 +255,13 @@ export const EpochInfo = { }, toAmino(message: EpochInfo): EpochInfoAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; obj.current_epoch_start_time = message.currentEpochStartTime ? Timestamp.toAmino(toTimestamp(message.currentEpochStartTime)) : undefined; - obj.epoch_counting_started = message.epochCountingStarted; - obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + obj.epoch_counting_started = message.epochCountingStarted === false ? undefined : message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight !== BigInt(0) ? message.currentEpochStartHeight.toString() : undefined; return obj; }, fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo { @@ -364,7 +364,7 @@ export const GenesisState = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/epochs/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/epochs/query.ts index 656f879ef1..8c7f220e90 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/epochs/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/epochs/query.ts @@ -189,7 +189,7 @@ export const QueryEpochsInfoResponse = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, @@ -284,7 +284,7 @@ export const QueryCurrentEpochRequest = { }, toAmino(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; return obj; }, fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest { @@ -378,7 +378,7 @@ export const QueryCurrentEpochResponse = { }, toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { const obj: any = {}; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse { 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 6954a41ab4..7b2eee84d4 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 @@ -294,12 +294,12 @@ export const SmoothWeightChangeParams = { if (message.initialPoolWeights) { obj.initial_pool_weights = message.initialPoolWeights.map(e => e ? PoolAsset.toAmino(e) : undefined); } else { - obj.initial_pool_weights = []; + obj.initial_pool_weights = message.initialPoolWeights; } if (message.targetPoolWeights) { obj.target_pool_weights = message.targetPoolWeights.map(e => e ? PoolAsset.toAmino(e) : undefined); } else { - obj.target_pool_weights = []; + obj.target_pool_weights = message.targetPoolWeights; } return obj; }, @@ -426,8 +426,8 @@ export const PoolParams = { }, toAmino(message: PoolParams): PoolParamsAmino { const obj: any = {}; - obj.swap_fee = message.swapFee; - obj.exit_fee = message.exitFee; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; + obj.exit_fee = message.exitFee === "" ? undefined : message.exitFee; obj.smooth_weight_change_params = message.smoothWeightChangeParams ? SmoothWeightChangeParams.toAmino(message.smoothWeightChangeParams) : undefined; return obj; }, @@ -539,7 +539,7 @@ export const PoolAsset = { toAmino(message: PoolAsset): PoolAssetAmino { const obj: any = {}; obj.token = message.token ? Coin.toAmino(message.token) : undefined; - obj.weight = message.weight; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: PoolAssetAminoMsg): PoolAsset { @@ -735,17 +735,17 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.address = message.address; - obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : 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.pool_assets = message.poolAssets; } - obj.total_weight = message.totalWeight; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { 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 76be2256af..b29295b832 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 @@ -155,14 +155,14 @@ export const MsgCreateBalancerPool = { }, toAmino(message: MsgCreateBalancerPool): MsgCreateBalancerPoolAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : 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.pool_assets = message.poolAssets; } - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; return obj; }, fromAminoMsg(object: MsgCreateBalancerPoolAminoMsg): MsgCreateBalancerPool { @@ -256,7 +256,7 @@ export const MsgCreateBalancerPoolResponse = { }, toAmino(message: MsgCreateBalancerPoolResponse): MsgCreateBalancerPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateBalancerPoolResponseAminoMsg): MsgCreateBalancerPoolResponse { 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 d01105d9ab..776cf4e300 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 @@ -152,8 +152,8 @@ export const PoolParams = { }, toAmino(message: PoolParams): PoolParamsAmino { const obj: any = {}; - obj.swap_fee = message.swapFee; - obj.exit_fee = message.exitFee; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; + obj.exit_fee = message.exitFee === "" ? undefined : message.exitFee; return obj; }, fromAminoMsg(object: PoolParamsAminoMsg): PoolParams { @@ -380,22 +380,22 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.address = message.address; - obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : 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 = []; + obj.pool_liquidity = message.poolLiquidity; } if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } - obj.scaling_factor_controller = message.scalingFactorController; + obj.scaling_factor_controller = message.scalingFactorController === "" ? undefined : message.scalingFactorController; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { 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 698994532a..dcbea7198a 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 @@ -235,20 +235,20 @@ export const MsgCreateStableswapPool = { }, toAmino(message: MsgCreateStableswapPool): MsgCreateStableswapPoolAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : 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 = []; + obj.initial_pool_liquidity = message.initialPoolLiquidity; } if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } - obj.future_pool_governor = message.futurePoolGovernor; - obj.scaling_factor_controller = message.scalingFactorController; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; + obj.scaling_factor_controller = message.scalingFactorController === "" ? undefined : message.scalingFactorController; return obj; }, fromAminoMsg(object: MsgCreateStableswapPoolAminoMsg): MsgCreateStableswapPool { @@ -342,7 +342,7 @@ export const MsgCreateStableswapPoolResponse = { }, toAmino(message: MsgCreateStableswapPoolResponse): MsgCreateStableswapPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateStableswapPoolResponseAminoMsg): MsgCreateStableswapPoolResponse { @@ -483,12 +483,12 @@ export const MsgStableSwapAdjustScalingFactors = { }, toAmino(message: MsgStableSwapAdjustScalingFactors): MsgStableSwapAdjustScalingFactorsAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/genesis.ts index 8cc7af2a93..5a36100be8 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/genesis.ts @@ -110,7 +110,7 @@ export const Params = { if (message.poolCreationFee) { obj.pool_creation_fee = message.poolCreationFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.pool_creation_fee = []; + obj.pool_creation_fee = message.poolCreationFee; } return obj; }, @@ -246,9 +246,9 @@ export const GenesisState = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } - obj.next_pool_number = message.nextPoolNumber ? message.nextPoolNumber.toString() : undefined; + obj.next_pool_number = message.nextPoolNumber !== BigInt(0) ? message.nextPoolNumber.toString() : undefined; obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/gov.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/gov.ts index 2091879a09..5ef320658e 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/gov.ts @@ -144,8 +144,8 @@ export const ReplaceMigrationRecordsProposal = { }, toAmino(message: ReplaceMigrationRecordsProposal): ReplaceMigrationRecordsProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: ReplaceMigrationRecordsProposalAminoMsg): ReplaceMigrationRecordsProposal { @@ -255,8 +255,8 @@ export const UpdateMigrationRecordsProposal = { }, toAmino(message: UpdateMigrationRecordsProposal): UpdateMigrationRecordsProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: UpdateMigrationRecordsProposalAminoMsg): UpdateMigrationRecordsProposal { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/query.ts index 82d81d6eb6..7160035b8b 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/query.ts @@ -450,7 +450,7 @@ export const QueryPoolRequest = { }, toAmino(message: QueryPoolRequest): QueryPoolRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolRequestAminoMsg): QueryPoolRequest { @@ -757,7 +757,7 @@ export const QueryPoolsResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -926,7 +926,7 @@ export const QueryNumPoolsResponse = { }, toAmino(message: QueryNumPoolsResponse): QueryNumPoolsResponseAmino { const obj: any = {}; - obj.num_pools = message.numPools ? message.numPools.toString() : undefined; + obj.num_pools = message.numPools !== BigInt(0) ? message.numPools.toString() : undefined; return obj; }, fromAminoMsg(object: QueryNumPoolsResponseAminoMsg): QueryNumPoolsResponse { @@ -1020,7 +1020,7 @@ export const QueryPoolTypeRequest = { }, toAmino(message: QueryPoolTypeRequest): QueryPoolTypeRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolTypeRequestAminoMsg): QueryPoolTypeRequest { @@ -1114,7 +1114,7 @@ export const QueryPoolTypeResponse = { }, toAmino(message: QueryPoolTypeResponse): QueryPoolTypeResponseAmino { const obj: any = {}; - obj.pool_type = message.poolType; + obj.pool_type = message.poolType === "" ? undefined : message.poolType; return obj; }, fromAminoMsg(object: QueryPoolTypeResponseAminoMsg): QueryPoolTypeResponse { @@ -1230,11 +1230,11 @@ export const QueryCalcJoinPoolSharesRequest = { }, toAmino(message: QueryCalcJoinPoolSharesRequest): QueryCalcJoinPoolSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.tokensIn) { obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_in = []; + obj.tokens_in = message.tokensIn; } return obj; }, @@ -1351,11 +1351,11 @@ export const QueryCalcJoinPoolSharesResponse = { }, toAmino(message: QueryCalcJoinPoolSharesResponse): QueryCalcJoinPoolSharesResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } return obj; }, @@ -1466,8 +1466,8 @@ export const QueryCalcExitPoolCoinsFromSharesRequest = { }, toAmino(message: QueryCalcExitPoolCoinsFromSharesRequest): QueryCalcExitPoolCoinsFromSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.share_in_amount = message.shareInAmount; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; return obj; }, fromAminoMsg(object: QueryCalcExitPoolCoinsFromSharesRequestAminoMsg): QueryCalcExitPoolCoinsFromSharesRequest { @@ -1570,7 +1570,7 @@ export const QueryCalcExitPoolCoinsFromSharesResponse = { if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } return obj; }, @@ -1665,7 +1665,7 @@ export const QueryPoolParamsRequest = { }, toAmino(message: QueryPoolParamsRequest): QueryPoolParamsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolParamsRequestAminoMsg): QueryPoolParamsRequest { @@ -1853,7 +1853,7 @@ export const QueryTotalPoolLiquidityRequest = { }, toAmino(message: QueryTotalPoolLiquidityRequest): QueryTotalPoolLiquidityRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTotalPoolLiquidityRequestAminoMsg): QueryTotalPoolLiquidityRequest { @@ -1956,7 +1956,7 @@ export const QueryTotalPoolLiquidityResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, @@ -2051,7 +2051,7 @@ export const QueryTotalSharesRequest = { }, toAmino(message: QueryTotalSharesRequest): QueryTotalSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTotalSharesRequestAminoMsg): QueryTotalSharesRequest { @@ -2261,11 +2261,11 @@ export const QueryCalcJoinPoolNoSwapSharesRequest = { }, toAmino(message: QueryCalcJoinPoolNoSwapSharesRequest): QueryCalcJoinPoolNoSwapSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.tokensIn) { obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_in = []; + obj.tokens_in = message.tokensIn; } return obj; }, @@ -2385,9 +2385,9 @@ export const QueryCalcJoinPoolNoSwapSharesResponse = { if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } - obj.shares_out = message.sharesOut; + obj.shares_out = message.sharesOut === "" ? undefined : message.sharesOut; return obj; }, fromAminoMsg(object: QueryCalcJoinPoolNoSwapSharesResponseAminoMsg): QueryCalcJoinPoolNoSwapSharesResponse { @@ -2513,9 +2513,9 @@ export const QuerySpotPriceRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest { @@ -2650,9 +2650,9 @@ export const QueryPoolsWithFilterRequest = { if (message.minLiquidity) { obj.min_liquidity = message.minLiquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_liquidity = []; + obj.min_liquidity = message.minLiquidity; } - obj.pool_type = message.poolType; + obj.pool_type = message.poolType === "" ? undefined : message.poolType; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2772,7 +2772,7 @@ export const QueryPoolsWithFilterResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2868,7 +2868,7 @@ export const QuerySpotPriceResponse = { }, toAmino(message: QuerySpotPriceResponse): QuerySpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse { @@ -3016,13 +3016,13 @@ export const QuerySwapExactAmountInRequest = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn === "" ? undefined : message.tokenIn; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } return obj; }, @@ -3117,7 +3117,7 @@ export const QuerySwapExactAmountInResponse = { }, toAmino(message: QuerySwapExactAmountInResponse): QuerySwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: QuerySwapExactAmountInResponseAminoMsg): QuerySwapExactAmountInResponse { @@ -3265,14 +3265,14 @@ export const QuerySwapExactAmountOutRequest = { }, toAmino(message: QuerySwapExactAmountOutRequest): QuerySwapExactAmountOutRequestAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_out = message.tokenOut; + obj.token_out = message.tokenOut === "" ? undefined : message.tokenOut; return obj; }, fromAminoMsg(object: QuerySwapExactAmountOutRequestAminoMsg): QuerySwapExactAmountOutRequest { @@ -3366,7 +3366,7 @@ export const QuerySwapExactAmountOutResponse = { }, toAmino(message: QuerySwapExactAmountOutResponse): QuerySwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: QuerySwapExactAmountOutResponseAminoMsg): QuerySwapExactAmountOutResponse { @@ -3542,7 +3542,7 @@ export const QueryTotalLiquidityResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/tx.ts index 37b4fed537..09b338ecac 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/tx.ts @@ -391,13 +391,13 @@ export const MsgJoinPool = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenInMaxs) { obj.token_in_maxs = message.tokenInMaxs.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_in_maxs = []; + obj.token_in_maxs = message.tokenInMaxs; } return obj; }, @@ -514,11 +514,11 @@ export const MsgJoinPoolResponse = { }, toAmino(message: MsgJoinPoolResponse): MsgJoinPoolResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenIn) { obj.token_in = message.tokenIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_in = []; + obj.token_in = message.tokenIn; } return obj; }, @@ -667,13 +667,13 @@ export const MsgExitPool = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; if (message.tokenOutMins) { obj.token_out_mins = message.tokenOutMins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_out_mins = []; + obj.token_out_mins = message.tokenOutMins; } return obj; }, @@ -777,7 +777,7 @@ export const MsgExitPoolResponse = { if (message.tokenOut) { obj.token_out = message.tokenOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_out = []; + obj.token_out = message.tokenOut; } return obj; }, @@ -888,8 +888,8 @@ export const SwapAmountInRoute = { }, toAmino(message: SwapAmountInRoute): SwapAmountInRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_out_denom = message.tokenOutDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; return obj; }, fromAminoMsg(object: SwapAmountInRouteAminoMsg): SwapAmountInRoute { @@ -1037,14 +1037,14 @@ export const MsgSwapExactAmountIn = { }, toAmino(message: MsgSwapExactAmountIn): MsgSwapExactAmountInAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; - obj.token_out_min_amount = message.tokenOutMinAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInAminoMsg): MsgSwapExactAmountIn { @@ -1138,7 +1138,7 @@ export const MsgSwapExactAmountInResponse = { }, toAmino(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInResponseAminoMsg): MsgSwapExactAmountInResponse { @@ -1248,8 +1248,8 @@ export const SwapAmountOutRoute = { }, toAmino(message: SwapAmountOutRoute): SwapAmountOutRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_in_denom = message.tokenInDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; return obj; }, fromAminoMsg(object: SwapAmountOutRouteAminoMsg): SwapAmountOutRoute { @@ -1397,13 +1397,13 @@ export const MsgSwapExactAmountOut = { }, toAmino(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_in_max_amount = message.tokenInMaxAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; return obj; }, @@ -1498,7 +1498,7 @@ export const MsgSwapExactAmountOutResponse = { }, toAmino(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountOutResponseAminoMsg): MsgSwapExactAmountOutResponse { @@ -1640,10 +1640,10 @@ export const MsgJoinSwapExternAmountIn = { }, toAmino(message: MsgJoinSwapExternAmountIn): MsgJoinSwapExternAmountInAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; - obj.share_out_min_amount = message.shareOutMinAmount; + obj.share_out_min_amount = message.shareOutMinAmount === "" ? undefined : message.shareOutMinAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapExternAmountInAminoMsg): MsgJoinSwapExternAmountIn { @@ -1737,7 +1737,7 @@ export const MsgJoinSwapExternAmountInResponse = { }, toAmino(message: MsgJoinSwapExternAmountInResponse): MsgJoinSwapExternAmountInResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapExternAmountInResponseAminoMsg): MsgJoinSwapExternAmountInResponse { @@ -1895,11 +1895,11 @@ export const MsgJoinSwapShareAmountOut = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapShareAmountOutAminoMsg): MsgJoinSwapShareAmountOut { @@ -1993,7 +1993,7 @@ export const MsgJoinSwapShareAmountOutResponse = { }, toAmino(message: MsgJoinSwapShareAmountOutResponse): MsgJoinSwapShareAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapShareAmountOutResponseAminoMsg): MsgJoinSwapShareAmountOutResponse { @@ -2151,11 +2151,11 @@ export const MsgExitSwapShareAmountIn = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromAminoMsg(object: MsgExitSwapShareAmountInAminoMsg): MsgExitSwapShareAmountIn { @@ -2249,7 +2249,7 @@ export const MsgExitSwapShareAmountInResponse = { }, toAmino(message: MsgExitSwapShareAmountInResponse): MsgExitSwapShareAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: MsgExitSwapShareAmountInResponseAminoMsg): MsgExitSwapShareAmountInResponse { @@ -2391,10 +2391,10 @@ export const MsgExitSwapExternAmountOut = { }, toAmino(message: MsgExitSwapExternAmountOut): MsgExitSwapExternAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; - obj.share_in_max_amount = message.shareInMaxAmount; + obj.share_in_max_amount = message.shareInMaxAmount === "" ? undefined : message.shareInMaxAmount; return obj; }, fromAminoMsg(object: MsgExitSwapExternAmountOutAminoMsg): MsgExitSwapExternAmountOut { @@ -2488,7 +2488,7 @@ export const MsgExitSwapExternAmountOutResponse = { }, toAmino(message: MsgExitSwapExternAmountOutResponse): MsgExitSwapExternAmountOutResponseAmino { const obj: any = {}; - obj.share_in_amount = message.shareInAmount; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; return obj; }, fromAminoMsg(object: MsgExitSwapExternAmountOutResponseAminoMsg): MsgExitSwapExternAmountOutResponse { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v2/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v2/query.ts index 318e27708f..f0354c1b15 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v2/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v2/query.ts @@ -143,9 +143,9 @@ export const QuerySpotPriceRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest { @@ -239,7 +239,7 @@ export const QuerySpotPriceResponse = { }, toAmino(message: QuerySpotPriceResponse): QuerySpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse { 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 540533afde..3750cd260a 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 @@ -82,7 +82,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/incentives/gauge.ts b/__fixtures__/v-next/outputosmojs/osmosis/incentives/gauge.ts index 57d32cf46a..3020a18db4 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/incentives/gauge.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/incentives/gauge.ts @@ -269,21 +269,21 @@ export const Gauge = { }, toAmino(message: Gauge): GaugeAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.is_perpetual = message.isPerpetual; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.is_perpetual = message.isPerpetual === false ? undefined : 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.coins = message.coins; } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; - obj.filled_epochs = message.filledEpochs ? message.filledEpochs.toString() : undefined; + obj.num_epochs_paid_over = message.numEpochsPaidOver !== BigInt(0) ? message.numEpochsPaidOver.toString() : undefined; + obj.filled_epochs = message.filledEpochs !== BigInt(0) ? message.filledEpochs.toString() : undefined; if (message.distributedCoins) { obj.distributed_coins = message.distributedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.distributed_coins = []; + obj.distributed_coins = message.distributedCoins; } return obj; }, @@ -387,7 +387,7 @@ export const LockableDurationsInfo = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/incentives/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/incentives/genesis.ts index 146743fbd8..08329d5f30 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/incentives/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/incentives/genesis.ts @@ -171,14 +171,14 @@ export const GenesisState = { if (message.gauges) { obj.gauges = message.gauges.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.gauges = []; + obj.gauges = message.gauges; } if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } - obj.last_gauge_id = message.lastGaugeId ? message.lastGaugeId.toString() : undefined; + obj.last_gauge_id = message.lastGaugeId !== BigInt(0) ? message.lastGaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/incentives/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/incentives/params.ts index 0cd673248f..ab64e8de54 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/incentives/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/incentives/params.ts @@ -86,7 +86,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.distr_epoch_identifier = message.distrEpochIdentifier; + obj.distr_epoch_identifier = message.distrEpochIdentifier === "" ? undefined : message.distrEpochIdentifier; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/incentives/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/incentives/query.ts index 7070d7f507..c5cd878eda 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/incentives/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/incentives/query.ts @@ -377,7 +377,7 @@ export const ModuleToDistributeCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -472,7 +472,7 @@ export const GaugeByIDRequest = { }, toAmino(message: GaugeByIDRequest): GaugeByIDRequestAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; return obj; }, fromAminoMsg(object: GaugeByIDRequestAminoMsg): GaugeByIDRequest { @@ -779,7 +779,7 @@ export const GaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -994,7 +994,7 @@ export const ActiveGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1106,7 +1106,7 @@ export const ActiveGaugesPerDenomRequest = { }, toAmino(message: ActiveGaugesPerDenomRequest): ActiveGaugesPerDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1226,7 +1226,7 @@ export const ActiveGaugesPerDenomResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1441,7 +1441,7 @@ export const UpcomingGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1553,7 +1553,7 @@ export const UpcomingGaugesPerDenomRequest = { }, toAmino(message: UpcomingGaugesPerDenomRequest): UpcomingGaugesPerDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1673,7 +1673,7 @@ export const UpcomingGaugesPerDenomResponse = { if (message.upcomingGauges) { obj.upcoming_gauges = message.upcomingGauges.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.upcoming_gauges = []; + obj.upcoming_gauges = message.upcomingGauges; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1816,13 +1816,13 @@ export const RewardsEstRequest = { }, toAmino(message: RewardsEstRequest): RewardsEstRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; if (message.lockIds) { obj.lock_ids = message.lockIds.map(e => e.toString()); } else { - obj.lock_ids = []; + obj.lock_ids = message.lockIds; } - obj.end_epoch = message.endEpoch ? message.endEpoch.toString() : undefined; + obj.end_epoch = message.endEpoch !== BigInt(0) ? message.endEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: RewardsEstRequestAminoMsg): RewardsEstRequest { @@ -1925,7 +1925,7 @@ export const RewardsEstResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -2102,7 +2102,7 @@ export const QueryLockableDurationsResponse = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/incentives/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/incentives/tx.ts index 1569476706..18f415b567 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/incentives/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/incentives/tx.ts @@ -230,16 +230,16 @@ export const MsgCreateGauge = { }, toAmino(message: MsgCreateGauge): MsgCreateGaugeAmino { const obj: any = {}; - obj.is_perpetual = message.isPerpetual; - obj.owner = message.owner; + obj.is_perpetual = message.isPerpetual === false ? undefined : message.isPerpetual; + obj.owner = message.owner === "" ? undefined : 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.coins = message.coins; } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; + obj.num_epochs_paid_over = message.numEpochsPaidOver !== BigInt(0) ? message.numEpochsPaidOver.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateGaugeAminoMsg): MsgCreateGauge { @@ -444,12 +444,12 @@ export const MsgAddToGauge = { }, toAmino(message: MsgAddToGauge): MsgAddToGaugeAmino { const obj: any = {}; - obj.owner = message.owner; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; if (message.rewards) { obj.rewards = message.rewards.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/genesis.ts index 6e4d932507..5ec5382776 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/genesis.ts @@ -131,16 +131,16 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.last_lock_id = message.lastLockId ? message.lastLockId.toString() : undefined; + obj.last_lock_id = message.lastLockId !== BigInt(0) ? message.lastLockId.toString() : undefined; if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/lock.ts index 75e01f1d5c..42c725c29c 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/lock.ts @@ -311,14 +311,14 @@ export const PeriodLock = { }, toAmino(message: PeriodLock): PeriodLockAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; - obj.owner = message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -446,7 +446,7 @@ export const QueryCondition = { fromAmino(object: QueryConditionAmino): QueryCondition { const message = createBaseQueryCondition(); if (object.lock_query_type !== undefined && object.lock_query_type !== null) { - message.lockQueryType = lockQueryTypeFromJSON(object.lock_query_type); + message.lockQueryType = object.lock_query_type; } if (object.denom !== undefined && object.denom !== null) { message.denom = object.denom; @@ -461,8 +461,8 @@ export const QueryCondition = { }, toAmino(message: QueryCondition): QueryConditionAmino { const obj: any = {}; - obj.lock_query_type = message.lockQueryType; - obj.denom = message.denom; + obj.lock_query_type = message.lockQueryType === 0 ? undefined : message.lockQueryType; + obj.denom = message.denom === "" ? undefined : message.denom; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; @@ -606,8 +606,8 @@ export const SyntheticLock = { }, toAmino(message: SyntheticLock): SyntheticLockAmino { const obj: any = {}; - obj.underlying_lock_id = message.underlyingLockId ? message.underlyingLockId.toString() : undefined; - obj.synth_denom = message.synthDenom; + obj.underlying_lock_id = message.underlyingLockId !== BigInt(0) ? message.underlyingLockId.toString() : undefined; + obj.synth_denom = message.synthDenom === "" ? undefined : message.synthDenom; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/params.ts index d89ef720b5..ddaf4209b6 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/params.ts @@ -89,7 +89,7 @@ export const Params = { if (message.forceUnlockAllowedAddresses) { obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses.map(e => e); } else { - obj.force_unlock_allowed_addresses = []; + obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/query.ts index 058537d70f..b8c0dbabb6 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/query.ts @@ -507,7 +507,7 @@ export const ModuleBalanceResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -684,7 +684,7 @@ export const ModuleLockedAmountResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -779,7 +779,7 @@ export const AccountUnlockableCoinsRequest = { }, toAmino(message: AccountUnlockableCoinsRequest): AccountUnlockableCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountUnlockableCoinsRequestAminoMsg): AccountUnlockableCoinsRequest { @@ -882,7 +882,7 @@ export const AccountUnlockableCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -977,7 +977,7 @@ export const AccountUnlockingCoinsRequest = { }, toAmino(message: AccountUnlockingCoinsRequest): AccountUnlockingCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountUnlockingCoinsRequestAminoMsg): AccountUnlockingCoinsRequest { @@ -1080,7 +1080,7 @@ export const AccountUnlockingCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1175,7 +1175,7 @@ export const AccountLockedCoinsRequest = { }, toAmino(message: AccountLockedCoinsRequest): AccountLockedCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountLockedCoinsRequestAminoMsg): AccountLockedCoinsRequest { @@ -1278,7 +1278,7 @@ export const AccountLockedCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1389,7 +1389,7 @@ export const AccountLockedPastTimeRequest = { }, toAmino(message: AccountLockedPastTimeRequest): AccountLockedPastTimeRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1493,7 +1493,7 @@ export const AccountLockedPastTimeResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1604,7 +1604,7 @@ export const AccountLockedPastTimeNotUnlockingOnlyRequest = { }, toAmino(message: AccountLockedPastTimeNotUnlockingOnlyRequest): AccountLockedPastTimeNotUnlockingOnlyRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1708,7 +1708,7 @@ export const AccountLockedPastTimeNotUnlockingOnlyResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1819,7 +1819,7 @@ export const AccountUnlockedBeforeTimeRequest = { }, toAmino(message: AccountUnlockedBeforeTimeRequest): AccountUnlockedBeforeTimeRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1923,7 +1923,7 @@ export const AccountUnlockedBeforeTimeResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2050,9 +2050,9 @@ export const AccountLockedPastTimeDenomRequest = { }, toAmino(message: AccountLockedPastTimeDenomRequest): AccountLockedPastTimeDenomRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AccountLockedPastTimeDenomRequestAminoMsg): AccountLockedPastTimeDenomRequest { @@ -2155,7 +2155,7 @@ export const AccountLockedPastTimeDenomResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2266,7 +2266,7 @@ export const LockedDenomRequest = { }, toAmino(message: LockedDenomRequest): LockedDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -2361,7 +2361,7 @@ export const LockedDenomResponse = { }, toAmino(message: LockedDenomResponse): LockedDenomResponseAmino { const obj: any = {}; - obj.amount = message.amount; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: LockedDenomResponseAminoMsg): LockedDenomResponse { @@ -2455,7 +2455,7 @@ export const LockedRequest = { }, toAmino(message: LockedRequest): LockedRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: LockedRequestAminoMsg): LockedRequest { @@ -2643,7 +2643,7 @@ export const SyntheticLockupsByLockupIDRequest = { }, toAmino(message: SyntheticLockupsByLockupIDRequest): SyntheticLockupsByLockupIDRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: SyntheticLockupsByLockupIDRequestAminoMsg): SyntheticLockupsByLockupIDRequest { @@ -2746,7 +2746,7 @@ export const SyntheticLockupsByLockupIDResponse = { if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, @@ -2857,7 +2857,7 @@ export const AccountLockedLongerDurationRequest = { }, toAmino(message: AccountLockedLongerDurationRequest): AccountLockedLongerDurationRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -2961,7 +2961,7 @@ export const AccountLockedLongerDurationResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3072,7 +3072,7 @@ export const AccountLockedDurationRequest = { }, toAmino(message: AccountLockedDurationRequest): AccountLockedDurationRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -3176,7 +3176,7 @@ export const AccountLockedDurationResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3287,7 +3287,7 @@ export const AccountLockedLongerDurationNotUnlockingOnlyRequest = { }, toAmino(message: AccountLockedLongerDurationNotUnlockingOnlyRequest): AccountLockedLongerDurationNotUnlockingOnlyRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -3391,7 +3391,7 @@ export const AccountLockedLongerDurationNotUnlockingOnlyResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3518,9 +3518,9 @@ export const AccountLockedLongerDurationDenomRequest = { }, toAmino(message: AccountLockedLongerDurationDenomRequest): AccountLockedLongerDurationDenomRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AccountLockedLongerDurationDenomRequestAminoMsg): AccountLockedLongerDurationDenomRequest { @@ -3623,7 +3623,7 @@ export const AccountLockedLongerDurationDenomResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.ts index 7e3b2f8768..8a6ac989c2 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.ts @@ -249,12 +249,12 @@ export const MsgLockTokens = { }, toAmino(message: MsgLockTokens): MsgLockTokensAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : 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 = []; + obj.coins = message.coins; } return obj; }, @@ -349,7 +349,7 @@ export const MsgLockTokensResponse = { }, toAmino(message: MsgLockTokensResponse): MsgLockTokensResponseAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockTokensResponseAminoMsg): MsgLockTokensResponse { @@ -443,7 +443,7 @@ export const MsgBeginUnlockingAll = { }, toAmino(message: MsgBeginUnlockingAll): MsgBeginUnlockingAllAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: MsgBeginUnlockingAllAminoMsg): MsgBeginUnlockingAll { @@ -546,7 +546,7 @@ export const MsgBeginUnlockingAllResponse = { if (message.unlocks) { obj.unlocks = message.unlocks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.unlocks = []; + obj.unlocks = message.unlocks; } return obj; }, @@ -679,12 +679,12 @@ export const MsgBeginUnlocking = { }, toAmino(message: MsgBeginUnlocking): MsgBeginUnlockingAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -779,7 +779,7 @@ export const MsgBeginUnlockingResponse = { }, toAmino(message: MsgBeginUnlockingResponse): MsgBeginUnlockingResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgBeginUnlockingResponseAminoMsg): MsgBeginUnlockingResponse { @@ -905,8 +905,8 @@ export const MsgExtendLockup = { }, toAmino(message: MsgExtendLockup): MsgExtendLockupAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -1001,7 +1001,7 @@ export const MsgExtendLockupResponse = { }, toAmino(message: MsgExtendLockupResponse): MsgExtendLockupResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgExtendLockupResponseAminoMsg): MsgExtendLockupResponse { @@ -1133,12 +1133,12 @@ export const MsgForceUnlock = { }, toAmino(message: MsgForceUnlock): MsgForceUnlockAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1233,7 +1233,7 @@ export const MsgForceUnlockResponse = { }, toAmino(message: MsgForceUnlockResponse): MsgForceUnlockResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgForceUnlockResponseAminoMsg): MsgForceUnlockResponse { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/genesis.ts index 01bd7f3c8a..a073e3bd93 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/genesis.ts @@ -127,7 +127,7 @@ export const GenesisState = { 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; + obj.reduction_started_epoch = message.reductionStartedEpoch !== BigInt(0) ? message.reductionStartedEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/mint.ts index 0a6ee9ba78..b737746cdf 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/mint.ts @@ -200,7 +200,7 @@ export const Minter = { }, toAmino(message: Minter): MinterAmino { const obj: any = {}; - obj.epoch_provisions = message.epochProvisions; + obj.epoch_provisions = message.epochProvisions === "" ? undefined : message.epochProvisions; return obj; }, fromAminoMsg(object: MinterAminoMsg): Minter { @@ -310,8 +310,8 @@ export const WeightedAddress = { }, toAmino(message: WeightedAddress): WeightedAddressAmino { const obj: any = {}; - obj.address = message.address; - obj.weight = message.weight; + obj.address = message.address === "" ? undefined : message.address; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedAddressAminoMsg): WeightedAddress { @@ -453,10 +453,10 @@ export const DistributionProportions = { }, 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; + obj.staking = message.staking === "" ? undefined : message.staking; + obj.pool_incentives = message.poolIncentives === "" ? undefined : message.poolIncentives; + obj.developer_rewards = message.developerRewards === "" ? undefined : message.developerRewards; + obj.community_pool = message.communityPool === "" ? undefined : message.communityPool; return obj; }, fromAminoMsg(object: DistributionProportionsAminoMsg): DistributionProportions { @@ -668,18 +668,18 @@ export const Params = { }, 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.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; + obj.genesis_epoch_provisions = message.genesisEpochProvisions === "" ? undefined : message.genesisEpochProvisions; + obj.epoch_identifier = message.epochIdentifier === "" ? undefined : message.epochIdentifier; + obj.reduction_period_in_epochs = message.reductionPeriodInEpochs !== BigInt(0) ? message.reductionPeriodInEpochs.toString() : undefined; + obj.reduction_factor = message.reductionFactor === "" ? undefined : 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.weighted_developer_rewards_receivers = message.weightedDeveloperRewardsReceivers; } - obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; + obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch !== BigInt(0) ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { 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 1a36cfc415..3880c39295 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/genesis.ts @@ -149,7 +149,7 @@ export const GenesisState = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } obj.distr_info = message.distrInfo ? DistrInfo.toAmino(message.distrInfo) : undefined; obj.pool_to_gauges = message.poolToGauges ? PoolToGauges.toAmino(message.poolToGauges) : undefined; 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 6fc9a62342..6e34b4e191 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/gov.ts @@ -173,12 +173,12 @@ export const ReplacePoolIncentivesProposal = { }, toAmino(message: ReplacePoolIncentivesProposal): ReplacePoolIncentivesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, @@ -311,12 +311,12 @@ export const UpdatePoolIncentivesProposal = { }, toAmino(message: UpdatePoolIncentivesProposal): UpdatePoolIncentivesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, 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 48679d1b10..52863699d5 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/incentives.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/incentives.ts @@ -145,7 +145,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.minted_denom = message.mintedDenom; + obj.minted_denom = message.mintedDenom === "" ? undefined : message.mintedDenom; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -248,7 +248,7 @@ export const LockableDurationsInfo = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, @@ -365,11 +365,11 @@ export const DistrInfo = { }, toAmino(message: DistrInfo): DistrInfoAmino { const obj: any = {}; - obj.total_weight = message.totalWeight; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, @@ -480,8 +480,8 @@ export const DistrRecord = { }, toAmino(message: DistrRecord): DistrRecordAmino { const obj: any = {}; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; - obj.weight = message.weight; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: DistrRecordAminoMsg): DistrRecord { @@ -607,8 +607,8 @@ export const PoolToGauge = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -712,7 +712,7 @@ export const PoolToGauges = { if (message.poolToGauge) { obj.pool_to_gauge = message.poolToGauge.map(e => e ? PoolToGauge.toAmino(e) : undefined); } else { - obj.pool_to_gauge = []; + obj.pool_to_gauge = message.poolToGauge; } return obj; }, 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 9ad0dd817f..e5809a9867 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/query.ts @@ -201,7 +201,7 @@ export const QueryGaugeIdsRequest = { }, toAmino(message: QueryGaugeIdsRequest): QueryGaugeIdsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGaugeIdsRequestAminoMsg): QueryGaugeIdsRequest { @@ -304,7 +304,7 @@ export const QueryGaugeIdsResponse = { if (message.gaugeIdsWithDuration) { obj.gauge_ids_with_duration = message.gaugeIdsWithDuration.map(e => e ? QueryGaugeIdsResponse_GaugeIdWithDuration.toAmino(e) : undefined); } else { - obj.gauge_ids_with_duration = []; + obj.gauge_ids_with_duration = message.gaugeIdsWithDuration; } return obj; }, @@ -431,9 +431,9 @@ export const QueryGaugeIdsResponse_GaugeIdWithDuration = { }, toAmino(message: QueryGaugeIdsResponse_GaugeIdWithDuration): QueryGaugeIdsResponse_GaugeIdWithDurationAmino { const obj: any = {}; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.gauge_incentive_percentage = message.gaugeIncentivePercentage; + obj.gauge_incentive_percentage = message.gaugeIncentivePercentage === "" ? undefined : message.gaugeIncentivePercentage; return obj; }, fromAminoMsg(object: QueryGaugeIdsResponse_GaugeIdWithDurationAminoMsg): QueryGaugeIdsResponse_GaugeIdWithDuration { @@ -943,7 +943,7 @@ export const QueryLockableDurationsResponse = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, @@ -1143,9 +1143,9 @@ export const IncentivizedPool = { }, toAmino(message: IncentivizedPool): IncentivizedPoolAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.lockable_duration = message.lockableDuration ? Duration.toAmino(message.lockableDuration) : undefined; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: IncentivizedPoolAminoMsg): IncentivizedPool { @@ -1248,7 +1248,7 @@ export const QueryIncentivizedPoolsResponse = { if (message.incentivizedPools) { obj.incentivized_pools = message.incentivizedPools.map(e => e ? IncentivizedPool.toAmino(e) : undefined); } else { - obj.incentivized_pools = []; + obj.incentivized_pools = message.incentivizedPools; } return obj; }, @@ -1425,7 +1425,7 @@ export const QueryExternalIncentiveGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/genesis.ts index 9bc8830a98..181614ee58 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/genesis.ts @@ -112,7 +112,7 @@ export const Params = { if (message.poolCreationFee) { obj.pool_creation_fee = message.poolCreationFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.pool_creation_fee = []; + obj.pool_creation_fee = message.poolCreationFee; } return obj; }, @@ -245,12 +245,12 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.next_pool_id = message.nextPoolId ? message.nextPoolId.toString() : undefined; + obj.next_pool_id = message.nextPoolId !== BigInt(0) ? 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 = []; + obj.pool_routes = message.poolRoutes; } return obj; }, 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 b07bcb8672..fbfa4379d1 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/module_route.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/module_route.ts @@ -161,7 +161,7 @@ export const ModuleRoute = { fromAmino(object: ModuleRouteAmino): ModuleRoute { const message = createBaseModuleRoute(); if (object.pool_type !== undefined && object.pool_type !== null) { - message.poolType = poolTypeFromJSON(object.pool_type); + message.poolType = object.pool_type; } if (object.pool_id !== undefined && object.pool_id !== null) { message.poolId = BigInt(object.pool_id); @@ -170,8 +170,8 @@ export const ModuleRoute = { }, toAmino(message: ModuleRoute): ModuleRouteAmino { const obj: any = {}; - obj.pool_type = message.poolType; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_type = message.poolType === 0 ? undefined : message.poolType; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: ModuleRouteAminoMsg): ModuleRoute { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/query.ts index 97c98d6465..0f2e21361e 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/query.ts @@ -479,12 +479,12 @@ export const EstimateSwapExactAmountInRequest = { }, toAmino(message: EstimateSwapExactAmountInRequest): EstimateSwapExactAmountInRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_in = message.tokenIn; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn === "" ? undefined : message.tokenIn; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } return obj; }, @@ -611,9 +611,9 @@ export const EstimateSinglePoolSwapExactAmountInRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn === "" ? undefined : message.tokenIn; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; return obj; }, fromAminoMsg(object: EstimateSinglePoolSwapExactAmountInRequestAminoMsg): EstimateSinglePoolSwapExactAmountInRequest { @@ -707,7 +707,7 @@ export const EstimateSwapExactAmountInResponse = { }, toAmino(message: EstimateSwapExactAmountInResponse): EstimateSwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: EstimateSwapExactAmountInResponseAminoMsg): EstimateSwapExactAmountInResponse { @@ -839,13 +839,13 @@ export const EstimateSwapExactAmountOutRequest = { }, toAmino(message: EstimateSwapExactAmountOutRequest): EstimateSwapExactAmountOutRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_out = message.tokenOut; + obj.token_out = message.tokenOut === "" ? undefined : message.tokenOut; return obj; }, fromAminoMsg(object: EstimateSwapExactAmountOutRequestAminoMsg): EstimateSwapExactAmountOutRequest { @@ -971,9 +971,9 @@ export const EstimateSinglePoolSwapExactAmountOutRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; + obj.token_out = message.tokenOut === "" ? undefined : message.tokenOut; return obj; }, fromAminoMsg(object: EstimateSinglePoolSwapExactAmountOutRequestAminoMsg): EstimateSinglePoolSwapExactAmountOutRequest { @@ -1067,7 +1067,7 @@ export const EstimateSwapExactAmountOutResponse = { }, toAmino(message: EstimateSwapExactAmountOutResponse): EstimateSwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: EstimateSwapExactAmountOutResponseAminoMsg): EstimateSwapExactAmountOutResponse { @@ -1234,7 +1234,7 @@ export const NumPoolsResponse = { }, toAmino(message: NumPoolsResponse): NumPoolsResponseAmino { const obj: any = {}; - obj.num_pools = message.numPools ? message.numPools.toString() : undefined; + obj.num_pools = message.numPools !== BigInt(0) ? message.numPools.toString() : undefined; return obj; }, fromAminoMsg(object: NumPoolsResponseAminoMsg): NumPoolsResponse { @@ -1328,7 +1328,7 @@ export const PoolRequest = { }, toAmino(message: PoolRequest): PoolRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: PoolRequestAminoMsg): PoolRequest { @@ -1516,7 +1516,7 @@ export const AllPoolsRequest = { }, toAmino(message: AllPoolsRequest): AllPoolsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: AllPoolsRequestAminoMsg): AllPoolsRequest { @@ -1619,7 +1619,7 @@ export const AllPoolsResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } return obj; }, @@ -1746,9 +1746,9 @@ export const SpotPriceRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromAminoMsg(object: SpotPriceRequestAminoMsg): SpotPriceRequest { @@ -1842,7 +1842,7 @@ export const SpotPriceResponse = { }, toAmino(message: SpotPriceResponse): SpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: SpotPriceResponseAminoMsg): SpotPriceResponse { 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 8500f18dad..5f638d47b7 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/swap_route.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/swap_route.ts @@ -110,8 +110,8 @@ export const SwapAmountInRoute = { }, toAmino(message: SwapAmountInRoute): SwapAmountInRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_out_denom = message.tokenOutDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; return obj; }, fromAminoMsg(object: SwapAmountInRouteAminoMsg): SwapAmountInRoute { @@ -221,8 +221,8 @@ export const SwapAmountOutRoute = { }, toAmino(message: SwapAmountOutRoute): SwapAmountOutRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_in_denom = message.tokenInDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; return obj; }, fromAminoMsg(object: SwapAmountOutRouteAminoMsg): SwapAmountOutRoute { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/tx.ts index e56eb61b7a..2193494703 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/tx.ts @@ -182,14 +182,14 @@ export const MsgSwapExactAmountIn = { }, toAmino(message: MsgSwapExactAmountIn): MsgSwapExactAmountInAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; - obj.token_out_min_amount = message.tokenOutMinAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInAminoMsg): MsgSwapExactAmountIn { @@ -283,7 +283,7 @@ export const MsgSwapExactAmountInResponse = { }, toAmino(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInResponseAminoMsg): MsgSwapExactAmountInResponse { @@ -431,13 +431,13 @@ export const MsgSwapExactAmountOut = { }, toAmino(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_in_max_amount = message.tokenInMaxAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; return obj; }, @@ -532,7 +532,7 @@ export const MsgSwapExactAmountOutResponse = { }, toAmino(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountOutResponseAminoMsg): MsgSwapExactAmountOutResponse { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/genesis.ts index e9e64bd2cb..0e5ba65f58 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/genesis.ts @@ -310,25 +310,25 @@ export const GenesisState = { if (message.tokenPairArbRoutes) { obj.token_pair_arb_routes = message.tokenPairArbRoutes.map(e => e ? TokenPairArbRoutes.toAmino(e) : undefined); } else { - obj.token_pair_arb_routes = []; + obj.token_pair_arb_routes = message.tokenPairArbRoutes; } if (message.baseDenoms) { obj.base_denoms = message.baseDenoms.map(e => e ? BaseDenom.toAmino(e) : undefined); } else { - obj.base_denoms = []; + obj.base_denoms = message.baseDenoms; } obj.pool_weights = message.poolWeights ? PoolWeights.toAmino(message.poolWeights) : undefined; - obj.days_since_module_genesis = message.daysSinceModuleGenesis ? message.daysSinceModuleGenesis.toString() : undefined; + obj.days_since_module_genesis = message.daysSinceModuleGenesis !== BigInt(0) ? message.daysSinceModuleGenesis.toString() : undefined; if (message.developerFees) { obj.developer_fees = message.developerFees.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.developer_fees = []; + obj.developer_fees = message.developerFees; } - 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; + obj.latest_block_height = message.latestBlockHeight !== BigInt(0) ? message.latestBlockHeight.toString() : undefined; + obj.developer_address = message.developerAddress === "" ? undefined : message.developerAddress; + obj.max_pool_points_per_block = message.maxPoolPointsPerBlock !== BigInt(0) ? message.maxPoolPointsPerBlock.toString() : undefined; + obj.max_pool_points_per_tx = message.maxPoolPointsPerTx !== BigInt(0) ? message.maxPoolPointsPerTx.toString() : undefined; + obj.point_count_for_block = message.pointCountForBlock !== BigInt(0) ? message.pointCountForBlock.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/gov.ts b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/gov.ts index 3f0f1548fe..fd7cb68c99 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/gov.ts @@ -148,9 +148,9 @@ export const SetProtoRevEnabledProposal = { }, toAmino(message: SetProtoRevEnabledProposal): SetProtoRevEnabledProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.enabled = message.enabled; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.enabled = message.enabled === false ? undefined : message.enabled; return obj; }, fromAminoMsg(object: SetProtoRevEnabledProposalAminoMsg): SetProtoRevEnabledProposal { @@ -276,9 +276,9 @@ export const SetProtoRevAdminAccountProposal = { }, toAmino(message: SetProtoRevAdminAccountProposal): SetProtoRevAdminAccountProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.account = message.account; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.account = message.account === "" ? undefined : message.account; return obj; }, fromAminoMsg(object: SetProtoRevAdminAccountProposalAminoMsg): SetProtoRevAdminAccountProposal { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/params.ts index d20ce76b9c..18dbf357c7 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/params.ts @@ -102,8 +102,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enabled = message.enabled; - obj.admin = message.admin; + obj.enabled = message.enabled === false ? undefined : message.enabled; + obj.admin = message.admin === "" ? undefined : message.admin; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/protorev.ts b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/protorev.ts index 7017e3770d..c33bed0152 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/protorev.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/protorev.ts @@ -258,10 +258,10 @@ export const TokenPairArbRoutes = { if (message.arbRoutes) { obj.arb_routes = message.arbRoutes.map(e => e ? Route.toAmino(e) : undefined); } else { - obj.arb_routes = []; + obj.arb_routes = message.arbRoutes; } - obj.token_in = message.tokenIn; - obj.token_out = message.tokenOut; + obj.token_in = message.tokenIn === "" ? undefined : message.tokenIn; + obj.token_out = message.tokenOut === "" ? undefined : message.tokenOut; return obj; }, fromAminoMsg(object: TokenPairArbRoutesAminoMsg): TokenPairArbRoutes { @@ -380,9 +380,9 @@ export const Route = { if (message.trades) { obj.trades = message.trades.map(e => e ? Trade.toAmino(e) : undefined); } else { - obj.trades = []; + obj.trades = message.trades; } - obj.step_size = message.stepSize; + obj.step_size = message.stepSize === "" ? undefined : message.stepSize; return obj; }, fromAminoMsg(object: RouteAminoMsg): Route { @@ -508,9 +508,9 @@ export const Trade = { }, 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; + obj.pool = message.pool !== BigInt(0) ? message.pool.toString() : undefined; + obj.token_in = message.tokenIn === "" ? undefined : message.tokenIn; + obj.token_out = message.tokenOut === "" ? undefined : message.tokenOut; return obj; }, fromAminoMsg(object: TradeAminoMsg): Trade { @@ -660,13 +660,13 @@ export const RouteStatistics = { if (message.profits) { obj.profits = message.profits.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.profits = []; + obj.profits = message.profits; } - obj.number_of_trades = message.numberOfTrades; + obj.number_of_trades = message.numberOfTrades === "" ? undefined : message.numberOfTrades; if (message.route) { obj.route = message.route.map(e => e.toString()); } else { - obj.route = []; + obj.route = message.route; } return obj; }, @@ -793,9 +793,9 @@ export const PoolWeights = { }, 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; + obj.stable_weight = message.stableWeight !== BigInt(0) ? message.stableWeight.toString() : undefined; + obj.balancer_weight = message.balancerWeight !== BigInt(0) ? message.balancerWeight.toString() : undefined; + obj.concentrated_weight = message.concentratedWeight !== BigInt(0) ? message.concentratedWeight.toString() : undefined; return obj; }, fromAminoMsg(object: PoolWeightsAminoMsg): PoolWeights { @@ -905,8 +905,8 @@ export const BaseDenom = { }, toAmino(message: BaseDenom): BaseDenomAmino { const obj: any = {}; - obj.denom = message.denom; - obj.step_size = message.stepSize; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.step_size = message.stepSize === "" ? undefined : message.stepSize; return obj; }, fromAminoMsg(object: BaseDenomAminoMsg): BaseDenom { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/query.ts index de12a6c3ab..f1a6ef31bf 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/query.ts @@ -788,7 +788,7 @@ export const QueryGetProtoRevNumberOfTradesResponse = { }, toAmino(message: QueryGetProtoRevNumberOfTradesResponse): QueryGetProtoRevNumberOfTradesResponseAmino { const obj: any = {}; - obj.number_of_trades = message.numberOfTrades; + obj.number_of_trades = message.numberOfTrades === "" ? undefined : message.numberOfTrades; return obj; }, fromAminoMsg(object: QueryGetProtoRevNumberOfTradesResponseAminoMsg): QueryGetProtoRevNumberOfTradesResponse { @@ -882,7 +882,7 @@ export const QueryGetProtoRevProfitsByDenomRequest = { }, toAmino(message: QueryGetProtoRevProfitsByDenomRequest): QueryGetProtoRevProfitsByDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryGetProtoRevProfitsByDenomRequestAminoMsg): QueryGetProtoRevProfitsByDenomRequest { @@ -1152,7 +1152,7 @@ export const QueryGetProtoRevAllProfitsResponse = { if (message.profits) { obj.profits = message.profits.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.profits = []; + obj.profits = message.profits; } return obj; }, @@ -1265,7 +1265,7 @@ export const QueryGetProtoRevStatisticsByRouteRequest = { if (message.route) { obj.route = message.route.map(e => e.toString()); } else { - obj.route = []; + obj.route = message.route; } return obj; }, @@ -1536,7 +1536,7 @@ export const QueryGetProtoRevAllRouteStatisticsResponse = { if (message.statistics) { obj.statistics = message.statistics.map(e => e ? RouteStatistics.toAmino(e) : undefined); } else { - obj.statistics = []; + obj.statistics = message.statistics; } return obj; }, @@ -1713,7 +1713,7 @@ export const QueryGetProtoRevTokenPairArbRoutesResponse = { if (message.routes) { obj.routes = message.routes.map(e => e ? TokenPairArbRoutes.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } return obj; }, @@ -1881,7 +1881,7 @@ export const QueryGetProtoRevAdminAccountResponse = { }, toAmino(message: QueryGetProtoRevAdminAccountResponse): QueryGetProtoRevAdminAccountResponseAmino { const obj: any = {}; - obj.admin_account = message.adminAccount; + obj.admin_account = message.adminAccount === "" ? undefined : message.adminAccount; return obj; }, fromAminoMsg(object: QueryGetProtoRevAdminAccountResponseAminoMsg): QueryGetProtoRevAdminAccountResponse { @@ -2048,7 +2048,7 @@ export const QueryGetProtoRevDeveloperAccountResponse = { }, toAmino(message: QueryGetProtoRevDeveloperAccountResponse): QueryGetProtoRevDeveloperAccountResponseAmino { const obj: any = {}; - obj.developer_account = message.developerAccount; + obj.developer_account = message.developerAccount === "" ? undefined : message.developerAccount; return obj; }, fromAminoMsg(object: QueryGetProtoRevDeveloperAccountResponseAminoMsg): QueryGetProtoRevDeveloperAccountResponse { @@ -2382,7 +2382,7 @@ export const QueryGetProtoRevMaxPoolPointsPerBlockResponse = { }, toAmino(message: QueryGetProtoRevMaxPoolPointsPerBlockResponse): QueryGetProtoRevMaxPoolPointsPerBlockResponseAmino { const obj: any = {}; - obj.max_pool_points_per_block = message.maxPoolPointsPerBlock ? message.maxPoolPointsPerBlock.toString() : undefined; + obj.max_pool_points_per_block = message.maxPoolPointsPerBlock !== BigInt(0) ? message.maxPoolPointsPerBlock.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGetProtoRevMaxPoolPointsPerBlockResponseAminoMsg): QueryGetProtoRevMaxPoolPointsPerBlockResponse { @@ -2549,7 +2549,7 @@ export const QueryGetProtoRevMaxPoolPointsPerTxResponse = { }, toAmino(message: QueryGetProtoRevMaxPoolPointsPerTxResponse): QueryGetProtoRevMaxPoolPointsPerTxResponseAmino { const obj: any = {}; - obj.max_pool_points_per_tx = message.maxPoolPointsPerTx ? message.maxPoolPointsPerTx.toString() : undefined; + obj.max_pool_points_per_tx = message.maxPoolPointsPerTx !== BigInt(0) ? message.maxPoolPointsPerTx.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGetProtoRevMaxPoolPointsPerTxResponseAminoMsg): QueryGetProtoRevMaxPoolPointsPerTxResponse { @@ -2725,7 +2725,7 @@ export const QueryGetProtoRevBaseDenomsResponse = { if (message.baseDenoms) { obj.base_denoms = message.baseDenoms.map(e => e ? BaseDenom.toAmino(e) : undefined); } else { - obj.base_denoms = []; + obj.base_denoms = message.baseDenoms; } return obj; }, @@ -2893,7 +2893,7 @@ export const QueryGetProtoRevEnabledResponse = { }, toAmino(message: QueryGetProtoRevEnabledResponse): QueryGetProtoRevEnabledResponseAmino { const obj: any = {}; - obj.enabled = message.enabled; + obj.enabled = message.enabled === false ? undefined : message.enabled; return obj; }, fromAminoMsg(object: QueryGetProtoRevEnabledResponseAminoMsg): QueryGetProtoRevEnabledResponse { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/tx.ts index f7cdae4aca..ed44edea78 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/tx.ts @@ -273,11 +273,11 @@ export const MsgSetHotRoutes = { }, toAmino(message: MsgSetHotRoutes): MsgSetHotRoutesAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.hotRoutes) { obj.hot_routes = message.hotRoutes.map(e => e ? TokenPairArbRoutes.toAmino(e) : undefined); } else { - obj.hot_routes = []; + obj.hot_routes = message.hotRoutes; } return obj; }, @@ -461,8 +461,8 @@ export const MsgSetDeveloperAccount = { }, toAmino(message: MsgSetDeveloperAccount): MsgSetDeveloperAccountAmino { const obj: any = {}; - obj.admin = message.admin; - obj.developer_account = message.developerAccount; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.developer_account = message.developerAccount === "" ? undefined : message.developerAccount; return obj; }, fromAminoMsg(object: MsgSetDeveloperAccountAminoMsg): MsgSetDeveloperAccount { @@ -645,7 +645,7 @@ export const MsgSetPoolWeights = { }, toAmino(message: MsgSetPoolWeights): MsgSetPoolWeightsAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pool_weights = message.poolWeights ? PoolWeights.toAmino(message.poolWeights) : undefined; return obj; }, @@ -829,8 +829,8 @@ export const MsgSetMaxPoolPointsPerTx = { }, toAmino(message: MsgSetMaxPoolPointsPerTx): MsgSetMaxPoolPointsPerTxAmino { const obj: any = {}; - obj.admin = message.admin; - obj.max_pool_points_per_tx = message.maxPoolPointsPerTx ? message.maxPoolPointsPerTx.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.max_pool_points_per_tx = message.maxPoolPointsPerTx !== BigInt(0) ? message.maxPoolPointsPerTx.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSetMaxPoolPointsPerTxAminoMsg): MsgSetMaxPoolPointsPerTx { @@ -1013,8 +1013,8 @@ export const MsgSetMaxPoolPointsPerBlock = { }, toAmino(message: MsgSetMaxPoolPointsPerBlock): MsgSetMaxPoolPointsPerBlockAmino { const obj: any = {}; - obj.admin = message.admin; - obj.max_pool_points_per_block = message.maxPoolPointsPerBlock ? message.maxPoolPointsPerBlock.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.max_pool_points_per_block = message.maxPoolPointsPerBlock !== BigInt(0) ? message.maxPoolPointsPerBlock.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSetMaxPoolPointsPerBlockAminoMsg): MsgSetMaxPoolPointsPerBlock { @@ -1203,11 +1203,11 @@ export const MsgSetBaseDenoms = { }, toAmino(message: MsgSetBaseDenoms): MsgSetBaseDenomsAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.baseDenoms) { obj.base_denoms = message.baseDenoms.map(e => e ? BaseDenom.toAmino(e) : undefined); } else { - obj.base_denoms = []; + obj.base_denoms = message.baseDenoms; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/sumtree/v1beta1/tree.ts b/__fixtures__/v-next/outputosmojs/osmosis/sumtree/v1beta1/tree.ts index f1ebb44a18..90d2c0b6cf 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/sumtree/v1beta1/tree.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/sumtree/v1beta1/tree.ts @@ -111,7 +111,7 @@ export const Node = { if (message.children) { obj.children = message.children.map(e => e ? Child.toAmino(e) : undefined); } else { - obj.children = []; + obj.children = message.children; } return obj; }, @@ -223,7 +223,7 @@ export const Child = { toAmino(message: Child): ChildAmino { const obj: any = {}; obj.index = message.index ? base64FromBytes(message.index) : undefined; - obj.accumulation = message.accumulation; + obj.accumulation = message.accumulation === "" ? undefined : message.accumulation; return obj; }, fromAminoMsg(object: ChildAminoMsg): Child { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/genesis.ts index b4b46d1883..06c92087ed 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/genesis.ts @@ -196,22 +196,22 @@ export const GenesisState = { if (message.superfluidAssets) { obj.superfluid_assets = message.superfluidAssets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.superfluid_assets = []; + obj.superfluid_assets = message.superfluidAssets; } if (message.osmoEquivalentMultipliers) { obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers.map(e => e ? OsmoEquivalentMultiplierRecord.toAmino(e) : undefined); } else { - obj.osmo_equivalent_multipliers = []; + obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers; } if (message.intermediaryAccounts) { obj.intermediary_accounts = message.intermediaryAccounts.map(e => e ? SuperfluidIntermediaryAccount.toAmino(e) : undefined); } else { - obj.intermediary_accounts = []; + obj.intermediary_accounts = message.intermediaryAccounts; } if (message.intemediaryAccountConnections) { obj.intemediary_account_connections = message.intemediaryAccountConnections.map(e => e ? LockIdIntermediaryAccountConnection.toAmino(e) : undefined); } else { - obj.intemediary_account_connections = []; + obj.intemediary_account_connections = message.intemediaryAccountConnections; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/params.ts index f424903f32..73962b5c62 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/params.ts @@ -89,7 +89,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.minimum_risk_factor = message.minimumRiskFactor; + obj.minimum_risk_factor = message.minimumRiskFactor === "" ? undefined : message.minimumRiskFactor; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/query.ts index 9dd25db146..ed423009b5 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/query.ts @@ -584,7 +584,7 @@ export const AssetTypeRequest = { }, toAmino(message: AssetTypeRequest): AssetTypeRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AssetTypeRequestAminoMsg): AssetTypeRequest { @@ -672,13 +672,13 @@ export const AssetTypeResponse = { fromAmino(object: AssetTypeResponseAmino): AssetTypeResponse { const message = createBaseAssetTypeResponse(); if (object.asset_type !== undefined && object.asset_type !== null) { - message.assetType = superfluidAssetTypeFromJSON(object.asset_type); + message.assetType = object.asset_type; } return message; }, toAmino(message: AssetTypeResponse): AssetTypeResponseAmino { const obj: any = {}; - obj.asset_type = message.assetType; + obj.asset_type = message.assetType === 0 ? undefined : message.assetType; return obj; }, fromAminoMsg(object: AssetTypeResponseAminoMsg): AssetTypeResponse { @@ -854,7 +854,7 @@ export const AllAssetsResponse = { if (message.assets) { obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -949,7 +949,7 @@ export const AssetMultiplierRequest = { }, toAmino(message: AssetMultiplierRequest): AssetMultiplierRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AssetMultiplierRequestAminoMsg): AssetMultiplierRequest { @@ -1185,10 +1185,10 @@ export const SuperfluidIntermediaryAccountInfo = { }, 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; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: SuperfluidIntermediaryAccountInfoAminoMsg): SuperfluidIntermediaryAccountInfo { @@ -1401,7 +1401,7 @@ export const AllIntermediaryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? SuperfluidIntermediaryAccountInfo.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1497,7 +1497,7 @@ export const ConnectedIntermediaryAccountRequest = { }, toAmino(message: ConnectedIntermediaryAccountRequest): ConnectedIntermediaryAccountRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: ConnectedIntermediaryAccountRequestAminoMsg): ConnectedIntermediaryAccountRequest { @@ -1685,7 +1685,7 @@ export const QueryTotalDelegationByValidatorForDenomRequest = { }, toAmino(message: QueryTotalDelegationByValidatorForDenomRequest): QueryTotalDelegationByValidatorForDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryTotalDelegationByValidatorForDenomRequestAminoMsg): QueryTotalDelegationByValidatorForDenomRequest { @@ -1788,7 +1788,7 @@ export const QueryTotalDelegationByValidatorForDenomResponse = { if (message.assets) { obj.assets = message.assets.map(e => e ? Delegations.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -1915,9 +1915,9 @@ export const Delegations = { }, toAmino(message: Delegations): DelegationsAmino { const obj: any = {}; - obj.val_addr = message.valAddr; - obj.amount_sfsd = message.amountSfsd; - obj.osmo_equivalent = message.osmoEquivalent; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.amount_sfsd = message.amountSfsd === "" ? undefined : message.amountSfsd; + obj.osmo_equivalent = message.osmoEquivalent === "" ? undefined : message.osmoEquivalent; return obj; }, fromAminoMsg(object: DelegationsAminoMsg): Delegations { @@ -2084,7 +2084,7 @@ export const TotalSuperfluidDelegationsResponse = { }, toAmino(message: TotalSuperfluidDelegationsResponse): TotalSuperfluidDelegationsResponseAmino { const obj: any = {}; - obj.total_delegations = message.totalDelegations; + obj.total_delegations = message.totalDelegations === "" ? undefined : message.totalDelegations; return obj; }, fromAminoMsg(object: TotalSuperfluidDelegationsResponseAminoMsg): TotalSuperfluidDelegationsResponse { @@ -2210,9 +2210,9 @@ export const SuperfluidDelegationAmountRequest = { }, toAmino(message: SuperfluidDelegationAmountRequest): SuperfluidDelegationAmountRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidDelegationAmountRequestAminoMsg): SuperfluidDelegationAmountRequest { @@ -2315,7 +2315,7 @@ export const SuperfluidDelegationAmountResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -2410,7 +2410,7 @@ export const SuperfluidDelegationsByDelegatorRequest = { }, toAmino(message: SuperfluidDelegationsByDelegatorRequest): SuperfluidDelegationsByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: SuperfluidDelegationsByDelegatorRequestAminoMsg): SuperfluidDelegationsByDelegatorRequest { @@ -2551,12 +2551,12 @@ export const SuperfluidDelegationsByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined; return obj; @@ -2668,8 +2668,8 @@ export const SuperfluidUndelegationsByDelegatorRequest = { }, toAmino(message: SuperfluidUndelegationsByDelegatorRequest): SuperfluidUndelegationsByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.denom = message.denom; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidUndelegationsByDelegatorRequestAminoMsg): SuperfluidUndelegationsByDelegatorRequest { @@ -2816,17 +2816,17 @@ export const SuperfluidUndelegationsByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.totalUndelegatedCoins) { obj.total_undelegated_coins = message.totalUndelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_undelegated_coins = []; + obj.total_undelegated_coins = message.totalUndelegatedCoins; } if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, @@ -2937,8 +2937,8 @@ export const SuperfluidDelegationsByValidatorDenomRequest = { }, toAmino(message: SuperfluidDelegationsByValidatorDenomRequest): SuperfluidDelegationsByValidatorDenomRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidDelegationsByValidatorDenomRequestAminoMsg): SuperfluidDelegationsByValidatorDenomRequest { @@ -3041,7 +3041,7 @@ export const SuperfluidDelegationsByValidatorDenomResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } return obj; }, @@ -3152,8 +3152,8 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomRequest = { }, toAmino(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest): EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAminoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomRequest { @@ -3256,7 +3256,7 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomResponse = { if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } return obj; }, @@ -3351,7 +3351,7 @@ export const QueryTotalDelegationByDelegatorRequest = { }, toAmino(message: QueryTotalDelegationByDelegatorRequest): QueryTotalDelegationByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryTotalDelegationByDelegatorRequestAminoMsg): QueryTotalDelegationByDelegatorRequest { @@ -3514,17 +3514,17 @@ export const QueryTotalDelegationByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.delegationResponse) { obj.delegation_response = message.delegationResponse.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_response = []; + obj.delegation_response = message.delegationResponse; } if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined; return obj; @@ -3711,7 +3711,7 @@ export const QueryUnpoolWhitelistResponse = { if (message.poolIds) { obj.pool_ids = message.poolIds.map(e => e.toString()); } else { - obj.pool_ids = []; + obj.pool_ids = message.poolIds; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/superfluid.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/superfluid.ts index cab9d58068..c714e8ef0a 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/superfluid.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/superfluid.ts @@ -250,14 +250,14 @@ export const SuperfluidAsset = { message.denom = object.denom; } if (object.asset_type !== undefined && object.asset_type !== null) { - message.assetType = superfluidAssetTypeFromJSON(object.asset_type); + message.assetType = object.asset_type; } return message; }, toAmino(message: SuperfluidAsset): SuperfluidAssetAmino { const obj: any = {}; - obj.denom = message.denom; - obj.asset_type = message.assetType; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.asset_type = message.assetType === 0 ? undefined : message.assetType; return obj; }, fromAminoMsg(object: SuperfluidAssetAminoMsg): SuperfluidAsset { @@ -383,9 +383,9 @@ export const SuperfluidIntermediaryAccount = { }, 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; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: SuperfluidIntermediaryAccountAminoMsg): SuperfluidIntermediaryAccount { @@ -511,9 +511,9 @@ export const OsmoEquivalentMultiplierRecord = { }, toAmino(message: OsmoEquivalentMultiplierRecord): OsmoEquivalentMultiplierRecordAmino { const obj: any = {}; - obj.epoch_number = message.epochNumber ? message.epochNumber.toString() : undefined; - obj.denom = message.denom; - obj.multiplier = message.multiplier; + obj.epoch_number = message.epochNumber !== BigInt(0) ? message.epochNumber.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.multiplier = message.multiplier === "" ? undefined : message.multiplier; return obj; }, fromAminoMsg(object: OsmoEquivalentMultiplierRecordAminoMsg): OsmoEquivalentMultiplierRecord { @@ -655,8 +655,8 @@ export const SuperfluidDelegationRecord = { }, toAmino(message: SuperfluidDelegationRecord): SuperfluidDelegationRecordAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : 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; @@ -768,8 +768,8 @@ export const LockIdIntermediaryAccountConnection = { }, toAmino(message: LockIdIntermediaryAccountConnection): LockIdIntermediaryAccountConnectionAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; - obj.intermediary_account = message.intermediaryAccount; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; + obj.intermediary_account = message.intermediaryAccount === "" ? undefined : message.intermediaryAccount; return obj; }, fromAminoMsg(object: LockIdIntermediaryAccountConnectionAminoMsg): LockIdIntermediaryAccountConnection { @@ -881,7 +881,7 @@ export const UnpoolWhitelistedPools = { if (message.ids) { obj.ids = message.ids.map(e => e.toString()); } else { - obj.ids = []; + obj.ids = message.ids; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/tx.ts index 7cda42ac38..21692ec61f 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/tx.ts @@ -235,9 +235,9 @@ export const MsgSuperfluidDelegate = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; return obj; }, fromAminoMsg(object: MsgSuperfluidDelegateAminoMsg): MsgSuperfluidDelegate { @@ -420,8 +420,8 @@ export const MsgSuperfluidUndelegate = { }, toAmino(message: MsgSuperfluidUndelegate): MsgSuperfluidUndelegateAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSuperfluidUndelegateAminoMsg): MsgSuperfluidUndelegate { @@ -604,8 +604,8 @@ export const MsgSuperfluidUnbondLock = { }, toAmino(message: MsgSuperfluidUnbondLock): MsgSuperfluidUnbondLockAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSuperfluidUnbondLockAminoMsg): MsgSuperfluidUnbondLock { @@ -810,13 +810,13 @@ export const MsgLockAndSuperfluidDelegate = { }, toAmino(message: MsgLockAndSuperfluidDelegate): MsgLockAndSuperfluidDelegateAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } - obj.val_addr = message.valAddr; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateAminoMsg): MsgLockAndSuperfluidDelegate { @@ -910,7 +910,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, toAmino(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateResponseAminoMsg): MsgLockAndSuperfluidDelegateResponse { @@ -1020,8 +1020,8 @@ export const MsgUnPoolWhitelistedPool = { }, toAmino(message: MsgUnPoolWhitelistedPool): MsgUnPoolWhitelistedPoolAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgUnPoolWhitelistedPoolAminoMsg): MsgUnPoolWhitelistedPool { @@ -1133,7 +1133,7 @@ export const MsgUnPoolWhitelistedPoolResponse = { if (message.exitedLockIds) { obj.exited_lock_ids = message.exitedLockIds.map(e => e.toString()); } else { - obj.exited_lock_ids = []; + obj.exited_lock_ids = message.exitedLockIds; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/v1beta1/gov.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/v1beta1/gov.ts index 16da0d9396..f3873b0a02 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/v1beta1/gov.ts @@ -177,12 +177,12 @@ export const SetSuperfluidAssetsProposal = { }, toAmino(message: SetSuperfluidAssetsProposal): SetSuperfluidAssetsProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.assets) { obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -315,12 +315,12 @@ export const RemoveSuperfluidAssetsProposal = { }, toAmino(message: RemoveSuperfluidAssetsProposal): RemoveSuperfluidAssetsProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.superfluidAssetDenoms) { obj.superfluid_asset_denoms = message.superfluidAssetDenoms.map(e => e); } else { - obj.superfluid_asset_denoms = []; + obj.superfluid_asset_denoms = message.superfluidAssetDenoms; } return obj; }, @@ -478,14 +478,14 @@ export const UpdateUnpoolWhiteListProposal = { }, toAmino(message: UpdateUnpoolWhiteListProposal): UpdateUnpoolWhiteListProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.ids) { obj.ids = message.ids.map(e => e.toString()); } else { - obj.ids = []; + obj.ids = message.ids; } - obj.is_overwrite = message.isOverwrite; + obj.is_overwrite = message.isOverwrite === false ? undefined : message.isOverwrite; return obj; }, fromAminoMsg(object: UpdateUnpoolWhiteListProposalAminoMsg): UpdateUnpoolWhiteListProposal { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/authorityMetadata.ts b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/authorityMetadata.ts index a47a4a3ac8..5e13243017 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/authorityMetadata.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/authorityMetadata.ts @@ -91,7 +91,7 @@ export const DenomAuthorityMetadata = { }, toAmino(message: DenomAuthorityMetadata): DenomAuthorityMetadataAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; return obj; }, fromAminoMsg(object: DenomAuthorityMetadataAminoMsg): DenomAuthorityMetadata { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/genesis.ts index 90cb04c1d1..07808d716b 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/genesis.ts @@ -135,7 +135,7 @@ export const GenesisState = { if (message.factoryDenoms) { obj.factory_denoms = message.factoryDenoms.map(e => e ? GenesisDenom.toAmino(e) : undefined); } else { - obj.factory_denoms = []; + obj.factory_denoms = message.factoryDenoms; } return obj; }, @@ -246,7 +246,7 @@ export const GenesisDenom = { }, toAmino(message: GenesisDenom): GenesisDenomAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.authority_metadata = message.authorityMetadata ? DenomAuthorityMetadata.toAmino(message.authorityMetadata) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/params.ts index 26906d421b..38a257f0db 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/params.ts @@ -92,7 +92,7 @@ export const Params = { if (message.denomCreationFee) { obj.denom_creation_fee = message.denomCreationFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.denom_creation_fee = []; + obj.denom_creation_fee = message.denomCreationFee; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/query.ts index c49fb188d5..c30168573a 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/query.ts @@ -332,7 +332,7 @@ export const QueryDenomAuthorityMetadataRequest = { }, toAmino(message: QueryDenomAuthorityMetadataRequest): QueryDenomAuthorityMetadataRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomAuthorityMetadataRequestAminoMsg): QueryDenomAuthorityMetadataRequest { @@ -520,7 +520,7 @@ export const QueryDenomsFromCreatorRequest = { }, toAmino(message: QueryDenomsFromCreatorRequest): QueryDenomsFromCreatorRequestAmino { const obj: any = {}; - obj.creator = message.creator; + obj.creator = message.creator === "" ? undefined : message.creator; return obj; }, fromAminoMsg(object: QueryDenomsFromCreatorRequestAminoMsg): QueryDenomsFromCreatorRequest { @@ -623,7 +623,7 @@ export const QueryDenomsFromCreatorResponse = { if (message.denoms) { obj.denoms = message.denoms.map(e => e); } else { - obj.denoms = []; + obj.denoms = message.denoms; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/tx.ts index 0372837900..521762710c 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/tx.ts @@ -263,8 +263,8 @@ export const MsgCreateDenom = { }, toAmino(message: MsgCreateDenom): MsgCreateDenomAmino { const obj: any = {}; - obj.sender = message.sender; - obj.subdenom = message.subdenom; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.subdenom = message.subdenom === "" ? undefined : message.subdenom; return obj; }, fromAminoMsg(object: MsgCreateDenomAminoMsg): MsgCreateDenom { @@ -358,7 +358,7 @@ export const MsgCreateDenomResponse = { }, toAmino(message: MsgCreateDenomResponse): MsgCreateDenomResponseAmino { const obj: any = {}; - obj.new_token_denom = message.newTokenDenom; + obj.new_token_denom = message.newTokenDenom === "" ? undefined : message.newTokenDenom; return obj; }, fromAminoMsg(object: MsgCreateDenomResponseAminoMsg): MsgCreateDenomResponse { @@ -468,7 +468,7 @@ export const MsgMint = { }, toAmino(message: MsgMint): MsgMintAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -652,7 +652,7 @@ export const MsgBurn = { }, toAmino(message: MsgBurn): MsgBurnAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -852,9 +852,9 @@ export const MsgChangeAdmin = { }, toAmino(message: MsgChangeAdmin): MsgChangeAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.denom = message.denom; - obj.new_admin = message.newAdmin; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgChangeAdminAminoMsg): MsgChangeAdmin { @@ -1037,7 +1037,7 @@ export const MsgSetDenomMetadata = { }, toAmino(message: MsgSetDenomMetadata): MsgSetDenomMetadataAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/genesis.ts index 47614f9425..f99d2de274 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/genesis.ts @@ -118,7 +118,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.prune_epoch_identifier = message.pruneEpochIdentifier; + obj.prune_epoch_identifier = message.pruneEpochIdentifier === "" ? undefined : message.pruneEpochIdentifier; obj.record_history_keep_period = message.recordHistoryKeepPeriod ? Duration.toAmino(message.recordHistoryKeepPeriod) : undefined; return obj; }, @@ -238,7 +238,7 @@ export const GenesisState = { if (message.twaps) { obj.twaps = message.twaps.map(e => e ? TwapRecord.toAmino(e) : undefined); } else { - obj.twaps = []; + obj.twaps = message.twaps; } obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/query.ts index c390874eeb..ed52e74842 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/query.ts @@ -207,9 +207,9 @@ export const ArithmeticTwapRequest = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset === "" ? undefined : message.baseAsset; + obj.quote_asset = message.quoteAsset === "" ? undefined : message.quoteAsset; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; return obj; @@ -305,7 +305,7 @@ export const ArithmeticTwapResponse = { }, toAmino(message: ArithmeticTwapResponse): ArithmeticTwapResponseAmino { const obj: any = {}; - obj.arithmetic_twap = message.arithmeticTwap; + obj.arithmetic_twap = message.arithmeticTwap === "" ? undefined : message.arithmeticTwap; return obj; }, fromAminoMsg(object: ArithmeticTwapResponseAminoMsg): ArithmeticTwapResponse { @@ -447,9 +447,9 @@ export const ArithmeticTwapToNowRequest = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset === "" ? undefined : message.baseAsset; + obj.quote_asset = message.quoteAsset === "" ? undefined : message.quoteAsset; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, @@ -544,7 +544,7 @@ export const ArithmeticTwapToNowResponse = { }, toAmino(message: ArithmeticTwapToNowResponse): ArithmeticTwapToNowResponseAmino { const obj: any = {}; - obj.arithmetic_twap = message.arithmeticTwap; + obj.arithmetic_twap = message.arithmeticTwap === "" ? undefined : message.arithmeticTwap; return obj; }, fromAminoMsg(object: ArithmeticTwapToNowResponseAminoMsg): ArithmeticTwapToNowResponse { 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 d165b0d5d9..24298d3669 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/twap_record.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/twap_record.ts @@ -278,15 +278,15 @@ export const TwapRecord = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.asset0_denom = message.asset0Denom === "" ? undefined : message.asset0Denom; + obj.asset1_denom = message.asset1Denom === "" ? undefined : message.asset1Denom; + obj.height = message.height ? message.height.toString() : "0"; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - 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.p0_last_spot_price = message.p0LastSpotPrice === "" ? undefined : message.p0LastSpotPrice; + obj.p1_last_spot_price = message.p1LastSpotPrice === "" ? undefined : message.p1LastSpotPrice; + obj.p0_arithmetic_twap_accumulator = message.p0ArithmeticTwapAccumulator === "" ? undefined : message.p0ArithmeticTwapAccumulator; + obj.p1_arithmetic_twap_accumulator = message.p1ArithmeticTwapAccumulator === "" ? undefined : message.p1ArithmeticTwapAccumulator; obj.last_error_time = message.lastErrorTime ? Timestamp.toAmino(toTimestamp(message.lastErrorTime)) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/feetoken.ts b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/feetoken.ts index a0b7d9ae6d..d2ed1dbbd5 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/feetoken.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/feetoken.ts @@ -110,8 +110,8 @@ export const FeeToken = { }, toAmino(message: FeeToken): FeeTokenAmino { const obj: any = {}; - obj.denom = message.denom; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; return obj; }, fromAminoMsg(object: FeeTokenAminoMsg): FeeToken { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/genesis.ts index 73d064549b..86bc39cd02 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/genesis.ts @@ -107,11 +107,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.basedenom = message.basedenom; + obj.basedenom = message.basedenom === "" ? undefined : message.basedenom; if (message.feetokens) { obj.feetokens = message.feetokens.map(e => e ? FeeToken.toAmino(e) : undefined); } else { - obj.feetokens = []; + obj.feetokens = message.feetokens; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/gov.ts b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/gov.ts index 69538bcac0..1fe1932611 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/gov.ts @@ -131,8 +131,8 @@ export const UpdateFeeTokenProposal = { }, toAmino(message: UpdateFeeTokenProposal): UpdateFeeTokenProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.feetoken = message.feetoken ? FeeToken.toAmino(message.feetoken) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/query.ts index cf1d8a349f..bafe35bc59 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/query.ts @@ -244,7 +244,7 @@ export const QueryFeeTokensResponse = { if (message.feeTokens) { obj.fee_tokens = message.feeTokens.map(e => e ? FeeToken.toAmino(e) : undefined); } else { - obj.fee_tokens = []; + obj.fee_tokens = message.feeTokens; } return obj; }, @@ -339,7 +339,7 @@ export const QueryDenomSpotPriceRequest = { }, toAmino(message: QueryDenomSpotPriceRequest): QueryDenomSpotPriceRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomSpotPriceRequestAminoMsg): QueryDenomSpotPriceRequest { @@ -449,8 +449,8 @@ export const QueryDenomSpotPriceResponse = { }, toAmino(message: QueryDenomSpotPriceResponse): QueryDenomSpotPriceResponseAmino { const obj: any = {}; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; - obj.spot_price = message.spotPrice; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QueryDenomSpotPriceResponseAminoMsg): QueryDenomSpotPriceResponse { @@ -544,7 +544,7 @@ export const QueryDenomPoolIdRequest = { }, toAmino(message: QueryDenomPoolIdRequest): QueryDenomPoolIdRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomPoolIdRequestAminoMsg): QueryDenomPoolIdRequest { @@ -638,7 +638,7 @@ export const QueryDenomPoolIdResponse = { }, toAmino(message: QueryDenomPoolIdResponse): QueryDenomPoolIdResponseAmino { const obj: any = {}; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; return obj; }, fromAminoMsg(object: QueryDenomPoolIdResponseAminoMsg): QueryDenomPoolIdResponse { @@ -805,7 +805,7 @@ export const QueryBaseDenomResponse = { }, toAmino(message: QueryBaseDenomResponse): QueryBaseDenomResponseAmino { const obj: any = {}; - obj.base_denom = message.baseDenom; + obj.base_denom = message.baseDenom === "" ? undefined : message.baseDenom; return obj; }, fromAminoMsg(object: QueryBaseDenomResponseAminoMsg): QueryBaseDenomResponse { 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 b91945651d..80b81a4138 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/query.ts @@ -96,7 +96,7 @@ export const UserValidatorPreferencesRequest = { }, toAmino(message: UserValidatorPreferencesRequest): UserValidatorPreferencesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: UserValidatorPreferencesRequestAminoMsg): UserValidatorPreferencesRequest { @@ -199,7 +199,7 @@ export const UserValidatorPreferencesResponse = { if (message.preferences) { obj.preferences = message.preferences.map(e => e ? ValidatorPreference.toAmino(e) : undefined); } else { - obj.preferences = []; + obj.preferences = message.preferences; } return obj; }, 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 9369a7e24e..1612e88ca3 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/state.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/state.ts @@ -141,8 +141,8 @@ export const ValidatorPreference = { }, toAmino(message: ValidatorPreference): ValidatorPreferenceAmino { const obj: any = {}; - obj.val_oper_address = message.valOperAddress; - obj.weight = message.weight; + obj.val_oper_address = message.valOperAddress === "" ? undefined : message.valOperAddress; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: ValidatorPreferenceAminoMsg): ValidatorPreference { @@ -245,7 +245,7 @@ export const ValidatorSetPreferences = { if (message.preferences) { obj.preferences = message.preferences.map(e => e ? ValidatorPreference.toAmino(e) : undefined); } else { - obj.preferences = []; + obj.preferences = message.preferences; } return obj; }, 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 ff65b7c099..517c63ba35 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/tx.ts @@ -250,11 +250,11 @@ export const MsgSetValidatorSetPreference = { }, toAmino(message: MsgSetValidatorSetPreference): MsgSetValidatorSetPreferenceAmino { const obj: any = {}; - obj.delegator = message.delegator; + obj.delegator = message.delegator === "" ? undefined : message.delegator; if (message.preferences) { obj.preferences = message.preferences.map(e => e ? ValidatorPreference.toAmino(e) : undefined); } else { - obj.preferences = []; + obj.preferences = message.preferences; } return obj; }, @@ -438,7 +438,7 @@ export const MsgDelegateToValidatorSet = { }, toAmino(message: MsgDelegateToValidatorSet): MsgDelegateToValidatorSetAmino { const obj: any = {}; - obj.delegator = message.delegator; + obj.delegator = message.delegator === "" ? undefined : message.delegator; obj.coin = message.coin ? Coin.toAmino(message.coin) : undefined; return obj; }, @@ -622,7 +622,7 @@ export const MsgUndelegateFromValidatorSet = { }, toAmino(message: MsgUndelegateFromValidatorSet): MsgUndelegateFromValidatorSetAmino { const obj: any = {}; - obj.delegator = message.delegator; + obj.delegator = message.delegator === "" ? undefined : message.delegator; obj.coin = message.coin ? Coin.toAmino(message.coin) : undefined; return obj; }, @@ -812,11 +812,11 @@ export const MsgRedelegateValidatorSet = { }, toAmino(message: MsgRedelegateValidatorSet): MsgRedelegateValidatorSetAmino { const obj: any = {}; - obj.delegator = message.delegator; + obj.delegator = message.delegator === "" ? undefined : message.delegator; if (message.preferences) { obj.preferences = message.preferences.map(e => e ? ValidatorPreference.toAmino(e) : undefined); } else { - obj.preferences = []; + obj.preferences = message.preferences; } return obj; }, @@ -984,7 +984,7 @@ export const MsgWithdrawDelegationRewards = { }, toAmino(message: MsgWithdrawDelegationRewards): MsgWithdrawDelegationRewardsAmino { const obj: any = {}; - obj.delegator = message.delegator; + obj.delegator = message.delegator === "" ? undefined : message.delegator; return obj; }, fromAminoMsg(object: MsgWithdrawDelegationRewardsAminoMsg): MsgWithdrawDelegationRewards { @@ -1167,8 +1167,8 @@ export const MsgDelegateBondedTokens = { }, toAmino(message: MsgDelegateBondedTokens): MsgDelegateBondedTokensAmino { const obj: any = {}; - obj.delegator = message.delegator; - obj.lockID = message.lockID ? message.lockID.toString() : undefined; + obj.delegator = message.delegator === "" ? undefined : message.delegator; + obj.lockID = message.lockID !== BigInt(0) ? message.lockID.toString() : undefined; return obj; }, fromAminoMsg(object: MsgDelegateBondedTokensAminoMsg): MsgDelegateBondedTokens { diff --git a/__fixtures__/v-next/outputosmojs/tendermint/abci/types.ts b/__fixtures__/v-next/outputosmojs/tendermint/abci/types.ts index e827be7cc8..2b916b10f3 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/abci/types.ts @@ -1312,7 +1312,7 @@ export const RequestEcho = { }, toAmino(message: RequestEcho): RequestEchoAmino { const obj: any = {}; - obj.message = message.message; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: RequestEchoAminoMsg): RequestEcho { @@ -1499,9 +1499,9 @@ export const RequestInfo = { }, 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; + obj.version = message.version === "" ? undefined : message.version; + obj.block_version = message.blockVersion !== BigInt(0) ? message.blockVersion.toString() : undefined; + obj.p2p_version = message.p2pVersion !== BigInt(0) ? message.p2pVersion.toString() : undefined; return obj; }, fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo { @@ -1605,8 +1605,8 @@ export const RequestSetOption = { }, toAmino(message: RequestSetOption): RequestSetOptionAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: RequestSetOptionAminoMsg): RequestSetOption { @@ -1781,15 +1781,15 @@ export const RequestInitChain = { toAmino(message: RequestInitChain): RequestInitChainAmino { const obj: any = {}; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : 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.validators = message.validators; } obj.app_state_bytes = message.appStateBytes ? base64FromBytes(message.appStateBytes) : undefined; - obj.initial_height = message.initialHeight ? message.initialHeight.toString() : undefined; + obj.initial_height = message.initialHeight !== BigInt(0) ? message.initialHeight.toString() : undefined; return obj; }, fromAminoMsg(object: RequestInitChainAminoMsg): RequestInitChain { @@ -1926,9 +1926,9 @@ export const RequestQuery = { toAmino(message: RequestQuery): RequestQueryAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.path = message.path; - obj.height = message.height ? message.height.toString() : undefined; - obj.prove = message.prove; + obj.path = message.path === "" ? undefined : message.path; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.prove = message.prove === false ? undefined : message.prove; return obj; }, fromAminoMsg(object: RequestQueryAminoMsg): RequestQuery { @@ -2076,7 +2076,7 @@ export const RequestBeginBlock = { if (message.byzantineValidators) { obj.byzantine_validators = message.byzantineValidators.map(e => e ? Evidence.toAmino(e) : undefined); } else { - obj.byzantine_validators = []; + obj.byzantine_validators = message.byzantineValidators; } return obj; }, @@ -2175,14 +2175,14 @@ export const RequestCheckTx = { message.tx = bytesFromBase64(object.tx); } if (object.type !== undefined && object.type !== null) { - message.type = checkTxTypeFromJSON(object.type); + message.type = object.type; } return message; }, toAmino(message: RequestCheckTx): RequestCheckTxAmino { const obj: any = {}; obj.tx = message.tx ? base64FromBytes(message.tx) : undefined; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; return obj; }, fromAminoMsg(object: RequestCheckTxAminoMsg): RequestCheckTx { @@ -2358,7 +2358,7 @@ export const RequestEndBlock = { }, toAmino(message: RequestEndBlock): RequestEndBlockAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: RequestEndBlockAminoMsg): RequestEndBlock { @@ -2717,9 +2717,9 @@ export const RequestLoadSnapshotChunk = { }, toAmino(message: RequestLoadSnapshotChunk): RequestLoadSnapshotChunkAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunk = message.chunk; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunk = message.chunk === 0 ? undefined : message.chunk; return obj; }, fromAminoMsg(object: RequestLoadSnapshotChunkAminoMsg): RequestLoadSnapshotChunk { @@ -2839,9 +2839,9 @@ export const RequestApplySnapshotChunk = { }, toAmino(message: RequestApplySnapshotChunk): RequestApplySnapshotChunkAmino { const obj: any = {}; - obj.index = message.index; + obj.index = message.index === 0 ? undefined : message.index; obj.chunk = message.chunk ? base64FromBytes(message.chunk) : undefined; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: RequestApplySnapshotChunkAminoMsg): RequestApplySnapshotChunk { @@ -3272,7 +3272,7 @@ export const ResponseException = { }, toAmino(message: ResponseException): ResponseExceptionAmino { const obj: any = {}; - obj.error = message.error; + obj.error = message.error === "" ? undefined : message.error; return obj; }, fromAminoMsg(object: ResponseExceptionAminoMsg): ResponseException { @@ -3360,7 +3360,7 @@ export const ResponseEcho = { }, toAmino(message: ResponseEcho): ResponseEchoAmino { const obj: any = {}; - obj.message = message.message; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: ResponseEchoAminoMsg): ResponseEcho { @@ -3579,10 +3579,10 @@ export const ResponseInfo = { }, 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.data = message.data === "" ? undefined : message.data; + obj.version = message.version === "" ? undefined : message.version; + obj.app_version = message.appVersion !== BigInt(0) ? message.appVersion.toString() : undefined; + obj.last_block_height = message.lastBlockHeight !== BigInt(0) ? message.lastBlockHeight.toString() : undefined; obj.last_block_app_hash = message.lastBlockAppHash ? base64FromBytes(message.lastBlockAppHash) : undefined; return obj; }, @@ -3703,9 +3703,9 @@ export const ResponseSetOption = { }, toAmino(message: ResponseSetOption): ResponseSetOptionAmino { const obj: any = {}; - obj.code = message.code; - obj.log = message.log; - obj.info = message.info; + obj.code = message.code === 0 ? undefined : message.code; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; return obj; }, fromAminoMsg(object: ResponseSetOptionAminoMsg): ResponseSetOption { @@ -3835,7 +3835,7 @@ export const ResponseInitChain = { if (message.validators) { obj.validators = message.validators.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.app_hash = message.appHash ? base64FromBytes(message.appHash) : undefined; return obj; @@ -4053,15 +4053,15 @@ export const ResponseQuery = { }, 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.code = message.code === 0 ? undefined : message.code; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; obj.proof_ops = message.proofOps ? ProofOps.toAmino(message.proofOps) : undefined; - obj.height = message.height ? message.height.toString() : undefined; - obj.codespace = message.codespace; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseQueryAminoMsg): ResponseQuery { @@ -4158,7 +4158,7 @@ export const ResponseBeginBlock = { if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -4365,18 +4365,18 @@ export const ResponseCheckTx = { }, toAmino(message: ResponseCheckTx): ResponseCheckTxAmino { const obj: any = {}; - obj.code = message.code; + obj.code = message.code === 0 ? undefined : message.code; obj.data = message.data ? base64FromBytes(message.data) : undefined; - 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; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } - obj.codespace = message.codespace; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseCheckTxAminoMsg): ResponseCheckTx { @@ -4582,18 +4582,18 @@ export const ResponseDeliverTx = { }, toAmino(message: ResponseDeliverTx): ResponseDeliverTxAmino { const obj: any = {}; - obj.code = message.code; + obj.code = message.code === 0 ? undefined : message.code; obj.data = message.data ? base64FromBytes(message.data) : undefined; - 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; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } - obj.codespace = message.codespace; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseDeliverTxAminoMsg): ResponseDeliverTx { @@ -4728,13 +4728,13 @@ export const ResponseEndBlock = { if (message.validatorUpdates) { obj.validator_updates = message.validatorUpdates.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); } else { - obj.validator_updates = []; + obj.validator_updates = message.validatorUpdates; } 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 = []; + obj.events = message.events; } return obj; }, @@ -4840,7 +4840,7 @@ export const ResponseCommit = { toAmino(message: ResponseCommit): ResponseCommitAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.retain_height = message.retainHeight ? message.retainHeight.toString() : undefined; + obj.retain_height = message.retainHeight !== BigInt(0) ? message.retainHeight.toString() : undefined; return obj; }, fromAminoMsg(object: ResponseCommitAminoMsg): ResponseCommit { @@ -4937,7 +4937,7 @@ export const ResponseListSnapshots = { if (message.snapshots) { obj.snapshots = message.snapshots.map(e => e ? Snapshot.toAmino(e) : undefined); } else { - obj.snapshots = []; + obj.snapshots = message.snapshots; } return obj; }, @@ -5020,13 +5020,13 @@ export const ResponseOfferSnapshot = { fromAmino(object: ResponseOfferSnapshotAmino): ResponseOfferSnapshot { const message = createBaseResponseOfferSnapshot(); if (object.result !== undefined && object.result !== null) { - message.result = responseOfferSnapshot_ResultFromJSON(object.result); + message.result = object.result; } return message; }, toAmino(message: ResponseOfferSnapshot): ResponseOfferSnapshotAmino { const obj: any = {}; - obj.result = message.result; + obj.result = message.result === 0 ? undefined : message.result; return obj; }, fromAminoMsg(object: ResponseOfferSnapshotAminoMsg): ResponseOfferSnapshot { @@ -5247,7 +5247,7 @@ export const ResponseApplySnapshotChunk = { fromAmino(object: ResponseApplySnapshotChunkAmino): ResponseApplySnapshotChunk { const message = createBaseResponseApplySnapshotChunk(); if (object.result !== undefined && object.result !== null) { - message.result = responseApplySnapshotChunk_ResultFromJSON(object.result); + message.result = object.result; } message.refetchChunks = object.refetch_chunks?.map(e => e) || []; message.rejectSenders = object.reject_senders?.map(e => e) || []; @@ -5255,16 +5255,16 @@ export const ResponseApplySnapshotChunk = { }, toAmino(message: ResponseApplySnapshotChunk): ResponseApplySnapshotChunkAmino { const obj: any = {}; - obj.result = message.result; + obj.result = message.result === 0 ? undefined : message.result; if (message.refetchChunks) { obj.refetch_chunks = message.refetchChunks.map(e => e); } else { - obj.refetch_chunks = []; + obj.refetch_chunks = message.refetchChunks; } if (message.rejectSenders) { obj.reject_senders = message.rejectSenders.map(e => e); } else { - obj.reject_senders = []; + obj.reject_senders = message.rejectSenders; } return obj; }, @@ -5508,8 +5508,8 @@ export const BlockParams = { }, 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.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas !== BigInt(0) ? message.maxGas.toString() : undefined; return obj; }, fromAminoMsg(object: BlockParamsAminoMsg): BlockParams { @@ -5619,11 +5619,11 @@ export const LastCommitInfo = { }, toAmino(message: LastCommitInfo): LastCommitInfoAmino { const obj: any = {}; - obj.round = message.round; + obj.round = message.round === 0 ? undefined : message.round; if (message.votes) { obj.votes = message.votes.map(e => e ? VoteInfo.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } return obj; }, @@ -5734,11 +5734,11 @@ export const Event = { }, toAmino(message: Event): EventAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? EventAttribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -5861,7 +5861,7 @@ export const EventAttribute = { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; - obj.index = message.index; + obj.index = message.index === false ? undefined : message.index; return obj; }, fromAminoMsg(object: EventAttributeAminoMsg): EventAttribute { @@ -5997,8 +5997,8 @@ export const TxResult = { }, toAmino(message: TxResult): TxResultAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.index = message.index; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.index = message.index === 0 ? undefined : message.index; obj.tx = message.tx ? base64FromBytes(message.tx) : undefined; obj.result = message.result ? ResponseDeliverTx.toAmino(message.result) : undefined; return obj; @@ -6105,7 +6105,7 @@ export const Validator = { toAmino(message: Validator): ValidatorAmino { const obj: any = {}; obj.address = message.address ? base64FromBytes(message.address) : undefined; - obj.power = message.power ? message.power.toString() : undefined; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -6210,7 +6210,7 @@ export const ValidatorUpdate = { 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; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorUpdateAminoMsg): ValidatorUpdate { @@ -6315,7 +6315,7 @@ export const VoteInfo = { toAmino(message: VoteInfo): VoteInfoAmino { const obj: any = {}; obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; - obj.signed_last_block = message.signedLastBlock; + obj.signed_last_block = message.signedLastBlock === false ? undefined : message.signedLastBlock; return obj; }, fromAminoMsg(object: VoteInfoAminoMsg): VoteInfo { @@ -6449,7 +6449,7 @@ export const Evidence = { fromAmino(object: EvidenceAmino): Evidence { const message = createBaseEvidence(); if (object.type !== undefined && object.type !== null) { - message.type = evidenceTypeFromJSON(object.type); + message.type = object.type; } if (object.validator !== undefined && object.validator !== null) { message.validator = Validator.fromAmino(object.validator); @@ -6467,11 +6467,11 @@ export const Evidence = { }, toAmino(message: Evidence): EvidenceAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; return obj; }, fromAminoMsg(object: EvidenceAminoMsg): Evidence { @@ -6623,9 +6623,9 @@ export const Snapshot = { }, toAmino(message: Snapshot): SnapshotAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunks = message.chunks; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunks = message.chunks === 0 ? undefined : message.chunks; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; obj.metadata = message.metadata ? base64FromBytes(message.metadata) : undefined; return obj; diff --git a/__fixtures__/v-next/outputosmojs/tendermint/crypto/proof.ts b/__fixtures__/v-next/outputosmojs/tendermint/crypto/proof.ts index 18fbbbef19..7a59ba49bd 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/crypto/proof.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/crypto/proof.ts @@ -204,13 +204,13 @@ export const Proof = { }, toAmino(message: Proof): ProofAmino { const obj: any = {}; - obj.total = message.total ? message.total.toString() : undefined; - obj.index = message.index ? message.index.toString() : undefined; + obj.total = message.total !== BigInt(0) ? message.total.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.leaf_hash = message.leafHash ? base64FromBytes(message.leafHash) : undefined; if (message.aunts) { obj.aunts = message.aunts.map(e => base64FromBytes(e)); } else { - obj.aunts = []; + obj.aunts = message.aunts; } return obj; }, @@ -436,9 +436,9 @@ export const DominoOp = { }, toAmino(message: DominoOp): DominoOpAmino { const obj: any = {}; - obj.key = message.key; - obj.input = message.input; - obj.output = message.output; + obj.key = message.key === "" ? undefined : message.key; + obj.input = message.input === "" ? undefined : message.input; + obj.output = message.output === "" ? undefined : message.output; return obj; }, fromAminoMsg(object: DominoOpAminoMsg): DominoOp { @@ -558,7 +558,7 @@ export const ProofOp = { }, toAmino(message: ProofOp): ProofOpAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; @@ -657,7 +657,7 @@ export const ProofOps = { if (message.ops) { obj.ops = message.ops.map(e => e ? ProofOp.toAmino(e) : undefined); } else { - obj.ops = []; + obj.ops = message.ops; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/tendermint/libs/bits/types.ts b/__fixtures__/v-next/outputosmojs/tendermint/libs/bits/types.ts index d6e4fb59e6..1e9018985a 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/libs/bits/types.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/libs/bits/types.ts @@ -113,11 +113,11 @@ export const BitArray = { }, toAmino(message: BitArray): BitArrayAmino { const obj: any = {}; - obj.bits = message.bits ? message.bits.toString() : undefined; + obj.bits = message.bits !== BigInt(0) ? message.bits.toString() : undefined; if (message.elems) { obj.elems = message.elems.map(e => e.toString()); } else { - obj.elems = []; + obj.elems = message.elems; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/tendermint/p2p/types.ts b/__fixtures__/v-next/outputosmojs/tendermint/p2p/types.ts index c960099f3b..bd031073e7 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/p2p/types.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/p2p/types.ts @@ -183,9 +183,9 @@ export const ProtocolVersion = { }, 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; + obj.p2p = message.p2p !== BigInt(0) ? message.p2p.toString() : undefined; + obj.block = message.block !== BigInt(0) ? message.block.toString() : undefined; + obj.app = message.app !== BigInt(0) ? message.app.toString() : undefined; return obj; }, fromAminoMsg(object: ProtocolVersionAminoMsg): ProtocolVersion { @@ -386,12 +386,12 @@ export const NodeInfo = { 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.node_id = message.nodeId === "" ? undefined : message.nodeId; + obj.listen_addr = message.listenAddr === "" ? undefined : message.listenAddr; + obj.network = message.network === "" ? undefined : message.network; + obj.version = message.version === "" ? undefined : message.version; obj.channels = message.channels ? base64FromBytes(message.channels) : undefined; - obj.moniker = message.moniker; + obj.moniker = message.moniker === "" ? undefined : message.moniker; obj.other = message.other ? NodeInfoOther.toAmino(message.other) : undefined; return obj; }, @@ -496,8 +496,8 @@ export const NodeInfoOther = { }, toAmino(message: NodeInfoOther): NodeInfoOtherAmino { const obj: any = {}; - obj.tx_index = message.txIndex; - obj.rpc_address = message.rpcAddress; + obj.tx_index = message.txIndex === "" ? undefined : message.txIndex; + obj.rpc_address = message.rpcAddress === "" ? undefined : message.rpcAddress; return obj; }, fromAminoMsg(object: NodeInfoOtherAminoMsg): NodeInfoOther { @@ -623,11 +623,11 @@ export const PeerInfo = { }, toAmino(message: PeerInfo): PeerInfoAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; if (message.addressInfo) { obj.address_info = message.addressInfo.map(e => e ? PeerAddressInfo.toAmino(e) : undefined); } else { - obj.address_info = []; + obj.address_info = message.addressInfo; } obj.last_connected = message.lastConnected ? Timestamp.toAmino(toTimestamp(message.lastConnected)) : undefined; return obj; @@ -765,10 +765,10 @@ export const PeerAddressInfo = { }, toAmino(message: PeerAddressInfo): PeerAddressInfoAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.last_dial_success = message.lastDialSuccess ? Timestamp.toAmino(toTimestamp(message.lastDialSuccess)) : undefined; obj.last_dial_failure = message.lastDialFailure ? Timestamp.toAmino(toTimestamp(message.lastDialFailure)) : undefined; - obj.dial_failures = message.dialFailures; + obj.dial_failures = message.dialFailures === 0 ? undefined : message.dialFailures; return obj; }, fromAminoMsg(object: PeerAddressInfoAminoMsg): PeerAddressInfo { diff --git a/__fixtures__/v-next/outputosmojs/tendermint/types/evidence.ts b/__fixtures__/v-next/outputosmojs/tendermint/types/evidence.ts index de7f78431e..5ad23fab38 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/types/evidence.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/types/evidence.ts @@ -306,8 +306,8 @@ export const DuplicateVoteEvidence = { 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.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; + obj.validator_power = message.validatorPower !== BigInt(0) ? message.validatorPower.toString() : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -467,13 +467,13 @@ export const LightClientAttackEvidence = { 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; + obj.common_height = message.commonHeight !== BigInt(0) ? message.commonHeight.toString() : undefined; if (message.byzantineValidators) { obj.byzantine_validators = message.byzantineValidators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.byzantine_validators = []; + obj.byzantine_validators = message.byzantineValidators; } - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -571,7 +571,7 @@ export const EvidenceList = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Evidence.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } return obj; }, diff --git a/__fixtures__/v-next/outputosmojs/tendermint/types/params.ts b/__fixtures__/v-next/outputosmojs/tendermint/types/params.ts index 933a3a2154..33988f99ba 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/types/params.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/types/params.ts @@ -382,9 +382,9 @@ export const BlockParams = { }, 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; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas !== BigInt(0) ? message.maxGas.toString() : undefined; + obj.time_iota_ms = message.timeIotaMs !== BigInt(0) ? message.timeIotaMs.toString() : undefined; return obj; }, fromAminoMsg(object: BlockParamsAminoMsg): BlockParams { @@ -504,9 +504,9 @@ export const EvidenceParams = { }, toAmino(message: EvidenceParams): EvidenceParamsAmino { const obj: any = {}; - obj.max_age_num_blocks = message.maxAgeNumBlocks ? message.maxAgeNumBlocks.toString() : undefined; + obj.max_age_num_blocks = message.maxAgeNumBlocks !== BigInt(0) ? message.maxAgeNumBlocks.toString() : undefined; obj.max_age_duration = message.maxAgeDuration ? Duration.toAmino(message.maxAgeDuration) : undefined; - obj.max_bytes = message.maxBytes ? message.maxBytes.toString() : undefined; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; return obj; }, fromAminoMsg(object: EvidenceParamsAminoMsg): EvidenceParams { @@ -603,7 +603,7 @@ export const ValidatorParams = { if (message.pubKeyTypes) { obj.pub_key_types = message.pubKeyTypes.map(e => e); } else { - obj.pub_key_types = []; + obj.pub_key_types = message.pubKeyTypes; } return obj; }, @@ -692,7 +692,7 @@ export const VersionParams = { }, toAmino(message: VersionParams): VersionParamsAmino { const obj: any = {}; - obj.app_version = message.appVersion ? message.appVersion.toString() : undefined; + obj.app_version = message.appVersion !== BigInt(0) ? message.appVersion.toString() : undefined; return obj; }, fromAminoMsg(object: VersionParamsAminoMsg): VersionParams { @@ -796,8 +796,8 @@ export const HashedParams = { }, 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; + obj.block_max_bytes = message.blockMaxBytes !== BigInt(0) ? message.blockMaxBytes.toString() : undefined; + obj.block_max_gas = message.blockMaxGas !== BigInt(0) ? message.blockMaxGas.toString() : undefined; return obj; }, fromAminoMsg(object: HashedParamsAminoMsg): HashedParams { diff --git a/__fixtures__/v-next/outputosmojs/tendermint/types/types.ts b/__fixtures__/v-next/outputosmojs/tendermint/types/types.ts index 7d48b07818..c632d5efed 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/types/types.ts @@ -433,7 +433,7 @@ export const PartSetHeader = { }, toAmino(message: PartSetHeader): PartSetHeaderAmino { const obj: any = {}; - obj.total = message.total; + obj.total = message.total === 0 ? undefined : message.total; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; return obj; }, @@ -554,7 +554,7 @@ export const Part = { }, toAmino(message: Part): PartAmino { const obj: any = {}; - obj.index = message.index; + obj.index = message.index === 0 ? undefined : message.index; obj.bytes = message.bytes ? base64FromBytes(message.bytes) : undefined; obj.proof = message.proof ? Proof.toAmino(message.proof) : undefined; return obj; @@ -958,8 +958,8 @@ export const Header = { 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.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; obj.last_block_id = message.lastBlockId ? BlockID.toAmino(message.lastBlockId) : undefined; obj.last_commit_hash = message.lastCommitHash ? base64FromBytes(message.lastCommitHash) : undefined; @@ -1067,7 +1067,7 @@ export const Data = { if (message.txs) { obj.txs = message.txs.map(e => base64FromBytes(e)); } else { - obj.txs = []; + obj.txs = message.txs; } return obj; }, @@ -1241,7 +1241,7 @@ export const Vote = { fromAmino(object: VoteAmino): Vote { const message = createBaseVote(); if (object.type !== undefined && object.type !== null) { - message.type = signedMsgTypeFromJSON(object.type); + message.type = object.type; } if (object.height !== undefined && object.height !== null) { message.height = BigInt(object.height); @@ -1268,13 +1268,13 @@ export const Vote = { }, toAmino(message: Vote): VoteAmino { const obj: any = {}; - obj.type = message.type; - obj.height = message.height ? message.height.toString() : undefined; - obj.round = message.round; + obj.type = message.type === 0 ? undefined : message.type; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.validator_address = message.validatorAddress ? base64FromBytes(message.validatorAddress) : undefined; - obj.validator_index = message.validatorIndex; + obj.validator_index = message.validatorIndex === 0 ? undefined : message.validatorIndex; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; return obj; }, @@ -1417,13 +1417,13 @@ export const Commit = { }, toAmino(message: Commit): CommitAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.round = message.round; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : 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 = []; + obj.signatures = message.signatures; } return obj; }, @@ -1545,7 +1545,7 @@ export const CommitSig = { fromAmino(object: CommitSigAmino): CommitSig { const message = createBaseCommitSig(); if (object.block_id_flag !== undefined && object.block_id_flag !== null) { - message.blockIdFlag = blockIDFlagFromJSON(object.block_id_flag); + message.blockIdFlag = object.block_id_flag; } if (object.validator_address !== undefined && object.validator_address !== null) { message.validatorAddress = bytesFromBase64(object.validator_address); @@ -1560,7 +1560,7 @@ export const CommitSig = { }, toAmino(message: CommitSig): CommitSigAmino { const obj: any = {}; - obj.block_id_flag = message.blockIdFlag; + obj.block_id_flag = message.blockIdFlag === 0 ? undefined : message.blockIdFlag; obj.validator_address = message.validatorAddress ? base64FromBytes(message.validatorAddress) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; @@ -1723,7 +1723,7 @@ export const Proposal = { fromAmino(object: ProposalAmino): Proposal { const message = createBaseProposal(); if (object.type !== undefined && object.type !== null) { - message.type = signedMsgTypeFromJSON(object.type); + message.type = object.type; } if (object.height !== undefined && object.height !== null) { message.height = BigInt(object.height); @@ -1747,10 +1747,10 @@ export const Proposal = { }, 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.type = message.type === 0 ? undefined : message.type; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; + obj.pol_round = message.polRound === 0 ? undefined : message.polRound; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; @@ -2100,9 +2100,9 @@ export const BlockMeta = { 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.block_size = message.blockSize !== BigInt(0) ? message.blockSize.toString() : undefined; obj.header = message.header ? Header.toAmino(message.header) : undefined; - obj.num_txs = message.numTxs ? message.numTxs.toString() : undefined; + obj.num_txs = message.numTxs !== BigInt(0) ? message.numTxs.toString() : undefined; return obj; }, fromAminoMsg(object: BlockMetaAminoMsg): BlockMeta { diff --git a/__fixtures__/v-next/outputosmojs/tendermint/types/validator.ts b/__fixtures__/v-next/outputosmojs/tendermint/types/validator.ts index 7b254b795e..1b2f53da01 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/types/validator.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/types/validator.ts @@ -154,10 +154,10 @@ export const ValidatorSet = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.proposer = message.proposer ? Validator.toAmino(message.proposer) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorSetAminoMsg): ValidatorSet { @@ -295,8 +295,8 @@ export const Validator = { const obj: any = {}; obj.address = message.address ? base64FromBytes(message.address) : undefined; 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority !== BigInt(0) ? message.proposerPriority.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -401,7 +401,7 @@ export const SimpleValidator = { 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; return obj; }, fromAminoMsg(object: SimpleValidatorAminoMsg): SimpleValidator { diff --git a/__fixtures__/v-next/outputosmojs/tendermint/version/types.ts b/__fixtures__/v-next/outputosmojs/tendermint/version/types.ts index 760bc6cf43..2df00a0513 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/version/types.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/version/types.ts @@ -130,8 +130,8 @@ export const App = { }, toAmino(message: App): AppAmino { const obj: any = {}; - obj.protocol = message.protocol ? message.protocol.toString() : undefined; - obj.software = message.software; + obj.protocol = message.protocol !== BigInt(0) ? message.protocol.toString() : undefined; + obj.software = message.software === "" ? undefined : message.software; return obj; }, fromAminoMsg(object: AppAminoMsg): App { @@ -235,8 +235,8 @@ export const Consensus = { }, toAmino(message: Consensus): ConsensusAmino { const obj: any = {}; - obj.block = message.block ? message.block.toString() : undefined; - obj.app = message.app ? message.app.toString() : undefined; + obj.block = message.block !== BigInt(0) ? message.block.toString() : undefined; + obj.app = message.app !== BigInt(0) ? message.app.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusAminoMsg): Consensus { diff --git a/__fixtures__/v-next/outputsign/akash/audit/v1beta1/audit.ts b/__fixtures__/v-next/outputsign/akash/audit/v1beta1/audit.ts index 4fe3392676..c64a4f2bef 100644 --- a/__fixtures__/v-next/outputsign/akash/audit/v1beta1/audit.ts +++ b/__fixtures__/v-next/outputsign/akash/audit/v1beta1/audit.ts @@ -14,9 +14,9 @@ export interface ProviderProtoMsg { } /** Provider stores owner auditor and attributes details */ export interface ProviderAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } export interface ProviderAminoMsg { type: "/akash.audit.v1beta1.Provider"; @@ -40,9 +40,9 @@ export interface AuditedAttributesProtoMsg { } /** Attributes */ export interface AuditedAttributesAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } export interface AuditedAttributesAminoMsg { type: "/akash.audit.v1beta1.AuditedAttributes"; @@ -64,7 +64,7 @@ export interface AttributesResponseProtoMsg { } /** AttributesResponse represents details of deployment along with group details */ export interface AttributesResponseAmino { - attributes?: AuditedAttributesAmino[]; + attributes: AuditedAttributesAmino[]; } export interface AttributesResponseAminoMsg { type: "/akash.audit.v1beta1.AttributesResponse"; @@ -85,8 +85,8 @@ export interface AttributesFiltersProtoMsg { } /** AttributesFilters defines filters used to filter deployments */ export interface AttributesFiltersAmino { - auditors?: string[]; - owners?: string[]; + auditors: string[]; + owners: string[]; } export interface AttributesFiltersAminoMsg { type: "/akash.audit.v1beta1.AttributesFilters"; @@ -109,9 +109,9 @@ export interface MsgSignProviderAttributesProtoMsg { } /** MsgSignProviderAttributes defines an SDK message for signing a provider attributes */ export interface MsgSignProviderAttributesAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } export interface MsgSignProviderAttributesAminoMsg { type: "/akash.audit.v1beta1.MsgSignProviderAttributes"; @@ -149,9 +149,9 @@ export interface MsgDeleteProviderAttributesProtoMsg { } /** MsgDeleteProviderAttributes defined the Msg/DeleteProviderAttributes */ export interface MsgDeleteProviderAttributesAmino { - owner?: string; - auditor?: string; - keys?: string[]; + owner: string; + auditor: string; + keys: string[]; } export interface MsgDeleteProviderAttributesAminoMsg { type: "/akash.audit.v1beta1.MsgDeleteProviderAttributes"; @@ -241,12 +241,12 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -330,12 +330,12 @@ export const AuditedAttributes = { }, toAmino(message: AuditedAttributes): AuditedAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -400,7 +400,7 @@ export const AttributesResponse = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -474,12 +474,12 @@ export const AttributesFilters = { if (message.auditors) { obj.auditors = message.auditors.map(e => e); } else { - obj.auditors = []; + obj.auditors = message.auditors; } if (message.owners) { obj.owners = message.owners.map(e => e); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, @@ -563,12 +563,12 @@ export const MsgSignProviderAttributes = { }, toAmino(message: MsgSignProviderAttributes): MsgSignProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -702,12 +702,12 @@ export const MsgDeleteProviderAttributes = { }, toAmino(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/audit/v1beta2/audit.ts b/__fixtures__/v-next/outputsign/akash/audit/v1beta2/audit.ts index c7f395568c..95413f7774 100644 --- a/__fixtures__/v-next/outputsign/akash/audit/v1beta2/audit.ts +++ b/__fixtures__/v-next/outputsign/akash/audit/v1beta2/audit.ts @@ -14,9 +14,9 @@ export interface ProviderProtoMsg { } /** Provider stores owner auditor and attributes details */ export interface ProviderAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } export interface ProviderAminoMsg { type: "/akash.audit.v1beta2.Provider"; @@ -40,9 +40,9 @@ export interface AuditedAttributesProtoMsg { } /** Attributes */ export interface AuditedAttributesAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } export interface AuditedAttributesAminoMsg { type: "/akash.audit.v1beta2.AuditedAttributes"; @@ -64,7 +64,7 @@ export interface AttributesResponseProtoMsg { } /** AttributesResponse represents details of deployment along with group details */ export interface AttributesResponseAmino { - attributes?: AuditedAttributesAmino[]; + attributes: AuditedAttributesAmino[]; } export interface AttributesResponseAminoMsg { type: "/akash.audit.v1beta2.AttributesResponse"; @@ -85,8 +85,8 @@ export interface AttributesFiltersProtoMsg { } /** AttributesFilters defines filters used to filter deployments */ export interface AttributesFiltersAmino { - auditors?: string[]; - owners?: string[]; + auditors: string[]; + owners: string[]; } export interface AttributesFiltersAminoMsg { type: "/akash.audit.v1beta2.AttributesFilters"; @@ -109,9 +109,9 @@ export interface MsgSignProviderAttributesProtoMsg { } /** MsgSignProviderAttributes defines an SDK message for signing a provider attributes */ export interface MsgSignProviderAttributesAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } export interface MsgSignProviderAttributesAminoMsg { type: "/akash.audit.v1beta2.MsgSignProviderAttributes"; @@ -149,9 +149,9 @@ export interface MsgDeleteProviderAttributesProtoMsg { } /** MsgDeleteProviderAttributes defined the Msg/DeleteProviderAttributes */ export interface MsgDeleteProviderAttributesAmino { - owner?: string; - auditor?: string; - keys?: string[]; + owner: string; + auditor: string; + keys: string[]; } export interface MsgDeleteProviderAttributesAminoMsg { type: "/akash.audit.v1beta2.MsgDeleteProviderAttributes"; @@ -241,12 +241,12 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -330,12 +330,12 @@ export const AuditedAttributes = { }, toAmino(message: AuditedAttributes): AuditedAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -400,7 +400,7 @@ export const AttributesResponse = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -474,12 +474,12 @@ export const AttributesFilters = { if (message.auditors) { obj.auditors = message.auditors.map(e => e); } else { - obj.auditors = []; + obj.auditors = message.auditors; } if (message.owners) { obj.owners = message.owners.map(e => e); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, @@ -563,12 +563,12 @@ export const MsgSignProviderAttributes = { }, toAmino(message: MsgSignProviderAttributes): MsgSignProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -702,12 +702,12 @@ export const MsgDeleteProviderAttributes = { }, toAmino(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/audit/v1beta2/genesis.ts b/__fixtures__/v-next/outputsign/akash/audit/v1beta2/genesis.ts index 4dec8cd349..944a7d48b7 100644 --- a/__fixtures__/v-next/outputsign/akash/audit/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputsign/akash/audit/v1beta2/genesis.ts @@ -12,7 +12,7 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by audit module */ export interface GenesisStateAmino { - attributes?: AuditedAttributesAmino[]; + attributes: AuditedAttributesAmino[]; } export interface GenesisStateAminoMsg { type: "/akash.audit.v1beta2.GenesisState"; @@ -67,7 +67,7 @@ export const GenesisState = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/audit/v1beta2/query.ts b/__fixtures__/v-next/outputsign/akash/audit/v1beta2/query.ts index 6f17722bb2..4821ccfc6b 100644 --- a/__fixtures__/v-next/outputsign/akash/audit/v1beta2/query.ts +++ b/__fixtures__/v-next/outputsign/akash/audit/v1beta2/query.ts @@ -196,7 +196,7 @@ export const QueryProvidersResponse = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -272,8 +272,8 @@ export const QueryProviderRequest = { }, toAmino(message: QueryProviderRequest): QueryProviderRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; - obj.owner = message.owner; + obj.auditor = message.auditor === "" ? undefined : message.auditor; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest { @@ -414,7 +414,7 @@ export const QueryProviderAttributesRequest = { }, toAmino(message: QueryProviderAttributesRequest): QueryProviderAttributesRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -489,8 +489,8 @@ export const QueryProviderAuditorRequest = { }, toAmino(message: QueryProviderAuditorRequest): QueryProviderAuditorRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; - obj.owner = message.owner; + obj.auditor = message.auditor === "" ? undefined : message.auditor; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderAuditorRequestAminoMsg): QueryProviderAuditorRequest { @@ -566,7 +566,7 @@ export const QueryAuditorAttributesRequest = { }, toAmino(message: QueryAuditorAttributesRequest): QueryAuditorAttributesRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; + obj.auditor = message.auditor === "" ? undefined : message.auditor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/base/v1beta1/attribute.ts b/__fixtures__/v-next/outputsign/akash/base/v1beta1/attribute.ts index 6abb3b6519..294068604d 100644 --- a/__fixtures__/v-next/outputsign/akash/base/v1beta1/attribute.ts +++ b/__fixtures__/v-next/outputsign/akash/base/v1beta1/attribute.ts @@ -48,9 +48,9 @@ export interface SignedByProtoMsg { */ export interface SignedByAmino { /** all_of all keys in this list must have signed attributes */ - all_of?: string[]; + all_of: string[]; /** any_of at least of of the keys from the list must have signed attributes */ - any_of?: string[]; + any_of: string[]; } export interface SignedByAminoMsg { type: "/akash.base.v1beta1.SignedBy"; @@ -80,9 +80,9 @@ export interface PlacementRequirementsProtoMsg { /** PlacementRequirements */ export interface PlacementRequirementsAmino { /** SignedBy list of keys that tenants expect to have signatures from */ - signed_by?: SignedByAmino; + signed_by: SignedByAmino; /** Attribute list of attributes tenant expects from the provider */ - attributes?: AttributeAmino[]; + attributes: AttributeAmino[]; } export interface PlacementRequirementsAminoMsg { type: "/akash.base.v1beta1.PlacementRequirements"; @@ -148,8 +148,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -222,12 +222,12 @@ export const SignedBy = { if (message.allOf) { obj.all_of = message.allOf.map(e => e); } else { - obj.all_of = []; + obj.all_of = message.allOf; } if (message.anyOf) { obj.any_of = message.anyOf.map(e => e); } else { - obj.any_of = []; + obj.any_of = message.anyOf; } return obj; }, @@ -302,11 +302,11 @@ export const PlacementRequirements = { }, toAmino(message: PlacementRequirements): PlacementRequirementsAmino { const obj: any = {}; - obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : undefined; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : SignedBy.toAmino(SignedBy.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/base/v1beta1/endpoint.ts b/__fixtures__/v-next/outputsign/akash/base/v1beta1/endpoint.ts index fcd26d551b..c2a6eb4a35 100644 --- a/__fixtures__/v-next/outputsign/akash/base/v1beta1/endpoint.ts +++ b/__fixtures__/v-next/outputsign/akash/base/v1beta1/endpoint.ts @@ -94,13 +94,13 @@ export const Endpoint = { fromAmino(object: EndpointAmino): Endpoint { const message = createBaseEndpoint(); if (object.kind !== undefined && object.kind !== null) { - message.kind = endpoint_KindFromJSON(object.kind); + message.kind = object.kind; } return message; }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.kind = message.kind; + obj.kind = message.kind === 0 ? undefined : message.kind; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputsign/akash/base/v1beta1/resource.ts b/__fixtures__/v-next/outputsign/akash/base/v1beta1/resource.ts index dc4470b6b0..b1013b737f 100644 --- a/__fixtures__/v-next/outputsign/akash/base/v1beta1/resource.ts +++ b/__fixtures__/v-next/outputsign/akash/base/v1beta1/resource.ts @@ -38,7 +38,7 @@ export interface MemoryProtoMsg { } /** Memory stores resource quantity and memory attributes */ export interface MemoryAmino { - quantity?: ResourceValueAmino; + quantity: ResourceValueAmino; attributes?: AttributeAmino[]; } export interface MemoryAminoMsg { @@ -61,7 +61,7 @@ export interface StorageProtoMsg { } /** Storage stores resource quantity and storage attributes */ export interface StorageAmino { - quantity?: ResourceValueAmino; + quantity: ResourceValueAmino; attributes?: AttributeAmino[]; } export interface StorageAminoMsg { @@ -95,7 +95,7 @@ export interface ResourceUnitsAmino { cpu?: CPUAmino; memory?: MemoryAmino; storage?: StorageAmino; - endpoints?: EndpointAmino[]; + endpoints: EndpointAmino[]; } export interface ResourceUnitsAminoMsg { type: "/akash.base.v1beta1.ResourceUnits"; @@ -170,7 +170,7 @@ export const CPU = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -245,11 +245,11 @@ export const Memory = { }, toAmino(message: Memory): MemoryAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -324,11 +324,11 @@ export const Storage = { }, toAmino(message: Storage): StorageAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -435,7 +435,7 @@ export const ResourceUnits = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/base/v1beta2/attribute.ts b/__fixtures__/v-next/outputsign/akash/base/v1beta2/attribute.ts index 0bda8ef1cf..e86d3ce98e 100644 --- a/__fixtures__/v-next/outputsign/akash/base/v1beta2/attribute.ts +++ b/__fixtures__/v-next/outputsign/akash/base/v1beta2/attribute.ts @@ -48,9 +48,9 @@ export interface SignedByProtoMsg { */ export interface SignedByAmino { /** all_of all keys in this list must have signed attributes */ - all_of?: string[]; + all_of: string[]; /** any_of at least of of the keys from the list must have signed attributes */ - any_of?: string[]; + any_of: string[]; } export interface SignedByAminoMsg { type: "/akash.base.v1beta2.SignedBy"; @@ -80,9 +80,9 @@ export interface PlacementRequirementsProtoMsg { /** PlacementRequirements */ export interface PlacementRequirementsAmino { /** SignedBy list of keys that tenants expect to have signatures from */ - signed_by?: SignedByAmino; + signed_by: SignedByAmino; /** Attribute list of attributes tenant expects from the provider */ - attributes?: AttributeAmino[]; + attributes: AttributeAmino[]; } export interface PlacementRequirementsAminoMsg { type: "/akash.base.v1beta2.PlacementRequirements"; @@ -148,8 +148,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -222,12 +222,12 @@ export const SignedBy = { if (message.allOf) { obj.all_of = message.allOf.map(e => e); } else { - obj.all_of = []; + obj.all_of = message.allOf; } if (message.anyOf) { obj.any_of = message.anyOf.map(e => e); } else { - obj.any_of = []; + obj.any_of = message.anyOf; } return obj; }, @@ -302,11 +302,11 @@ export const PlacementRequirements = { }, toAmino(message: PlacementRequirements): PlacementRequirementsAmino { const obj: any = {}; - obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : undefined; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : SignedBy.toAmino(SignedBy.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/base/v1beta2/endpoint.ts b/__fixtures__/v-next/outputsign/akash/base/v1beta2/endpoint.ts index ee59035f7d..4e0aba56ab 100644 --- a/__fixtures__/v-next/outputsign/akash/base/v1beta2/endpoint.ts +++ b/__fixtures__/v-next/outputsign/akash/base/v1beta2/endpoint.ts @@ -55,7 +55,7 @@ export interface EndpointProtoMsg { /** Endpoint describes a publicly accessible IP service */ export interface EndpointAmino { kind?: Endpoint_Kind; - sequence_number?: number; + sequence_number: number; } export interface EndpointAminoMsg { type: "/akash.base.v1beta2.Endpoint"; @@ -112,7 +112,7 @@ export const Endpoint = { fromAmino(object: EndpointAmino): Endpoint { const message = createBaseEndpoint(); if (object.kind !== undefined && object.kind !== null) { - message.kind = endpoint_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.sequence_number !== undefined && object.sequence_number !== null) { message.sequenceNumber = object.sequence_number; @@ -121,8 +121,8 @@ export const Endpoint = { }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.kind = message.kind; - obj.sequence_number = message.sequenceNumber; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.sequence_number = message.sequenceNumber ?? 0; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputsign/akash/base/v1beta2/resource.ts b/__fixtures__/v-next/outputsign/akash/base/v1beta2/resource.ts index 54835288f8..cbe93378ef 100644 --- a/__fixtures__/v-next/outputsign/akash/base/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputsign/akash/base/v1beta2/resource.ts @@ -37,7 +37,7 @@ export interface MemoryProtoMsg { } /** Memory stores resource quantity and memory attributes */ export interface MemoryAmino { - quantity?: ResourceValueAmino; + quantity: ResourceValueAmino; attributes?: AttributeAmino[]; } export interface MemoryAminoMsg { @@ -61,8 +61,8 @@ export interface StorageProtoMsg { } /** Storage stores resource quantity and storage attributes */ export interface StorageAmino { - name?: string; - quantity?: ResourceValueAmino; + name: string; + quantity: ResourceValueAmino; attributes?: AttributeAmino[]; } export interface StorageAminoMsg { @@ -134,7 +134,7 @@ export const CPU = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -209,11 +209,11 @@ export const Memory = { }, toAmino(message: Memory): MemoryAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -299,12 +299,12 @@ export const Storage = { }, toAmino(message: Storage): StorageAmino { const obj: any = {}; - obj.name = message.name; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.name = message.name ?? ""; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/base/v1beta2/resourceunits.ts b/__fixtures__/v-next/outputsign/akash/base/v1beta2/resourceunits.ts index 35d441ae32..8305acaaa4 100644 --- a/__fixtures__/v-next/outputsign/akash/base/v1beta2/resourceunits.ts +++ b/__fixtures__/v-next/outputsign/akash/base/v1beta2/resourceunits.ts @@ -25,7 +25,7 @@ export interface ResourceUnitsAmino { cpu?: CPUAmino; memory?: MemoryAmino; storage?: StorageAmino[]; - endpoints?: EndpointAmino[]; + endpoints: EndpointAmino[]; } export interface ResourceUnitsAminoMsg { type: "/akash.base.v1beta2.ResourceUnits"; @@ -123,12 +123,12 @@ export const ResourceUnits = { if (message.storage) { obj.storage = message.storage.map(e => e ? Storage.toAmino(e) : undefined); } else { - obj.storage = []; + obj.storage = message.storage; } if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/cert/v1beta2/cert.ts b/__fixtures__/v-next/outputsign/akash/cert/v1beta2/cert.ts index 8df4a6183c..a65d230171 100644 --- a/__fixtures__/v-next/outputsign/akash/cert/v1beta2/cert.ts +++ b/__fixtures__/v-next/outputsign/akash/cert/v1beta2/cert.ts @@ -54,8 +54,8 @@ export interface CertificateIDProtoMsg { } /** CertificateID stores owner and sequence number */ export interface CertificateIDAmino { - owner?: string; - serial?: string; + owner: string; + serial: string; } export interface CertificateIDAminoMsg { type: "/akash.cert.v1beta2.CertificateID"; @@ -78,9 +78,9 @@ export interface CertificateProtoMsg { } /** Certificate stores state, certificate and it's public key */ export interface CertificateAmino { - state?: Certificate_State; - cert?: string; - pubkey?: string; + state: Certificate_State; + cert: string; + pubkey: string; } export interface CertificateAminoMsg { type: "/akash.cert.v1beta2.Certificate"; @@ -104,9 +104,9 @@ export interface CertificateFilterProtoMsg { } /** CertificateFilter defines filters used to filter certificates */ export interface CertificateFilterAmino { - owner?: string; - serial?: string; - state?: string; + owner: string; + serial: string; + state: string; } export interface CertificateFilterAminoMsg { type: "/akash.cert.v1beta2.CertificateFilter"; @@ -130,9 +130,9 @@ export interface MsgCreateCertificateProtoMsg { } /** MsgCreateCertificate defines an SDK message for creating certificate */ export interface MsgCreateCertificateAmino { - owner?: string; - cert?: string; - pubkey?: string; + owner: string; + cert: string; + pubkey: string; } export interface MsgCreateCertificateAminoMsg { type: "/akash.cert.v1beta2.MsgCreateCertificate"; @@ -168,7 +168,7 @@ export interface MsgRevokeCertificateProtoMsg { } /** MsgRevokeCertificate defines an SDK message for revoking certificate */ export interface MsgRevokeCertificateAmino { - id?: CertificateIDAmino; + id: CertificateIDAmino; } export interface MsgRevokeCertificateAminoMsg { type: "/akash.cert.v1beta2.MsgRevokeCertificate"; @@ -247,8 +247,8 @@ export const CertificateID = { }, toAmino(message: CertificateID): CertificateIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.serial = message.serial; + obj.owner = message.owner ?? ""; + obj.serial = message.serial ?? ""; return obj; }, fromAminoMsg(object: CertificateIDAminoMsg): CertificateID { @@ -321,7 +321,7 @@ export const Certificate = { fromAmino(object: CertificateAmino): Certificate { const message = createBaseCertificate(); if (object.state !== undefined && object.state !== null) { - message.state = certificate_StateFromJSON(object.state); + message.state = object.state; } if (object.cert !== undefined && object.cert !== null) { message.cert = bytesFromBase64(object.cert); @@ -333,9 +333,9 @@ export const Certificate = { }, toAmino(message: Certificate): CertificateAmino { const obj: any = {}; - obj.state = message.state; - obj.cert = message.cert ? base64FromBytes(message.cert) : undefined; - obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : undefined; + obj.state = message.state ?? 0; + obj.cert = message.cert ? base64FromBytes(message.cert) : ""; + obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : ""; return obj; }, fromAminoMsg(object: CertificateAminoMsg): Certificate { @@ -420,9 +420,9 @@ export const CertificateFilter = { }, toAmino(message: CertificateFilter): CertificateFilterAmino { const obj: any = {}; - obj.owner = message.owner; - obj.serial = message.serial; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.serial = message.serial ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: CertificateFilterAminoMsg): CertificateFilter { @@ -507,9 +507,9 @@ export const MsgCreateCertificate = { }, toAmino(message: MsgCreateCertificate): MsgCreateCertificateAmino { const obj: any = {}; - obj.owner = message.owner; - obj.cert = message.cert ? base64FromBytes(message.cert) : undefined; - obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : undefined; + obj.owner = message.owner ?? ""; + obj.cert = message.cert ? base64FromBytes(message.cert) : ""; + obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : ""; return obj; }, fromAminoMsg(object: MsgCreateCertificateAminoMsg): MsgCreateCertificate { @@ -624,7 +624,7 @@ export const MsgRevokeCertificate = { }, toAmino(message: MsgRevokeCertificate): MsgRevokeCertificateAmino { const obj: any = {}; - obj.id = message.id ? CertificateID.toAmino(message.id) : undefined; + obj.id = message.id ? CertificateID.toAmino(message.id) : CertificateID.toAmino(CertificateID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgRevokeCertificateAminoMsg): MsgRevokeCertificate { diff --git a/__fixtures__/v-next/outputsign/akash/cert/v1beta2/genesis.ts b/__fixtures__/v-next/outputsign/akash/cert/v1beta2/genesis.ts index 1ee13f96a5..fbe1f3bab7 100644 --- a/__fixtures__/v-next/outputsign/akash/cert/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputsign/akash/cert/v1beta2/genesis.ts @@ -13,8 +13,8 @@ export interface GenesisCertificateProtoMsg { } /** GenesisCertificate defines certificate entry at genesis */ export interface GenesisCertificateAmino { - owner?: string; - certificate?: CertificateAmino; + owner: string; + certificate: CertificateAmino; } export interface GenesisCertificateAminoMsg { type: "/akash.cert.v1beta2.GenesisCertificate"; @@ -35,7 +35,7 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by cert module */ export interface GenesisStateAmino { - certificates?: GenesisCertificateAmino[]; + certificates: GenesisCertificateAmino[]; } export interface GenesisStateAminoMsg { type: "/akash.cert.v1beta2.GenesisState"; @@ -102,8 +102,8 @@ export const GenesisCertificate = { }, toAmino(message: GenesisCertificate): GenesisCertificateAmino { const obj: any = {}; - obj.owner = message.owner; - obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined; + obj.owner = message.owner ?? ""; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : Certificate.toAmino(Certificate.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisCertificateAminoMsg): GenesisCertificate { @@ -167,7 +167,7 @@ export const GenesisState = { if (message.certificates) { obj.certificates = message.certificates.map(e => e ? GenesisCertificate.toAmino(e) : undefined); } else { - obj.certificates = []; + obj.certificates = message.certificates; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/cert/v1beta2/query.ts b/__fixtures__/v-next/outputsign/akash/cert/v1beta2/query.ts index c9e2dbf0ba..6686991ab6 100644 --- a/__fixtures__/v-next/outputsign/akash/cert/v1beta2/query.ts +++ b/__fixtures__/v-next/outputsign/akash/cert/v1beta2/query.ts @@ -14,8 +14,8 @@ export interface CertificateResponseProtoMsg { } /** CertificateResponse contains a single X509 certificate and its serial number */ export interface CertificateResponseAmino { - certificate?: CertificateAmino; - serial?: string; + certificate: CertificateAmino; + serial: string; } export interface CertificateResponseAminoMsg { type: "/akash.cert.v1beta2.CertificateResponse"; @@ -129,8 +129,8 @@ export const CertificateResponse = { }, toAmino(message: CertificateResponse): CertificateResponseAmino { const obj: any = {}; - obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined; - obj.serial = message.serial; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : Certificate.toAmino(Certificate.fromPartial({})); + obj.serial = message.serial ?? ""; return obj; }, fromAminoMsg(object: CertificateResponseAminoMsg): CertificateResponse { @@ -286,7 +286,7 @@ export const QueryCertificatesResponse = { if (message.certificates) { obj.certificates = message.certificates.map(e => e ? CertificateResponse.toAmino(e) : undefined); } else { - obj.certificates = []; + obj.certificates = message.certificates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/authz.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/authz.ts index 6757f14cc7..19a44e3743 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/authz.ts @@ -26,7 +26,7 @@ export interface DepositDeploymentAuthorizationAmino { * SpendLimit is the amount the grantee is authorized to spend from the granter's account for * the purpose of deployment. */ - spend_limit?: CoinAmino | undefined; + spend_limit: CoinAmino | undefined; } export interface DepositDeploymentAuthorizationAminoMsg { type: "/akash.deployment.v1beta1.DepositDeploymentAuthorization"; diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/deployment.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/deployment.ts index 415966077f..f1e6b67191 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/deployment.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/deployment.ts @@ -61,10 +61,10 @@ export interface MsgCreateDeploymentProtoMsg { } /** MsgCreateDeployment defines an SDK message for creating deployment */ export interface MsgCreateDeploymentAmino { - id?: DeploymentIDAmino | undefined; - groups?: GroupSpecAmino[]; - version?: string; - deposit?: CoinAmino | undefined; + id: DeploymentIDAmino | undefined; + groups: GroupSpecAmino[]; + version: string; + deposit: CoinAmino | undefined; } export interface MsgCreateDeploymentAminoMsg { type: "/akash.deployment.v1beta1.MsgCreateDeployment"; @@ -102,8 +102,8 @@ export interface MsgDepositDeploymentProtoMsg { } /** MsgDepositDeployment deposits more funds into the deposit account */ export interface MsgDepositDeploymentAmino { - id?: DeploymentIDAmino | undefined; - amount?: CoinAmino | undefined; + id: DeploymentIDAmino | undefined; + amount: CoinAmino | undefined; } export interface MsgDepositDeploymentAminoMsg { type: "/akash.deployment.v1beta1.MsgDepositDeployment"; @@ -140,9 +140,9 @@ export interface MsgUpdateDeploymentProtoMsg { } /** MsgUpdateDeployment defines an SDK message for updating deployment */ export interface MsgUpdateDeploymentAmino { - id?: DeploymentIDAmino | undefined; - groups?: GroupSpecAmino[]; - version?: string; + id: DeploymentIDAmino | undefined; + groups: GroupSpecAmino[]; + version: string; } export interface MsgUpdateDeploymentAminoMsg { type: "/akash.deployment.v1beta1.MsgUpdateDeployment"; @@ -178,7 +178,7 @@ export interface MsgCloseDeploymentProtoMsg { } /** MsgCloseDeployment defines an SDK message for closing deployment */ export interface MsgCloseDeploymentAmino { - id?: DeploymentIDAmino | undefined; + id: DeploymentIDAmino | undefined; } export interface MsgCloseDeploymentAminoMsg { type: "/akash.deployment.v1beta1.MsgCloseDeployment"; @@ -213,8 +213,8 @@ export interface DeploymentIDProtoMsg { } /** DeploymentID stores owner and sequence number */ export interface DeploymentIDAmino { - owner?: string; - dseq?: string; + owner: string; + dseq: string; } export interface DeploymentIDAminoMsg { type: "/akash.deployment.v1beta1.DeploymentID"; @@ -238,9 +238,9 @@ export interface DeploymentProtoMsg { } /** Deployment stores deploymentID, state and version details */ export interface DeploymentAmino { - deployment_id?: DeploymentIDAmino | undefined; - state?: Deployment_State; - version?: string; + deployment_id: DeploymentIDAmino | undefined; + state: Deployment_State; + version: string; created_at?: string; } export interface DeploymentAminoMsg { @@ -266,9 +266,9 @@ export interface DeploymentFiltersProtoMsg { } /** DeploymentFilters defines filters used to filter deployments */ export interface DeploymentFiltersAmino { - owner?: string; - dseq?: string; - state?: string; + owner: string; + dseq: string; + state: string; } export interface DeploymentFiltersAminoMsg { type: "/akash.deployment.v1beta1.DeploymentFilters"; diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/genesis.ts index 550855e76a..8043e23794 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/genesis.ts @@ -15,8 +15,8 @@ export interface GenesisDeploymentProtoMsg { } /** GenesisDeployment defines the basic genesis state used by deployment module */ export interface GenesisDeploymentAmino { - deployment?: DeploymentAmino | undefined; - groups?: GroupAmino[]; + deployment: DeploymentAmino | undefined; + groups: GroupAmino[]; } export interface GenesisDeploymentAminoMsg { type: "/akash.deployment.v1beta1.GenesisDeployment"; @@ -38,8 +38,8 @@ export interface GenesisStateProtoMsg { } /** GenesisState stores slice of genesis deployment instance */ export interface GenesisStateAmino { - deployments?: GenesisDeploymentAmino[]; - params?: ParamsAmino | undefined; + deployments: GenesisDeploymentAmino[]; + params: ParamsAmino | undefined; } export interface GenesisStateAminoMsg { type: "/akash.deployment.v1beta1.GenesisState"; diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/group.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/group.ts index 1763faba22..bfaa69f191 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/group.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/group.ts @@ -70,7 +70,7 @@ export interface MsgCloseGroupProtoMsg { } /** MsgCloseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgCloseGroupAmino { - id?: GroupIDAmino | undefined; + id: GroupIDAmino | undefined; } export interface MsgCloseGroupAminoMsg { type: "/akash.deployment.v1beta1.MsgCloseGroup"; @@ -104,7 +104,7 @@ export interface MsgPauseGroupProtoMsg { } /** MsgPauseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgPauseGroupAmino { - id?: GroupIDAmino | undefined; + id: GroupIDAmino | undefined; } export interface MsgPauseGroupAminoMsg { type: "/akash.deployment.v1beta1.MsgPauseGroup"; @@ -138,7 +138,7 @@ export interface MsgStartGroupProtoMsg { } /** MsgStartGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgStartGroupAmino { - id?: GroupIDAmino | undefined; + id: GroupIDAmino | undefined; } export interface MsgStartGroupAminoMsg { type: "/akash.deployment.v1beta1.MsgStartGroup"; @@ -174,9 +174,9 @@ export interface GroupIDProtoMsg { } /** GroupID stores owner, deployment sequence number and group sequence number */ export interface GroupIDAmino { - owner?: string; - dseq?: string; - gseq?: number; + owner: string; + dseq: string; + gseq: number; } export interface GroupIDAminoMsg { type: "/akash.deployment.v1beta1.GroupID"; @@ -200,9 +200,9 @@ export interface GroupSpecProtoMsg { } /** GroupSpec stores group specifications */ export interface GroupSpecAmino { - name?: string; - requirements?: PlacementRequirementsAmino | undefined; - resources?: ResourceAmino[]; + name: string; + requirements: PlacementRequirementsAmino | undefined; + resources: ResourceAmino[]; } export interface GroupSpecAminoMsg { type: "/akash.deployment.v1beta1.GroupSpec"; @@ -227,9 +227,9 @@ export interface GroupProtoMsg { } /** Group stores group id, state and specifications of group */ export interface GroupAmino { - group_id?: GroupIDAmino | undefined; - state?: Group_State; - group_spec?: GroupSpecAmino | undefined; + group_id: GroupIDAmino | undefined; + state: Group_State; + group_spec: GroupSpecAmino | undefined; created_at?: string; } export interface GroupAminoMsg { @@ -255,9 +255,9 @@ export interface ResourceProtoMsg { } /** Resource stores unit, total count and price of resource */ export interface ResourceAmino { - resources?: ResourceUnitsAmino | undefined; - count?: number; - price?: CoinAmino | undefined; + resources: ResourceUnitsAmino | undefined; + count: number; + price: CoinAmino | undefined; } export interface ResourceAminoMsg { type: "/akash.deployment.v1beta1.Resource"; diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/params.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/params.ts index 7a2492aa39..cb4724e5ad 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/params.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/params.ts @@ -12,7 +12,7 @@ export interface ParamsProtoMsg { } /** Params defines the parameters for the x/deployment package */ export interface ParamsAmino { - deployment_min_deposit?: CoinAmino | undefined; + deployment_min_deposit: CoinAmino | undefined; } export interface ParamsAminoMsg { type: "/akash.deployment.v1beta1.Params"; diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/query.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/query.ts index 83e25b02e8..82565b7d2c 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta1/query.ts @@ -85,8 +85,8 @@ export interface QueryDeploymentResponseProtoMsg { } /** QueryDeploymentResponse is response type for the Query/Deployment RPC method */ export interface QueryDeploymentResponseAmino { - deployment?: DeploymentAmino | undefined; - groups?: GroupAmino[]; + deployment: DeploymentAmino | undefined; + groups: GroupAmino[]; escrow_account?: AccountAmino | undefined; } export interface QueryDeploymentResponseAminoMsg { diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/authz.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/authz.ts index 308856d3ba..d2f03ddac8 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/authz.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/authz.ts @@ -26,7 +26,7 @@ export interface DepositDeploymentAuthorizationAmino { * SpendLimit is the amount the grantee is authorized to spend from the granter's account for * the purpose of deployment. */ - spend_limit?: CoinAmino; + spend_limit: CoinAmino; } export interface DepositDeploymentAuthorizationAminoMsg { type: "/akash.deployment.v1beta2.DepositDeploymentAuthorization"; @@ -85,7 +85,7 @@ export const DepositDeploymentAuthorization = { }, toAmino(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAmino { const obj: any = {}; - obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/deployment.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/deployment.ts index 7354c9163b..032dddb4f6 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/deployment.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/deployment.ts @@ -54,8 +54,8 @@ export interface DeploymentIDProtoMsg { } /** DeploymentID stores owner and sequence number */ export interface DeploymentIDAmino { - owner?: string; - dseq?: string; + owner: string; + dseq: string; } export interface DeploymentIDAminoMsg { type: "/akash.deployment.v1beta2.DeploymentID"; @@ -79,9 +79,9 @@ export interface DeploymentProtoMsg { } /** Deployment stores deploymentID, state and version details */ export interface DeploymentAmino { - deployment_id?: DeploymentIDAmino; - state?: Deployment_State; - version?: string; + deployment_id: DeploymentIDAmino; + state: Deployment_State; + version: string; created_at?: string; } export interface DeploymentAminoMsg { @@ -107,9 +107,9 @@ export interface DeploymentFiltersProtoMsg { } /** DeploymentFilters defines filters used to filter deployments */ export interface DeploymentFiltersAmino { - owner?: string; - dseq?: string; - state?: string; + owner: string; + dseq: string; + state: string; } export interface DeploymentFiltersAminoMsg { type: "/akash.deployment.v1beta2.DeploymentFilters"; @@ -178,8 +178,8 @@ export const DeploymentID = { }, toAmino(message: DeploymentID): DeploymentIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; return obj; }, fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID { @@ -267,7 +267,7 @@ export const Deployment = { message.deploymentId = DeploymentID.fromAmino(object.deployment_id); } if (object.state !== undefined && object.state !== null) { - message.state = deployment_StateFromJSON(object.state); + message.state = object.state; } if (object.version !== undefined && object.version !== null) { message.version = bytesFromBase64(object.version); @@ -279,10 +279,10 @@ export const Deployment = { }, 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 ? base64FromBytes(message.version) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.state = message.state ?? 0; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: DeploymentAminoMsg): Deployment { @@ -369,9 +369,9 @@ export const DeploymentFilters = { }, toAmino(message: DeploymentFilters): DeploymentFiltersAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters { diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/deploymentmsg.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/deploymentmsg.ts index 1a05267361..5b3eda4af7 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/deploymentmsg.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/deploymentmsg.ts @@ -19,12 +19,12 @@ export interface MsgCreateDeploymentProtoMsg { } /** MsgCreateDeployment defines an SDK message for creating deployment */ export interface MsgCreateDeploymentAmino { - id?: DeploymentIDAmino; - groups?: GroupSpecAmino[]; - version?: string; - deposit?: CoinAmino; + id: DeploymentIDAmino; + groups: GroupSpecAmino[]; + version: string; + deposit: CoinAmino; /** Depositor pays for the deposit */ - depositor?: string; + depositor: string; } export interface MsgCreateDeploymentAminoMsg { type: "/akash.deployment.v1beta2.MsgCreateDeployment"; @@ -65,10 +65,10 @@ export interface MsgDepositDeploymentProtoMsg { } /** MsgDepositDeployment deposits more funds into the deposit account */ export interface MsgDepositDeploymentAmino { - id?: DeploymentIDAmino; - amount?: CoinAmino; + id: DeploymentIDAmino; + amount: CoinAmino; /** Depositor pays for the deposit */ - depositor?: string; + depositor: string; } export interface MsgDepositDeploymentAminoMsg { type: "/akash.deployment.v1beta2.MsgDepositDeployment"; @@ -105,8 +105,8 @@ export interface MsgUpdateDeploymentProtoMsg { } /** MsgUpdateDeployment defines an SDK message for updating deployment */ export interface MsgUpdateDeploymentAmino { - id?: DeploymentIDAmino; - version?: string; + id: DeploymentIDAmino; + version: string; } export interface MsgUpdateDeploymentAminoMsg { type: "/akash.deployment.v1beta2.MsgUpdateDeployment"; @@ -141,7 +141,7 @@ export interface MsgCloseDeploymentProtoMsg { } /** MsgCloseDeployment defines an SDK message for closing deployment */ export interface MsgCloseDeploymentAmino { - id?: DeploymentIDAmino; + id: DeploymentIDAmino; } export interface MsgCloseDeploymentAminoMsg { type: "/akash.deployment.v1beta2.MsgCloseDeployment"; @@ -255,15 +255,15 @@ export const MsgCreateDeployment = { }, toAmino(message: MsgCreateDeployment): MsgCreateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined; - obj.depositor = message.depositor; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); + obj.depositor = message.depositor ?? ""; return obj; }, fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment { @@ -402,9 +402,9 @@ export const MsgDepositDeployment = { }, 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; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.amount = message.amount ? Coin.toAmino(message.amount) : Coin.toAmino(Coin.fromPartial({})); + obj.depositor = message.depositor ?? ""; return obj; }, fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment { @@ -530,8 +530,8 @@ export const MsgUpdateDeployment = { }, toAmino(message: MsgUpdateDeployment): MsgUpdateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; - obj.version = message.version ? base64FromBytes(message.version) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.version = message.version ? base64FromBytes(message.version) : ""; return obj; }, fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment { @@ -646,7 +646,7 @@ export const MsgCloseDeployment = { }, toAmino(message: MsgCloseDeployment): MsgCloseDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment { diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/genesis.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/genesis.ts index d4db99bab5..001f418651 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/genesis.ts @@ -15,8 +15,8 @@ export interface GenesisDeploymentProtoMsg { } /** GenesisDeployment defines the basic genesis state used by deployment module */ export interface GenesisDeploymentAmino { - deployment?: DeploymentAmino; - groups?: GroupAmino[]; + deployment: DeploymentAmino; + groups: GroupAmino[]; } export interface GenesisDeploymentAminoMsg { type: "/akash.deployment.v1beta2.GenesisDeployment"; @@ -38,8 +38,8 @@ export interface GenesisStateProtoMsg { } /** GenesisState stores slice of genesis deployment instance */ export interface GenesisStateAmino { - deployments?: GenesisDeploymentAmino[]; - params?: ParamsAmino; + deployments: GenesisDeploymentAmino[]; + params: ParamsAmino; } export interface GenesisStateAminoMsg { type: "/akash.deployment.v1beta2.GenesisState"; @@ -105,11 +105,11 @@ export const GenesisDeployment = { }, toAmino(message: GenesisDeployment): GenesisDeploymentAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } return obj; }, @@ -187,9 +187,9 @@ export const GenesisState = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/group.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/group.ts index d991f0597c..7a07799d70 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/group.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/group.ts @@ -72,9 +72,9 @@ export interface GroupProtoMsg { } /** Group stores group id, state and specifications of group */ export interface GroupAmino { - group_id?: GroupIDAmino; - state?: Group_State; - group_spec?: GroupSpecAmino; + group_id: GroupIDAmino; + state: Group_State; + group_spec: GroupSpecAmino; created_at?: string; } export interface GroupAminoMsg { @@ -159,7 +159,7 @@ export const Group = { message.groupId = GroupID.fromAmino(object.group_id); } if (object.state !== undefined && object.state !== null) { - message.state = group_StateFromJSON(object.state); + message.state = object.state; } if (object.group_spec !== undefined && object.group_spec !== null) { message.groupSpec = GroupSpec.fromAmino(object.group_spec); @@ -171,10 +171,10 @@ export const Group = { }, 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; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId) : GroupID.toAmino(GroupID.fromPartial({})); + obj.state = message.state ?? 0; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: GroupAminoMsg): Group { diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/groupid.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/groupid.ts index 59147f49bf..e1f896a492 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/groupid.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/groupid.ts @@ -13,9 +13,9 @@ export interface GroupIDProtoMsg { } /** GroupID stores owner, deployment sequence number and group sequence number */ export interface GroupIDAmino { - owner?: string; - dseq?: string; - gseq?: number; + owner: string; + dseq: string; + gseq: number; } export interface GroupIDAminoMsg { type: "/akash.deployment.v1beta2.GroupID"; @@ -95,9 +95,9 @@ export const GroupID = { }, toAmino(message: GroupID): GroupIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.gseq = message.gseq; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; return obj; }, fromAminoMsg(object: GroupIDAminoMsg): GroupID { diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/groupmsg.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/groupmsg.ts index 7084a9b3a1..dfee69b8f1 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/groupmsg.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/groupmsg.ts @@ -12,7 +12,7 @@ export interface MsgCloseGroupProtoMsg { } /** MsgCloseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgCloseGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } export interface MsgCloseGroupAminoMsg { type: "/akash.deployment.v1beta2.MsgCloseGroup"; @@ -46,7 +46,7 @@ export interface MsgPauseGroupProtoMsg { } /** MsgPauseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgPauseGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } export interface MsgPauseGroupAminoMsg { type: "/akash.deployment.v1beta2.MsgPauseGroup"; @@ -80,7 +80,7 @@ export interface MsgStartGroupProtoMsg { } /** MsgStartGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgStartGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } export interface MsgStartGroupAminoMsg { type: "/akash.deployment.v1beta2.MsgStartGroup"; @@ -150,7 +150,7 @@ export const MsgCloseGroup = { }, toAmino(message: MsgCloseGroup): MsgCloseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup { @@ -265,7 +265,7 @@ export const MsgPauseGroup = { }, toAmino(message: MsgPauseGroup): MsgPauseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup { @@ -380,7 +380,7 @@ export const MsgStartGroup = { }, toAmino(message: MsgStartGroup): MsgStartGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup { diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/groupspec.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/groupspec.ts index 20257d9e07..fd4dd14241 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/groupspec.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/groupspec.ts @@ -15,9 +15,9 @@ export interface GroupSpecProtoMsg { } /** GroupSpec stores group specifications */ export interface GroupSpecAmino { - name?: string; - requirements?: PlacementRequirementsAmino; - resources?: ResourceAmino[]; + name: string; + requirements: PlacementRequirementsAmino; + resources: ResourceAmino[]; } export interface GroupSpecAminoMsg { type: "/akash.deployment.v1beta2.GroupSpec"; @@ -95,12 +95,12 @@ export const GroupSpec = { }, toAmino(message: GroupSpec): GroupSpecAmino { const obj: any = {}; - obj.name = message.name; - obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : undefined; + obj.name = message.name ?? ""; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : PlacementRequirements.toAmino(PlacementRequirements.fromPartial({})); if (message.resources) { obj.resources = message.resources.map(e => e ? Resource.toAmino(e) : undefined); } else { - obj.resources = []; + obj.resources = message.resources; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/params.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/params.ts index 2cdb05a212..4d0c3328a1 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/params.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/params.ts @@ -12,7 +12,7 @@ export interface ParamsProtoMsg { } /** Params defines the parameters for the x/deployment package */ export interface ParamsAmino { - deployment_min_deposit?: CoinAmino; + deployment_min_deposit: CoinAmino; } export interface ParamsAminoMsg { type: "/akash.deployment.v1beta2.Params"; @@ -68,7 +68,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/query.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/query.ts index 238e0ea1fa..cebf7d8966 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/query.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/query.ts @@ -84,8 +84,8 @@ export interface QueryDeploymentResponseProtoMsg { } /** QueryDeploymentResponse is response type for the Query/Deployment RPC method */ export interface QueryDeploymentResponseAmino { - deployment?: DeploymentAmino; - groups?: GroupAmino[]; + deployment: DeploymentAmino; + groups: GroupAmino[]; escrow_account?: AccountAmino; } export interface QueryDeploymentResponseAminoMsg { @@ -275,7 +275,7 @@ export const QueryDeploymentsResponse = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -429,11 +429,11 @@ export const QueryDeploymentResponse = { }, toAmino(message: QueryDeploymentResponse): QueryDeploymentResponseAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/resource.ts b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/resource.ts index fb5389eb9c..d8d66e68ef 100644 --- a/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputsign/akash/deployment/v1beta2/resource.ts @@ -15,9 +15,9 @@ export interface ResourceProtoMsg { } /** Resource stores unit, total count and price of resource */ export interface ResourceAmino { - resources?: ResourceUnitsAmino; - count?: number; - price?: DecCoinAmino; + resources: ResourceUnitsAmino; + count: number; + price: DecCoinAmino; } export interface ResourceAminoMsg { type: "/akash.deployment.v1beta2.Resource"; @@ -99,9 +99,9 @@ export const Resource = { }, 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; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources) : ResourceUnits.toAmino(ResourceUnits.fromPartial({})); + obj.count = message.count ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); return obj; }, fromAminoMsg(object: ResourceAminoMsg): Resource { diff --git a/__fixtures__/v-next/outputsign/akash/escrow/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/akash/escrow/v1beta1/genesis.ts index a8853b0f98..979bdd5919 100644 --- a/__fixtures__/v-next/outputsign/akash/escrow/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/akash/escrow/v1beta1/genesis.ts @@ -13,8 +13,8 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by escrow module */ export interface GenesisStateAmino { - accounts?: AccountAmino[]; - payments?: PaymentAmino[]; + accounts: AccountAmino[]; + payments: PaymentAmino[]; } export interface GenesisStateAminoMsg { type: "/akash.escrow.v1beta1.GenesisState"; @@ -79,12 +79,12 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } if (message.payments) { obj.payments = message.payments.map(e => e ? Payment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/escrow/v1beta1/query.ts b/__fixtures__/v-next/outputsign/akash/escrow/v1beta1/query.ts index 11f103be10..9c64d955bc 100644 --- a/__fixtures__/v-next/outputsign/akash/escrow/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/akash/escrow/v1beta1/query.ts @@ -206,10 +206,10 @@ export const QueryAccountsRequest = { }, toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; - obj.owner = message.owner; - obj.state = message.state; + obj.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -287,7 +287,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -409,11 +409,11 @@ export const QueryPaymentsRequest = { }, 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.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -491,7 +491,7 @@ export const QueryPaymentsResponse = { if (message.payments) { obj.payments = message.payments.map(e => e ? Payment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/akash/escrow/v1beta1/types.ts b/__fixtures__/v-next/outputsign/akash/escrow/v1beta1/types.ts index fde5f4ce29..b737a5c08b 100644 --- a/__fixtures__/v-next/outputsign/akash/escrow/v1beta1/types.ts +++ b/__fixtures__/v-next/outputsign/akash/escrow/v1beta1/types.ts @@ -111,8 +111,8 @@ export interface AccountIDProtoMsg { } /** AccountID is the account identifier */ export interface AccountIDAmino { - scope?: string; - xid?: string; + scope: string; + xid: string; } export interface AccountIDAminoMsg { type: "/akash.escrow.v1beta1.AccountID"; @@ -145,17 +145,17 @@ export interface AccountProtoMsg { /** Account stores state for an escrow account */ export interface AccountAmino { /** unique identifier for this escrow account */ - id?: AccountIDAmino; + id: AccountIDAmino; /** bech32 encoded account address of the owner of this escrow account */ - owner?: string; + owner: string; /** current state of this escrow account */ - state?: Account_State; + state: Account_State; /** unspent coins received from the owner's wallet */ - balance?: CoinAmino; + balance: CoinAmino; /** total coins spent by this account */ - transferred?: CoinAmino; + transferred: CoinAmino; /** block height at which this account was last settled */ - settled_at?: string; + settled_at: string; } export interface AccountAminoMsg { type: "/akash.escrow.v1beta1.Account"; @@ -186,13 +186,13 @@ export interface PaymentProtoMsg { } /** Payment stores state for a payment */ export interface PaymentAmino { - account_id?: AccountIDAmino; - payment_id?: string; - owner?: string; - state?: Payment_State; - rate?: CoinAmino; - balance?: CoinAmino; - withdrawn?: CoinAmino; + account_id: AccountIDAmino; + payment_id: string; + owner: string; + state: Payment_State; + rate: CoinAmino; + balance: CoinAmino; + withdrawn: CoinAmino; } export interface PaymentAminoMsg { type: "/akash.escrow.v1beta1.Payment"; @@ -263,8 +263,8 @@ export const AccountID = { }, toAmino(message: AccountID): AccountIDAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; + obj.scope = message.scope ?? ""; + obj.xid = message.xid ?? ""; return obj; }, fromAminoMsg(object: AccountIDAminoMsg): AccountID { @@ -375,7 +375,7 @@ export const Account = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = account_StateFromJSON(object.state); + message.state = object.state; } if (object.balance !== undefined && object.balance !== null) { message.balance = Coin.fromAmino(object.balance); @@ -390,12 +390,12 @@ export const Account = { }, 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; + obj.id = message.id ? AccountID.toAmino(message.id) : AccountID.toAmino(AccountID.fromPartial({})); + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.balance = message.balance ? Coin.toAmino(message.balance) : Coin.toAmino(Coin.fromPartial({})); + obj.transferred = message.transferred ? Coin.toAmino(message.transferred) : Coin.toAmino(Coin.fromPartial({})); + obj.settled_at = message.settledAt ? message.settledAt.toString() : "0"; return obj; }, fromAminoMsg(object: AccountAminoMsg): Account { @@ -517,7 +517,7 @@ export const Payment = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = payment_StateFromJSON(object.state); + message.state = object.state; } if (object.rate !== undefined && object.rate !== null) { message.rate = Coin.fromAmino(object.rate); @@ -532,13 +532,13 @@ export const Payment = { }, 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; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId) : AccountID.toAmino(AccountID.fromPartial({})); + obj.payment_id = message.paymentId ?? ""; + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.rate = message.rate ? Coin.toAmino(message.rate) : Coin.toAmino(Coin.fromPartial({})); + obj.balance = message.balance ? Coin.toAmino(message.balance) : Coin.toAmino(Coin.fromPartial({})); + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: PaymentAminoMsg): Payment { diff --git a/__fixtures__/v-next/outputsign/akash/escrow/v1beta2/genesis.ts b/__fixtures__/v-next/outputsign/akash/escrow/v1beta2/genesis.ts index deedc5eddc..fc602e7bfe 100644 --- a/__fixtures__/v-next/outputsign/akash/escrow/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputsign/akash/escrow/v1beta2/genesis.ts @@ -13,8 +13,8 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by escrow module */ export interface GenesisStateAmino { - accounts?: AccountAmino[]; - payments?: FractionalPaymentAmino[]; + accounts: AccountAmino[]; + payments: FractionalPaymentAmino[]; } export interface GenesisStateAminoMsg { type: "/akash.escrow.v1beta2.GenesisState"; @@ -79,12 +79,12 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } if (message.payments) { obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/escrow/v1beta2/query.ts b/__fixtures__/v-next/outputsign/akash/escrow/v1beta2/query.ts index 011a266694..00879fc84f 100644 --- a/__fixtures__/v-next/outputsign/akash/escrow/v1beta2/query.ts +++ b/__fixtures__/v-next/outputsign/akash/escrow/v1beta2/query.ts @@ -206,10 +206,10 @@ export const QueryAccountsRequest = { }, toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; - obj.owner = message.owner; - obj.state = message.state; + obj.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -287,7 +287,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -409,11 +409,11 @@ export const QueryPaymentsRequest = { }, 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.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -491,7 +491,7 @@ export const QueryPaymentsResponse = { if (message.payments) { obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/akash/escrow/v1beta2/types.ts b/__fixtures__/v-next/outputsign/akash/escrow/v1beta2/types.ts index 86fb2a37fa..64ae8b14b0 100644 --- a/__fixtures__/v-next/outputsign/akash/escrow/v1beta2/types.ts +++ b/__fixtures__/v-next/outputsign/akash/escrow/v1beta2/types.ts @@ -111,8 +111,8 @@ export interface AccountIDProtoMsg { } /** AccountID is the account identifier */ export interface AccountIDAmino { - scope?: string; - xid?: string; + scope: string; + xid: string; } export interface AccountIDAminoMsg { type: "/akash.escrow.v1beta2.AccountID"; @@ -156,28 +156,28 @@ export interface AccountProtoMsg { /** Account stores state for an escrow account */ export interface AccountAmino { /** unique identifier for this escrow account */ - id?: AccountIDAmino; + id: AccountIDAmino; /** bech32 encoded account address of the owner of this escrow account */ - owner?: string; + owner: string; /** current state of this escrow account */ - state?: Account_State; + state: Account_State; /** unspent coins received from the owner's wallet */ - balance?: DecCoinAmino; + balance: DecCoinAmino; /** total coins spent by this account */ - transferred?: DecCoinAmino; + transferred: DecCoinAmino; /** block height at which this account was last settled */ - settled_at?: string; + settled_at: string; /** * bech32 encoded account address of the depositor. * If depositor is same as the owner, then any incoming coins are added to the Balance. * If depositor isn't same as the owner, then any incoming coins are added to the Funds. */ - depositor?: string; + depositor: string; /** * Funds are unspent coins received from the (non-Owner) Depositor's wallet. * If there are any funds, they should be spent before spending the Balance. */ - funds?: DecCoinAmino; + funds: DecCoinAmino; } export interface AccountAminoMsg { type: "/akash.escrow.v1beta2.Account"; @@ -210,13 +210,13 @@ export interface FractionalPaymentProtoMsg { } /** Payment stores state for a payment */ export interface FractionalPaymentAmino { - account_id?: AccountIDAmino; - payment_id?: string; - owner?: string; - state?: FractionalPayment_State; - rate?: DecCoinAmino; - balance?: DecCoinAmino; - withdrawn?: CoinAmino; + account_id: AccountIDAmino; + payment_id: string; + owner: string; + state: FractionalPayment_State; + rate: DecCoinAmino; + balance: DecCoinAmino; + withdrawn: CoinAmino; } export interface FractionalPaymentAminoMsg { type: "/akash.escrow.v1beta2.FractionalPayment"; @@ -287,8 +287,8 @@ export const AccountID = { }, toAmino(message: AccountID): AccountIDAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; + obj.scope = message.scope ?? ""; + obj.xid = message.xid ?? ""; return obj; }, fromAminoMsg(object: AccountIDAminoMsg): AccountID { @@ -417,7 +417,7 @@ export const Account = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = account_StateFromJSON(object.state); + message.state = object.state; } if (object.balance !== undefined && object.balance !== null) { message.balance = DecCoin.fromAmino(object.balance); @@ -438,14 +438,14 @@ export const Account = { }, 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; + obj.id = message.id ? AccountID.toAmino(message.id) : AccountID.toAmino(AccountID.fromPartial({})); + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.balance = message.balance ? DecCoin.toAmino(message.balance) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.transferred = message.transferred ? DecCoin.toAmino(message.transferred) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.settled_at = message.settledAt ? message.settledAt.toString() : "0"; + obj.depositor = message.depositor ?? ""; + obj.funds = message.funds ? DecCoin.toAmino(message.funds) : DecCoin.toAmino(DecCoin.fromPartial({})); return obj; }, fromAminoMsg(object: AccountAminoMsg): Account { @@ -567,7 +567,7 @@ export const FractionalPayment = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = fractionalPayment_StateFromJSON(object.state); + message.state = object.state; } if (object.rate !== undefined && object.rate !== null) { message.rate = DecCoin.fromAmino(object.rate); @@ -582,13 +582,13 @@ export const FractionalPayment = { }, 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; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId) : AccountID.toAmino(AccountID.fromPartial({})); + obj.payment_id = message.paymentId ?? ""; + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.rate = message.rate ? DecCoin.toAmino(message.rate) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.balance = message.balance ? DecCoin.toAmino(message.balance) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: FractionalPaymentAminoMsg): FractionalPayment { diff --git a/__fixtures__/v-next/outputsign/akash/inflation/v1beta2/genesis.ts b/__fixtures__/v-next/outputsign/akash/inflation/v1beta2/genesis.ts index bcab7355a4..7aa29f2a74 100644 --- a/__fixtures__/v-next/outputsign/akash/inflation/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputsign/akash/inflation/v1beta2/genesis.ts @@ -12,7 +12,7 @@ export interface GenesisStateProtoMsg { } /** GenesisState stores slice of genesis deployment instance */ export interface GenesisStateAmino { - params?: ParamsAmino; + params: ParamsAmino; } export interface GenesisStateAminoMsg { type: "/akash.inflation.v1beta2.GenesisState"; @@ -68,7 +68,7 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputsign/akash/inflation/v1beta2/params.ts b/__fixtures__/v-next/outputsign/akash/inflation/v1beta2/params.ts index 9a9d18a7b9..eb6743c1f9 100644 --- a/__fixtures__/v-next/outputsign/akash/inflation/v1beta2/params.ts +++ b/__fixtures__/v-next/outputsign/akash/inflation/v1beta2/params.ts @@ -24,17 +24,17 @@ export interface ParamsProtoMsg { /** Params defines the parameters for the x/deployment package */ export interface ParamsAmino { /** InflationDecayFactor is the number of years it takes inflation to halve. */ - inflation_decay_factor?: string; + inflation_decay_factor: string; /** * InitialInflation is the rate at which inflation starts at genesis. * It is a decimal value in the range [0.0, 100.0]. */ - initial_inflation?: string; + initial_inflation: string; /** * Variance defines the fraction by which inflation can vary from ideal inflation in a block. * It is a decimal value in the range [0.0, 1.0]. */ - variance?: string; + variance: string; } export interface ParamsAminoMsg { type: "/akash.inflation.v1beta2.Params"; @@ -112,9 +112,9 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.inflation_decay_factor = message.inflationDecayFactor; - obj.initial_inflation = message.initialInflation; - obj.variance = message.variance; + obj.inflation_decay_factor = message.inflationDecayFactor ?? ""; + obj.initial_inflation = message.initialInflation ?? ""; + obj.variance = message.variance ?? ""; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/akash/market/v1beta2/bid.ts b/__fixtures__/v-next/outputsign/akash/market/v1beta2/bid.ts index 9a1e217e8d..734c204845 100644 --- a/__fixtures__/v-next/outputsign/akash/market/v1beta2/bid.ts +++ b/__fixtures__/v-next/outputsign/akash/market/v1beta2/bid.ts @@ -72,10 +72,10 @@ export interface MsgCreateBidProtoMsg { } /** MsgCreateBid defines an SDK message for creating Bid */ export interface MsgCreateBidAmino { - order?: OrderIDAmino; - provider?: string; - price?: DecCoinAmino; - deposit?: CoinAmino; + order: OrderIDAmino; + provider: string; + price: DecCoinAmino; + deposit: CoinAmino; } export interface MsgCreateBidAminoMsg { type: "/akash.market.v1beta2.MsgCreateBid"; @@ -112,7 +112,7 @@ export interface MsgCloseBidProtoMsg { } /** MsgCloseBid defines an SDK message for closing bid */ export interface MsgCloseBidAmino { - bid_id?: BidIDAmino; + bid_id: BidIDAmino; } export interface MsgCloseBidAminoMsg { type: "/akash.market.v1beta2.MsgCloseBid"; @@ -156,11 +156,11 @@ export interface BidIDProtoMsg { * A successful bid becomes a Lease(ID). */ export interface BidIDAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - provider?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + provider: string; } export interface BidIDAminoMsg { type: "/akash.market.v1beta2.BidID"; @@ -190,9 +190,9 @@ export interface BidProtoMsg { } /** Bid stores BidID, state of bid and price */ export interface BidAmino { - bid_id?: BidIDAmino; - state?: Bid_State; - price?: DecCoinAmino; + bid_id: BidIDAmino; + state: Bid_State; + price: DecCoinAmino; created_at?: string; } export interface BidAminoMsg { @@ -221,12 +221,12 @@ export interface BidFiltersProtoMsg { } /** BidFilters defines flags for bid list filter */ export interface BidFiltersAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - provider?: string; - state?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + provider: string; + state: string; } export interface BidFiltersAminoMsg { type: "/akash.market.v1beta2.BidFilters"; @@ -324,10 +324,10 @@ export const MsgCreateBid = { }, 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; + obj.order = message.order ? OrderID.toAmino(message.order) : OrderID.toAmino(OrderID.fromPartial({})); + obj.provider = message.provider ?? ""; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateBidAminoMsg): MsgCreateBid { @@ -442,7 +442,7 @@ export const MsgCloseBid = { }, toAmino(message: MsgCloseBid): MsgCloseBidAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseBidAminoMsg): MsgCloseBid { @@ -601,11 +601,11 @@ export const BidID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; return obj; }, fromAminoMsg(object: BidIDAminoMsg): BidID { @@ -695,7 +695,7 @@ export const Bid = { message.bidId = BidID.fromAmino(object.bid_id); } if (object.state !== undefined && object.state !== null) { - message.state = bid_StateFromJSON(object.state); + message.state = object.state; } if (object.price !== undefined && object.price !== null) { message.price = DecCoin.fromAmino(object.price); @@ -707,10 +707,10 @@ export const Bid = { }, 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; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); + obj.state = message.state ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: BidAminoMsg): Bid { @@ -830,12 +830,12 @@ export const BidFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: BidFiltersAminoMsg): BidFilters { diff --git a/__fixtures__/v-next/outputsign/akash/market/v1beta2/genesis.ts b/__fixtures__/v-next/outputsign/akash/market/v1beta2/genesis.ts index aa95b9d351..cddbd22597 100644 --- a/__fixtures__/v-next/outputsign/akash/market/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputsign/akash/market/v1beta2/genesis.ts @@ -16,9 +16,9 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by market module */ export interface GenesisStateAmino { - orders?: OrderAmino[]; - leases?: LeaseAmino[]; - params?: ParamsAmino; + orders: OrderAmino[]; + leases: LeaseAmino[]; + params: ParamsAmino; } export interface GenesisStateAminoMsg { type: "/akash.market.v1beta2.GenesisState"; @@ -97,14 +97,14 @@ export const GenesisState = { if (message.orders) { obj.orders = message.orders.map(e => e ? Order.toAmino(e) : undefined); } else { - obj.orders = []; + obj.orders = message.orders; } if (message.leases) { obj.leases = message.leases.map(e => e ? Lease.toAmino(e) : undefined); } else { - obj.leases = []; + obj.leases = message.leases; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputsign/akash/market/v1beta2/lease.ts b/__fixtures__/v-next/outputsign/akash/market/v1beta2/lease.ts index 5e9c0829e3..ad70cffb52 100644 --- a/__fixtures__/v-next/outputsign/akash/market/v1beta2/lease.ts +++ b/__fixtures__/v-next/outputsign/akash/market/v1beta2/lease.ts @@ -66,11 +66,11 @@ export interface LeaseIDProtoMsg { } /** LeaseID stores bid details of lease */ export interface LeaseIDAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - provider?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + provider: string; } export interface LeaseIDAminoMsg { type: "/akash.market.v1beta2.LeaseID"; @@ -98,9 +98,9 @@ export interface LeaseProtoMsg { } /** Lease stores LeaseID, state of lease and price */ export interface LeaseAmino { - lease_id?: LeaseIDAmino; - state?: Lease_State; - price?: DecCoinAmino; + lease_id: LeaseIDAmino; + state: Lease_State; + price: DecCoinAmino; created_at?: string; closed_on?: string; } @@ -131,12 +131,12 @@ export interface LeaseFiltersProtoMsg { } /** LeaseFilters defines flags for lease list filter */ export interface LeaseFiltersAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - provider?: string; - state?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + provider: string; + state: string; } export interface LeaseFiltersAminoMsg { type: "/akash.market.v1beta2.LeaseFilters"; @@ -161,7 +161,7 @@ export interface MsgCreateLeaseProtoMsg { } /** MsgCreateLease is sent to create a lease */ export interface MsgCreateLeaseAmino { - bid_id?: BidIDAmino; + bid_id: BidIDAmino; } export interface MsgCreateLeaseAminoMsg { type: "/akash.market.v1beta2.MsgCreateLease"; @@ -195,7 +195,7 @@ export interface MsgWithdrawLeaseProtoMsg { } /** MsgWithdrawLease defines an SDK message for closing bid */ export interface MsgWithdrawLeaseAmino { - bid_id?: LeaseIDAmino; + bid_id: LeaseIDAmino; } export interface MsgWithdrawLeaseAminoMsg { type: "/akash.market.v1beta2.MsgWithdrawLease"; @@ -229,7 +229,7 @@ export interface MsgCloseLeaseProtoMsg { } /** MsgCloseLease defines an SDK message for closing order */ export interface MsgCloseLeaseAmino { - lease_id?: LeaseIDAmino; + lease_id: LeaseIDAmino; } export interface MsgCloseLeaseAminoMsg { type: "/akash.market.v1beta2.MsgCloseLease"; @@ -343,11 +343,11 @@ export const LeaseID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; return obj; }, fromAminoMsg(object: LeaseIDAminoMsg): LeaseID { @@ -447,7 +447,7 @@ export const Lease = { message.leaseId = LeaseID.fromAmino(object.lease_id); } if (object.state !== undefined && object.state !== null) { - message.state = lease_StateFromJSON(object.state); + message.state = object.state; } if (object.price !== undefined && object.price !== null) { message.price = DecCoin.fromAmino(object.price); @@ -462,11 +462,11 @@ export const Lease = { }, 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; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : LeaseID.toAmino(LeaseID.fromPartial({})); + obj.state = message.state ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; + obj.closed_on = message.closedOn !== BigInt(0) ? message.closedOn.toString() : undefined; return obj; }, fromAminoMsg(object: LeaseAminoMsg): Lease { @@ -586,12 +586,12 @@ export const LeaseFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: LeaseFiltersAminoMsg): LeaseFilters { @@ -656,7 +656,7 @@ export const MsgCreateLease = { }, toAmino(message: MsgCreateLease): MsgCreateLeaseAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateLeaseAminoMsg): MsgCreateLease { @@ -771,7 +771,7 @@ export const MsgWithdrawLease = { }, toAmino(message: MsgWithdrawLease): MsgWithdrawLeaseAmino { const obj: any = {}; - obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId) : LeaseID.toAmino(LeaseID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgWithdrawLeaseAminoMsg): MsgWithdrawLease { @@ -886,7 +886,7 @@ export const MsgCloseLease = { }, toAmino(message: MsgCloseLease): MsgCloseLeaseAmino { const obj: any = {}; - obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : undefined; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : LeaseID.toAmino(LeaseID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseLeaseAminoMsg): MsgCloseLease { diff --git a/__fixtures__/v-next/outputsign/akash/market/v1beta2/order.ts b/__fixtures__/v-next/outputsign/akash/market/v1beta2/order.ts index f189cdf039..e5066ab15e 100644 --- a/__fixtures__/v-next/outputsign/akash/market/v1beta2/order.ts +++ b/__fixtures__/v-next/outputsign/akash/market/v1beta2/order.ts @@ -64,10 +64,10 @@ export interface OrderIDProtoMsg { } /** OrderID stores owner and all other seq numbers */ export interface OrderIDAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; + owner: string; + dseq: string; + gseq: number; + oseq: number; } export interface OrderIDAminoMsg { type: "/akash.market.v1beta2.OrderID"; @@ -93,9 +93,9 @@ export interface OrderProtoMsg { } /** Order stores orderID, state of order and other details */ export interface OrderAmino { - order_id?: OrderIDAmino; - state?: Order_State; - spec?: GroupSpecAmino; + order_id: OrderIDAmino; + state: Order_State; + spec: GroupSpecAmino; created_at?: string; } export interface OrderAminoMsg { @@ -123,11 +123,11 @@ export interface OrderFiltersProtoMsg { } /** OrderFilters defines flags for order list filter */ export interface OrderFiltersAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - state?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + state: string; } export interface OrderFiltersAminoMsg { type: "/akash.market.v1beta2.OrderFilters"; @@ -220,10 +220,10 @@ export const OrderID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; return obj; }, fromAminoMsg(object: OrderIDAminoMsg): OrderID { @@ -313,7 +313,7 @@ export const Order = { message.orderId = OrderID.fromAmino(object.order_id); } if (object.state !== undefined && object.state !== null) { - message.state = order_StateFromJSON(object.state); + message.state = object.state; } if (object.spec !== undefined && object.spec !== null) { message.spec = GroupSpec.fromAmino(object.spec); @@ -325,10 +325,10 @@ export const Order = { }, 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; + obj.order_id = message.orderId ? OrderID.toAmino(message.orderId) : OrderID.toAmino(OrderID.fromPartial({})); + obj.state = message.state ?? 0; + obj.spec = message.spec ? GroupSpec.toAmino(message.spec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: OrderAminoMsg): Order { @@ -437,11 +437,11 @@ export const OrderFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: OrderFiltersAminoMsg): OrderFilters { diff --git a/__fixtures__/v-next/outputsign/akash/market/v1beta2/params.ts b/__fixtures__/v-next/outputsign/akash/market/v1beta2/params.ts index b6c05e316e..2e16b2cfd3 100644 --- a/__fixtures__/v-next/outputsign/akash/market/v1beta2/params.ts +++ b/__fixtures__/v-next/outputsign/akash/market/v1beta2/params.ts @@ -13,8 +13,8 @@ export interface ParamsProtoMsg { } /** Params is the params for the x/market module */ export interface ParamsAmino { - bid_min_deposit?: CoinAmino; - order_max_bids?: number; + bid_min_deposit: CoinAmino; + order_max_bids: number; } export interface ParamsAminoMsg { type: "/akash.market.v1beta2.Params"; @@ -82,8 +82,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit) : undefined; - obj.order_max_bids = message.orderMaxBids; + obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit) : Coin.toAmino(Coin.fromPartial({})); + obj.order_max_bids = message.orderMaxBids ?? 0; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/akash/market/v1beta2/query.ts b/__fixtures__/v-next/outputsign/akash/market/v1beta2/query.ts index b35129074f..76611e8de7 100644 --- a/__fixtures__/v-next/outputsign/akash/market/v1beta2/query.ts +++ b/__fixtures__/v-next/outputsign/akash/market/v1beta2/query.ts @@ -407,7 +407,7 @@ export const QueryOrdersResponse = { if (message.orders) { obj.orders = message.orders.map(e => e ? Order.toAmino(e) : undefined); } else { - obj.orders = []; + obj.orders = message.orders; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -695,7 +695,7 @@ export const QueryBidsResponse = { if (message.bids) { obj.bids = message.bids.map(e => e ? QueryBidResponse.toAmino(e) : undefined); } else { - obj.bids = []; + obj.bids = message.bids; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -997,7 +997,7 @@ export const QueryLeasesResponse = { if (message.leases) { obj.leases = message.leases.map(e => e ? QueryLeaseResponse.toAmino(e) : undefined); } else { - obj.leases = []; + obj.leases = message.leases; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/akash/provider/v1beta1/provider.ts b/__fixtures__/v-next/outputsign/akash/provider/v1beta1/provider.ts index a1bc7d968b..cec99228f5 100644 --- a/__fixtures__/v-next/outputsign/akash/provider/v1beta1/provider.ts +++ b/__fixtures__/v-next/outputsign/akash/provider/v1beta1/provider.ts @@ -13,8 +13,8 @@ export interface ProviderInfoProtoMsg { } /** ProviderInfo */ export interface ProviderInfoAmino { - email?: string; - website?: string; + email: string; + website: string; } export interface ProviderInfoAminoMsg { type: "/akash.provider.v1beta1.ProviderInfo"; @@ -38,10 +38,10 @@ export interface MsgCreateProviderProtoMsg { } /** MsgCreateProvider defines an SDK message for creating a provider */ export interface MsgCreateProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } export interface MsgCreateProviderAminoMsg { type: "/akash.provider.v1beta1.MsgCreateProvider"; @@ -81,10 +81,10 @@ export interface MsgUpdateProviderProtoMsg { } /** MsgUpdateProvider defines an SDK message for updating a provider */ export interface MsgUpdateProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } export interface MsgUpdateProviderAminoMsg { type: "/akash.provider.v1beta1.MsgUpdateProvider"; @@ -121,7 +121,7 @@ export interface MsgDeleteProviderProtoMsg { } /** MsgDeleteProvider defines an SDK message for deleting a provider */ export interface MsgDeleteProviderAmino { - owner?: string; + owner: string; } export interface MsgDeleteProviderAminoMsg { type: "/akash.provider.v1beta1.MsgDeleteProvider"; @@ -158,10 +158,10 @@ export interface ProviderProtoMsg { } /** Provider stores owner and host details */ export interface ProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } export interface ProviderAminoMsg { type: "/akash.provider.v1beta1.Provider"; @@ -229,8 +229,8 @@ export const ProviderInfo = { }, toAmino(message: ProviderInfo): ProviderInfoAmino { const obj: any = {}; - obj.email = message.email; - obj.website = message.website; + obj.email = message.email ?? ""; + obj.website = message.website ?? ""; return obj; }, fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo { @@ -326,14 +326,14 @@ export const MsgCreateProvider = { }, toAmino(message: MsgCreateProvider): MsgCreateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider { @@ -479,14 +479,14 @@ export const MsgUpdateProvider = { }, toAmino(message: MsgUpdateProvider): MsgUpdateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider { @@ -599,7 +599,7 @@ export const MsgDeleteProvider = { }, toAmino(message: MsgDeleteProvider): MsgDeleteProviderAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner ?? ""; return obj; }, fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider { @@ -745,14 +745,14 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: ProviderAminoMsg): Provider { diff --git a/__fixtures__/v-next/outputsign/akash/provider/v1beta2/genesis.ts b/__fixtures__/v-next/outputsign/akash/provider/v1beta2/genesis.ts index b9872431fb..feebc5a408 100644 --- a/__fixtures__/v-next/outputsign/akash/provider/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputsign/akash/provider/v1beta2/genesis.ts @@ -12,7 +12,7 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by provider module */ export interface GenesisStateAmino { - providers?: ProviderAmino[]; + providers: ProviderAmino[]; } export interface GenesisStateAminoMsg { type: "/akash.provider.v1beta2.GenesisState"; @@ -67,7 +67,7 @@ export const GenesisState = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/akash/provider/v1beta2/provider.ts b/__fixtures__/v-next/outputsign/akash/provider/v1beta2/provider.ts index 58a60f9cc5..628b9b28eb 100644 --- a/__fixtures__/v-next/outputsign/akash/provider/v1beta2/provider.ts +++ b/__fixtures__/v-next/outputsign/akash/provider/v1beta2/provider.ts @@ -13,8 +13,8 @@ export interface ProviderInfoProtoMsg { } /** ProviderInfo */ export interface ProviderInfoAmino { - email?: string; - website?: string; + email: string; + website: string; } export interface ProviderInfoAminoMsg { type: "/akash.provider.v1beta2.ProviderInfo"; @@ -38,10 +38,10 @@ export interface MsgCreateProviderProtoMsg { } /** MsgCreateProvider defines an SDK message for creating a provider */ export interface MsgCreateProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } export interface MsgCreateProviderAminoMsg { type: "/akash.provider.v1beta2.MsgCreateProvider"; @@ -81,10 +81,10 @@ export interface MsgUpdateProviderProtoMsg { } /** MsgUpdateProvider defines an SDK message for updating a provider */ export interface MsgUpdateProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } export interface MsgUpdateProviderAminoMsg { type: "/akash.provider.v1beta2.MsgUpdateProvider"; @@ -121,7 +121,7 @@ export interface MsgDeleteProviderProtoMsg { } /** MsgDeleteProvider defines an SDK message for deleting a provider */ export interface MsgDeleteProviderAmino { - owner?: string; + owner: string; } export interface MsgDeleteProviderAminoMsg { type: "/akash.provider.v1beta2.MsgDeleteProvider"; @@ -158,10 +158,10 @@ export interface ProviderProtoMsg { } /** Provider stores owner and host details */ export interface ProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } export interface ProviderAminoMsg { type: "/akash.provider.v1beta2.Provider"; @@ -229,8 +229,8 @@ export const ProviderInfo = { }, toAmino(message: ProviderInfo): ProviderInfoAmino { const obj: any = {}; - obj.email = message.email; - obj.website = message.website; + obj.email = message.email ?? ""; + obj.website = message.website ?? ""; return obj; }, fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo { @@ -326,14 +326,14 @@ export const MsgCreateProvider = { }, toAmino(message: MsgCreateProvider): MsgCreateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider { @@ -479,14 +479,14 @@ export const MsgUpdateProvider = { }, toAmino(message: MsgUpdateProvider): MsgUpdateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider { @@ -599,7 +599,7 @@ export const MsgDeleteProvider = { }, toAmino(message: MsgDeleteProvider): MsgDeleteProviderAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner ?? ""; return obj; }, fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider { @@ -745,14 +745,14 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: ProviderAminoMsg): Provider { diff --git a/__fixtures__/v-next/outputsign/akash/provider/v1beta2/query.ts b/__fixtures__/v-next/outputsign/akash/provider/v1beta2/query.ts index 479d877378..aedb74dd80 100644 --- a/__fixtures__/v-next/outputsign/akash/provider/v1beta2/query.ts +++ b/__fixtures__/v-next/outputsign/akash/provider/v1beta2/query.ts @@ -209,7 +209,7 @@ export const QueryProvidersResponse = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -274,7 +274,7 @@ export const QueryProviderRequest = { }, toAmino(message: QueryProviderRequest): QueryProviderRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest { diff --git a/__fixtures__/v-next/outputsign/confio/proofs.ts b/__fixtures__/v-next/outputsign/confio/proofs.ts index a3531ec9c8..32d65557ef 100644 --- a/__fixtures__/v-next/outputsign/confio/proofs.ts +++ b/__fixtures__/v-next/outputsign/confio/proofs.ts @@ -837,7 +837,7 @@ export const ExistenceProof = { if (message.path) { obj.path = message.path.map(e => e ? InnerOp.toAmino(e) : undefined); } else { - obj.path = []; + obj.path = message.path; } return obj; }, @@ -1125,16 +1125,16 @@ export const LeafOp = { fromAmino(object: LeafOpAmino): LeafOp { const message = createBaseLeafOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prehash_key !== undefined && object.prehash_key !== null) { - message.prehashKey = hashOpFromJSON(object.prehash_key); + message.prehashKey = object.prehash_key; } if (object.prehash_value !== undefined && object.prehash_value !== null) { - message.prehashValue = hashOpFromJSON(object.prehash_value); + message.prehashValue = object.prehash_value; } if (object.length !== undefined && object.length !== null) { - message.length = lengthOpFromJSON(object.length); + message.length = object.length; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1143,10 +1143,10 @@ export const LeafOp = { }, 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.hash = message.hash === 0 ? undefined : message.hash; + obj.prehash_key = message.prehashKey === 0 ? undefined : message.prehashKey; + obj.prehash_value = message.prehashValue === 0 ? undefined : message.prehashValue; + obj.length = message.length === 0 ? undefined : message.length; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; }, @@ -1220,7 +1220,7 @@ export const InnerOp = { fromAmino(object: InnerOpAmino): InnerOp { const message = createBaseInnerOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1232,7 +1232,7 @@ export const InnerOp = { }, toAmino(message: InnerOp): InnerOpAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; obj.suffix = message.suffix ? base64FromBytes(message.suffix) : undefined; return obj; @@ -1336,8 +1336,8 @@ export const ProofSpec = { 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; + obj.max_depth = message.maxDepth === 0 ? undefined : message.maxDepth; + obj.min_depth = message.minDepth === 0 ? undefined : message.minDepth; return obj; }, fromAminoMsg(object: ProofSpecAminoMsg): ProofSpec { @@ -1456,7 +1456,7 @@ export const InnerSpec = { message.emptyChild = bytesFromBase64(object.empty_child); } if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } return message; }, @@ -1465,13 +1465,13 @@ export const InnerSpec = { if (message.childOrder) { obj.child_order = message.childOrder.map(e => e); } else { - obj.child_order = []; + obj.child_order = message.childOrder; } - obj.child_size = message.childSize; - obj.min_prefix_length = message.minPrefixLength; - obj.max_prefix_length = message.maxPrefixLength; + obj.child_size = message.childSize === 0 ? undefined : message.childSize; + obj.min_prefix_length = message.minPrefixLength === 0 ? undefined : message.minPrefixLength; + obj.max_prefix_length = message.maxPrefixLength === 0 ? undefined : message.maxPrefixLength; obj.empty_child = message.emptyChild ? base64FromBytes(message.emptyChild) : undefined; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; return obj; }, fromAminoMsg(object: InnerSpecAminoMsg): InnerSpec { @@ -1535,7 +1535,7 @@ export const BatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? BatchEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1688,12 +1688,12 @@ export const CompressedBatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? CompressedBatchEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.lookupInners) { obj.lookup_inners = message.lookupInners.map(e => e ? InnerOp.toAmino(e) : undefined); } else { - obj.lookup_inners = []; + obj.lookup_inners = message.lookupInners; } return obj; }, @@ -1884,7 +1884,7 @@ export const CompressedExistenceProof = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/app/v1alpha1/config.ts b/__fixtures__/v-next/outputsign/cosmos/app/v1alpha1/config.ts index 13c76ce647..6e8fbb4e22 100644 --- a/__fixtures__/v-next/outputsign/cosmos/app/v1alpha1/config.ts +++ b/__fixtures__/v-next/outputsign/cosmos/app/v1alpha1/config.ts @@ -148,7 +148,7 @@ export const Config = { if (message.modules) { obj.modules = message.modules.map(e => e ? ModuleConfig.toAmino(e) : undefined); } else { - obj.modules = []; + obj.modules = message.modules; } return obj; }, @@ -231,7 +231,7 @@ export const ModuleConfig = { }, toAmino(message: ModuleConfig): ModuleConfigAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.config = message.config ? Any.toAmino(message.config) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/app/v1alpha1/module.ts b/__fixtures__/v-next/outputsign/cosmos/app/v1alpha1/module.ts index 025ea49eea..ef4df32cbf 100644 --- a/__fixtures__/v-next/outputsign/cosmos/app/v1alpha1/module.ts +++ b/__fixtures__/v-next/outputsign/cosmos/app/v1alpha1/module.ts @@ -269,16 +269,16 @@ export const ModuleDescriptor = { }, toAmino(message: ModuleDescriptor): ModuleDescriptorAmino { const obj: any = {}; - obj.go_import = message.goImport; + obj.go_import = message.goImport === "" ? undefined : message.goImport; if (message.usePackage) { obj.use_package = message.usePackage.map(e => e ? PackageReference.toAmino(e) : undefined); } else { - obj.use_package = []; + obj.use_package = message.usePackage; } if (message.canMigrateFrom) { obj.can_migrate_from = message.canMigrateFrom.map(e => e ? MigrateFromInfo.toAmino(e) : undefined); } else { - obj.can_migrate_from = []; + obj.can_migrate_from = message.canMigrateFrom; } return obj; }, @@ -359,8 +359,8 @@ export const PackageReference = { }, toAmino(message: PackageReference): PackageReferenceAmino { const obj: any = {}; - obj.name = message.name; - obj.revision = message.revision; + obj.name = message.name === "" ? undefined : message.name; + obj.revision = message.revision === 0 ? undefined : message.revision; return obj; }, fromAminoMsg(object: PackageReferenceAminoMsg): PackageReference { @@ -429,7 +429,7 @@ export const MigrateFromInfo = { }, toAmino(message: MigrateFromInfo): MigrateFromInfoAmino { const obj: any = {}; - obj.module = message.module; + obj.module = message.module === "" ? undefined : message.module; return obj; }, fromAminoMsg(object: MigrateFromInfoAminoMsg): MigrateFromInfo { diff --git a/__fixtures__/v-next/outputsign/cosmos/auth/v1beta1/auth.ts b/__fixtures__/v-next/outputsign/cosmos/auth/v1beta1/auth.ts index 21dade1f16..0627d0e88b 100644 --- a/__fixtures__/v-next/outputsign/cosmos/auth/v1beta1/auth.ts +++ b/__fixtures__/v-next/outputsign/cosmos/auth/v1beta1/auth.ts @@ -184,10 +184,10 @@ export const BaseAccount = { }, toAmino(message: BaseAccount): BaseAccountAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : 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; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: BaseAccountAminoMsg): BaseAccount { @@ -279,11 +279,11 @@ export const ModuleAccount = { toAmino(message: ModuleAccount): ModuleAccountAmino { const obj: any = {}; obj.base_account = message.baseAccount ? BaseAccount.toAmino(message.baseAccount) : undefined; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.permissions) { obj.permissions = message.permissions.map(e => e); } else { - obj.permissions = []; + obj.permissions = message.permissions; } return obj; }, @@ -407,11 +407,11 @@ export const Params = { }, 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; + obj.max_memo_characters = message.maxMemoCharacters !== BigInt(0) ? message.maxMemoCharacters.toString() : undefined; + obj.tx_sig_limit = message.txSigLimit !== BigInt(0) ? message.txSigLimit.toString() : undefined; + obj.tx_size_cost_per_byte = message.txSizeCostPerByte !== BigInt(0) ? message.txSizeCostPerByte.toString() : undefined; + obj.sig_verify_cost_ed25519 = message.sigVerifyCostEd25519 !== BigInt(0) ? message.sigVerifyCostEd25519.toString() : undefined; + obj.sig_verify_cost_secp256k1 = message.sigVerifyCostSecp256k1 !== BigInt(0) ? message.sigVerifyCostSecp256k1.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/cosmos/auth/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/auth/v1beta1/genesis.ts index 769a7cb3e4..214c9f175b 100644 --- a/__fixtures__/v-next/outputsign/cosmos/auth/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/auth/v1beta1/genesis.ts @@ -89,7 +89,7 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/auth/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/auth/v1beta1/query.ts index fcab4e01ea..9d580bffbc 100644 --- a/__fixtures__/v-next/outputsign/cosmos/auth/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/auth/v1beta1/query.ts @@ -434,7 +434,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -505,7 +505,7 @@ export const QueryAccountRequest = { }, toAmino(message: QueryAccountRequest): QueryAccountRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryAccountRequestAminoMsg): QueryAccountRequest { @@ -829,7 +829,7 @@ export const QueryModuleAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } return obj; }, @@ -955,7 +955,7 @@ export const Bech32PrefixResponse = { }, toAmino(message: Bech32PrefixResponse): Bech32PrefixResponseAmino { const obj: any = {}; - obj.bech32_prefix = message.bech32Prefix; + obj.bech32_prefix = message.bech32Prefix === "" ? undefined : message.bech32Prefix; return obj; }, fromAminoMsg(object: Bech32PrefixResponseAminoMsg): Bech32PrefixResponse { @@ -1093,7 +1093,7 @@ export const AddressBytesToStringResponse = { }, toAmino(message: AddressBytesToStringResponse): AddressBytesToStringResponseAmino { const obj: any = {}; - obj.address_string = message.addressString; + obj.address_string = message.addressString === "" ? undefined : message.addressString; return obj; }, fromAminoMsg(object: AddressBytesToStringResponseAminoMsg): AddressBytesToStringResponse { @@ -1162,7 +1162,7 @@ export const AddressStringToBytesRequest = { }, toAmino(message: AddressStringToBytesRequest): AddressStringToBytesRequestAmino { const obj: any = {}; - obj.address_string = message.addressString; + obj.address_string = message.addressString === "" ? undefined : message.addressString; return obj; }, fromAminoMsg(object: AddressStringToBytesRequestAminoMsg): AddressStringToBytesRequest { diff --git a/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/authz.ts b/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/authz.ts index 8f15ef9979..ce0ec51d7c 100644 --- a/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/authz.ts @@ -180,7 +180,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { @@ -367,8 +367,8 @@ export const GrantAuthorization = { }, toAmino(message: GrantAuthorization): GrantAuthorizationAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.authorization = message.authorization ? Any.toAmino(message.authorization) : undefined; obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -440,7 +440,7 @@ export const GrantQueueItem = { if (message.msgTypeUrls) { obj.msg_type_urls = message.msgTypeUrls.map(e => e); } else { - obj.msg_type_urls = []; + obj.msg_type_urls = message.msgTypeUrls; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/genesis.ts index 2b6c39ef6a..651872e807 100644 --- a/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/genesis.ts @@ -67,7 +67,7 @@ export const GenesisState = { if (message.authorization) { obj.authorization = message.authorization.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.authorization = []; + obj.authorization = message.authorization; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/query.ts index f1ce2a1d16..5e78eef49a 100644 --- a/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/query.ts @@ -246,9 +246,9 @@ export const QueryGrantsRequest = { }, toAmino(message: QueryGrantsRequest): QueryGrantsRequestAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -332,7 +332,7 @@ export const QueryGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -416,7 +416,7 @@ export const QueryGranterGrantsRequest = { }, toAmino(message: QueryGranterGrantsRequest): QueryGranterGrantsRequestAmino { const obj: any = {}; - obj.granter = message.granter; + obj.granter = message.granter === "" ? undefined : message.granter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -500,7 +500,7 @@ export const QueryGranterGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -584,7 +584,7 @@ export const QueryGranteeGrantsRequest = { }, toAmino(message: QueryGranteeGrantsRequest): QueryGranteeGrantsRequestAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -668,7 +668,7 @@ export const QueryGranteeGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/tx.ts index 7e8f0560ea..0b7cf6c127 100644 --- a/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/authz/v1beta1/tx.ts @@ -234,8 +234,8 @@ export const MsgGrant = { }, toAmino(message: MsgGrant): MsgGrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.grant = message.grant ? Grant.toAmino(message.grant) : undefined; return obj; }, @@ -306,7 +306,7 @@ export const MsgExecResponse = { if (message.results) { obj.results = message.results.map(e => base64FromBytes(e)); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -385,11 +385,11 @@ export const MsgExec = { }, toAmino(message: MsgExec): MsgExecAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -537,9 +537,9 @@ export const MsgRevoke = { }, toAmino(message: MsgRevoke): MsgRevokeAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromAminoMsg(object: MsgRevokeAminoMsg): MsgRevoke { diff --git a/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/authz.ts b/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/authz.ts index afc043ab36..835be2a105 100644 --- a/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/authz.ts @@ -82,7 +82,7 @@ export const SendAuthorization = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/bank.ts b/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/bank.ts index 613fb885b3..38a30354c4 100644 --- a/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/bank.ts +++ b/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/bank.ts @@ -353,9 +353,9 @@ export const Params = { if (message.sendEnabled) { obj.send_enabled = message.sendEnabled.map(e => e ? SendEnabled.toAmino(e) : undefined); } else { - obj.send_enabled = []; + obj.send_enabled = message.sendEnabled; } - obj.default_send_enabled = message.defaultSendEnabled; + obj.default_send_enabled = message.defaultSendEnabled === false ? undefined : message.defaultSendEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -435,8 +435,8 @@ export const SendEnabled = { }, toAmino(message: SendEnabled): SendEnabledAmino { const obj: any = {}; - obj.denom = message.denom; - obj.enabled = message.enabled; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.enabled = message.enabled === false ? undefined : message.enabled; return obj; }, fromAminoMsg(object: SendEnabledAminoMsg): SendEnabled { @@ -514,11 +514,11 @@ export const Input = { }, toAmino(message: Input): InputAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -597,11 +597,11 @@ export const Output = { }, toAmino(message: Output): OutputAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -672,7 +672,7 @@ export const Supply = { if (message.total) { obj.total = message.total.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total = []; + obj.total = message.total; } return obj; }, @@ -762,12 +762,12 @@ export const DenomUnit = { }, toAmino(message: DenomUnit): DenomUnitAmino { const obj: any = {}; - obj.denom = message.denom; - obj.exponent = message.exponent; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.exponent = message.exponent === 0 ? undefined : message.exponent; if (message.aliases) { obj.aliases = message.aliases.map(e => e); } else { - obj.aliases = []; + obj.aliases = message.aliases; } return obj; }, @@ -912,18 +912,18 @@ export const Metadata = { }, toAmino(message: Metadata): MetadataAmino { const obj: any = {}; - obj.description = message.description; + obj.description = message.description === "" ? undefined : 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; + obj.denom_units = message.denomUnits; + } + obj.base = message.base === "" ? undefined : message.base; + obj.display = message.display === "" ? undefined : message.display; + obj.name = message.name === "" ? undefined : message.name; + obj.symbol = message.symbol === "" ? undefined : message.symbol; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; return obj; }, fromAminoMsg(object: MetadataAminoMsg): Metadata { diff --git a/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/genesis.ts index bf9e9c43e2..7ebd30f797 100644 --- a/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/genesis.ts @@ -159,17 +159,17 @@ export const GenesisState = { if (message.balances) { obj.balances = message.balances.map(e => e ? Balance.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } if (message.supply) { obj.supply = message.supply.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.supply = []; + obj.supply = message.supply; } if (message.denomMetadata) { obj.denom_metadata = message.denomMetadata.map(e => e ? Metadata.toAmino(e) : undefined); } else { - obj.denom_metadata = []; + obj.denom_metadata = message.denomMetadata; } return obj; }, @@ -248,11 +248,11 @@ export const Balance = { }, toAmino(message: Balance): BalanceAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/query.ts index 248f216a3e..dd61975979 100644 --- a/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/query.ts @@ -618,8 +618,8 @@ export const QueryBalanceRequest = { }, toAmino(message: QueryBalanceRequest): QueryBalanceRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.denom = message.denom; + obj.address = message.address === "" ? undefined : message.address; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest { @@ -772,7 +772,7 @@ export const QueryAllBalancesRequest = { }, toAmino(message: QueryAllBalancesRequest): QueryAllBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -856,7 +856,7 @@ export const QueryAllBalancesResponse = { if (message.balances) { obj.balances = message.balances.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -940,7 +940,7 @@ export const QuerySpendableBalancesRequest = { }, toAmino(message: QuerySpendableBalancesRequest): QuerySpendableBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1024,7 +1024,7 @@ export const QuerySpendableBalancesResponse = { if (message.balances) { obj.balances = message.balances.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1180,7 +1180,7 @@ export const QueryTotalSupplyResponse = { if (message.supply) { obj.supply = message.supply.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.supply = []; + obj.supply = message.supply; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1251,7 +1251,7 @@ export const QuerySupplyOfRequest = { }, toAmino(message: QuerySupplyOfRequest): QuerySupplyOfRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QuerySupplyOfRequestAminoMsg): QuerySupplyOfRequest { @@ -1603,7 +1603,7 @@ export const QueryDenomsMetadataResponse = { if (message.metadatas) { obj.metadatas = message.metadatas.map(e => e ? Metadata.toAmino(e) : undefined); } else { - obj.metadatas = []; + obj.metadatas = message.metadatas; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1674,7 +1674,7 @@ export const QueryDenomMetadataRequest = { }, toAmino(message: QueryDenomMetadataRequest): QueryDenomMetadataRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomMetadataRequestAminoMsg): QueryDenomMetadataRequest { @@ -1827,7 +1827,7 @@ export const QueryDenomOwnersRequest = { }, toAmino(message: QueryDenomOwnersRequest): QueryDenomOwnersRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1910,7 +1910,7 @@ export const DenomOwner = { }, toAmino(message: DenomOwner): DenomOwnerAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined; return obj; }, @@ -1994,7 +1994,7 @@ export const QueryDenomOwnersResponse = { if (message.denomOwners) { obj.denom_owners = message.denomOwners.map(e => e ? DenomOwner.toAmino(e) : undefined); } else { - obj.denom_owners = []; + obj.denom_owners = message.denomOwners; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/tx.ts index 3d003a2947..2e0e81bcec 100644 --- a/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/bank/v1beta1/tx.ts @@ -144,12 +144,12 @@ export const MsgSend = { }, toAmino(message: MsgSend): MsgSendAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -285,12 +285,12 @@ export const MsgMultiSend = { if (message.inputs) { obj.inputs = message.inputs.map(e => e ? Input.toAmino(e) : undefined); } else { - obj.inputs = []; + obj.inputs = message.inputs; } if (message.outputs) { obj.outputs = message.outputs.map(e => e ? Output.toAmino(e) : undefined); } else { - obj.outputs = []; + obj.outputs = message.outputs; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/base/abci/v1beta1/abci.ts b/__fixtures__/v-next/outputsign/cosmos/base/abci/v1beta1/abci.ts index 6e7192de5d..9a0aa5cc77 100644 --- a/__fixtures__/v-next/outputsign/cosmos/base/abci/v1beta1/abci.ts +++ b/__fixtures__/v-next/outputsign/cosmos/base/abci/v1beta1/abci.ts @@ -138,7 +138,7 @@ export interface ABCIMessageLogProtoMsg { } /** ABCIMessageLog defines a structure containing an indexed tx ABCI message log. */ export interface ABCIMessageLogAmino { - msg_index?: number; + msg_index: number; log?: string; /** * Events contains a slice of Event objects that were emitted during some @@ -652,26 +652,26 @@ export const TxResponse = { }, 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; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.txhash = message.txhash === "" ? undefined : message.txhash; + obj.codespace = message.codespace === "" ? undefined : message.codespace; + obj.code = message.code === 0 ? undefined : message.code; + obj.data = message.data === "" ? undefined : message.data; + obj.raw_log = message.rawLog === "" ? undefined : message.rawLog; if (message.logs) { obj.logs = message.logs.map(e => e ? ABCIMessageLog.toAmino(e) : undefined); } else { - obj.logs = []; + obj.logs = message.logs; } - obj.info = message.info; - obj.gas_wanted = message.gasWanted ? message.gasWanted.toString() : undefined; - obj.gas_used = message.gasUsed ? message.gasUsed.toString() : undefined; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; obj.tx = message.tx ? Any.toAmino(message.tx) : undefined; - obj.timestamp = message.timestamp; + obj.timestamp = message.timestamp === "" ? undefined : message.timestamp; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -761,12 +761,12 @@ export const ABCIMessageLog = { }, toAmino(message: ABCIMessageLog): ABCIMessageLogAmino { const obj: any = {}; - obj.msg_index = message.msgIndex; - obj.log = message.log; + obj.msg_index = message.msgIndex ?? 0; + obj.log = message.log === "" ? undefined : message.log; if (message.events) { obj.events = message.events.map(e => e ? StringEvent.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -845,11 +845,11 @@ export const StringEvent = { }, toAmino(message: StringEvent): StringEventAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -930,8 +930,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -1015,8 +1015,8 @@ export const GasInfo = { }, 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; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; return obj; }, fromAminoMsg(object: GasInfoAminoMsg): GasInfo { @@ -1115,16 +1115,16 @@ export const Result = { toAmino(message: Result): ResultAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.log = message.log; + obj.log = message.log === "" ? undefined : message.log; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } if (message.msgResponses) { obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msg_responses = []; + obj.msg_responses = message.msgResponses; } return obj; }, @@ -1290,7 +1290,7 @@ export const MsgData = { }, toAmino(message: MsgData): MsgDataAmino { const obj: any = {}; - obj.msg_type = message.msgType; + obj.msg_type = message.msgType === "" ? undefined : message.msgType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1370,12 +1370,12 @@ export const TxMsgData = { if (message.data) { obj.data = message.data.map(e => e ? MsgData.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } if (message.msgResponses) { obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msg_responses = []; + obj.msg_responses = message.msgResponses; } return obj; }, @@ -1508,15 +1508,15 @@ export const SearchTxsResult = { }, 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; + obj.total_count = message.totalCount !== BigInt(0) ? message.totalCount.toString() : undefined; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.page_number = message.pageNumber !== BigInt(0) ? message.pageNumber.toString() : undefined; + obj.page_total = message.pageTotal !== BigInt(0) ? message.pageTotal.toString() : undefined; + obj.limit = message.limit !== BigInt(0) ? message.limit.toString() : undefined; if (message.txs) { obj.txs = message.txs.map(e => e ? TxResponse.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/base/kv/v1beta1/kv.ts b/__fixtures__/v-next/outputsign/cosmos/base/kv/v1beta1/kv.ts index b164a19667..2b657dfce2 100644 --- a/__fixtures__/v-next/outputsign/cosmos/base/kv/v1beta1/kv.ts +++ b/__fixtures__/v-next/outputsign/cosmos/base/kv/v1beta1/kv.ts @@ -89,7 +89,7 @@ export const Pairs = { if (message.pairs) { obj.pairs = message.pairs.map(e => e ? Pair.toAmino(e) : undefined); } else { - obj.pairs = []; + obj.pairs = message.pairs; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/base/query/v1beta1/pagination.ts b/__fixtures__/v-next/outputsign/cosmos/base/query/v1beta1/pagination.ts index 018af8de22..371007ed7f 100644 --- a/__fixtures__/v-next/outputsign/cosmos/base/query/v1beta1/pagination.ts +++ b/__fixtures__/v-next/outputsign/cosmos/base/query/v1beta1/pagination.ts @@ -265,10 +265,10 @@ export const PageRequest = { toAmino(message: PageRequest): PageRequestAmino { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; - 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; + obj.offset = message.offset !== BigInt(0) ? message.offset.toString() : undefined; + obj.limit = message.limit !== BigInt(0) ? message.limit.toString() : undefined; + obj.count_total = message.countTotal === false ? undefined : message.countTotal; + obj.reverse = message.reverse === false ? undefined : message.reverse; return obj; }, fromAminoMsg(object: PageRequestAminoMsg): PageRequest { @@ -351,7 +351,7 @@ export const PageResponse = { toAmino(message: PageResponse): PageResponseAmino { const obj: any = {}; obj.next_key = message.nextKey ? base64FromBytes(message.nextKey) : undefined; - obj.total = message.total ? message.total.toString() : undefined; + obj.total = message.total !== BigInt(0) ? message.total.toString() : undefined; return obj; }, fromAminoMsg(object: PageResponseAminoMsg): PageResponse { diff --git a/__fixtures__/v-next/outputsign/cosmos/base/reflection/v1beta1/reflection.ts b/__fixtures__/v-next/outputsign/cosmos/base/reflection/v1beta1/reflection.ts index 22d1873a3a..9ce58a5ff4 100644 --- a/__fixtures__/v-next/outputsign/cosmos/base/reflection/v1beta1/reflection.ts +++ b/__fixtures__/v-next/outputsign/cosmos/base/reflection/v1beta1/reflection.ts @@ -198,7 +198,7 @@ export const ListAllInterfacesResponse = { if (message.interfaceNames) { obj.interface_names = message.interfaceNames.map(e => e); } else { - obj.interface_names = []; + obj.interface_names = message.interfaceNames; } return obj; }, @@ -268,7 +268,7 @@ export const ListImplementationsRequest = { }, toAmino(message: ListImplementationsRequest): ListImplementationsRequestAmino { const obj: any = {}; - obj.interface_name = message.interfaceName; + obj.interface_name = message.interfaceName === "" ? undefined : message.interfaceName; return obj; }, fromAminoMsg(object: ListImplementationsRequestAminoMsg): ListImplementationsRequest { @@ -338,7 +338,7 @@ export const ListImplementationsResponse = { if (message.implementationMessageNames) { obj.implementation_message_names = message.implementationMessageNames.map(e => e); } else { - obj.implementation_message_names = []; + obj.implementation_message_names = message.implementationMessageNames; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/base/reflection/v2alpha1/reflection.ts b/__fixtures__/v-next/outputsign/cosmos/base/reflection/v2alpha1/reflection.ts index 7da697b545..443d38d415 100644 --- a/__fixtures__/v-next/outputsign/cosmos/base/reflection/v2alpha1/reflection.ts +++ b/__fixtures__/v-next/outputsign/cosmos/base/reflection/v2alpha1/reflection.ts @@ -895,11 +895,11 @@ export const TxDescriptor = { }, toAmino(message: TxDescriptor): TxDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? MsgDescriptor.toAmino(e) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -970,7 +970,7 @@ export const AuthnDescriptor = { if (message.signModes) { obj.sign_modes = message.signModes.map(e => e ? SigningModeDescriptor.toAmino(e) : undefined); } else { - obj.sign_modes = []; + obj.sign_modes = message.signModes; } return obj; }, @@ -1062,9 +1062,9 @@ export const SigningModeDescriptor = { }, toAmino(message: SigningModeDescriptor): SigningModeDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; - obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname === "" ? undefined : message.authnInfoProviderMethodFullname; return obj; }, fromAminoMsg(object: SigningModeDescriptorAminoMsg): SigningModeDescriptor { @@ -1133,7 +1133,7 @@ export const ChainDescriptor = { }, toAmino(message: ChainDescriptor): ChainDescriptorAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: ChainDescriptorAminoMsg): ChainDescriptor { @@ -1203,7 +1203,7 @@ export const CodecDescriptor = { if (message.interfaces) { obj.interfaces = message.interfaces.map(e => e ? InterfaceDescriptor.toAmino(e) : undefined); } else { - obj.interfaces = []; + obj.interfaces = message.interfaces; } return obj; }, @@ -1291,16 +1291,16 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.interfaceAcceptingMessages) { obj.interface_accepting_messages = message.interfaceAcceptingMessages.map(e => e ? InterfaceAcceptingMessageDescriptor.toAmino(e) : undefined); } else { - obj.interface_accepting_messages = []; + obj.interface_accepting_messages = message.interfaceAcceptingMessages; } if (message.interfaceImplementers) { obj.interface_implementers = message.interfaceImplementers.map(e => e ? InterfaceImplementerDescriptor.toAmino(e) : undefined); } else { - obj.interface_implementers = []; + obj.interface_implementers = message.interfaceImplementers; } return obj; }, @@ -1381,8 +1381,8 @@ export const InterfaceImplementerDescriptor = { }, toAmino(message: InterfaceImplementerDescriptor): InterfaceImplementerDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; - obj.type_url = message.typeUrl; + obj.fullname = message.fullname === "" ? undefined : message.fullname; + obj.type_url = message.typeUrl === "" ? undefined : message.typeUrl; return obj; }, fromAminoMsg(object: InterfaceImplementerDescriptorAminoMsg): InterfaceImplementerDescriptor { @@ -1460,11 +1460,11 @@ export const InterfaceAcceptingMessageDescriptor = { }, toAmino(message: InterfaceAcceptingMessageDescriptor): InterfaceAcceptingMessageDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.fieldDescriptorNames) { obj.field_descriptor_names = message.fieldDescriptorNames.map(e => e); } else { - obj.field_descriptor_names = []; + obj.field_descriptor_names = message.fieldDescriptorNames; } return obj; }, @@ -1534,7 +1534,7 @@ export const ConfigurationDescriptor = { }, toAmino(message: ConfigurationDescriptor): ConfigurationDescriptorAmino { const obj: any = {}; - obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix; + obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix === "" ? undefined : message.bech32AccountAddressPrefix; return obj; }, fromAminoMsg(object: ConfigurationDescriptorAminoMsg): ConfigurationDescriptor { @@ -1603,7 +1603,7 @@ export const MsgDescriptor = { }, toAmino(message: MsgDescriptor): MsgDescriptorAmino { const obj: any = {}; - obj.msg_type_url = message.msgTypeUrl; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromAminoMsg(object: MsgDescriptorAminoMsg): MsgDescriptor { @@ -2435,7 +2435,7 @@ export const QueryServicesDescriptor = { if (message.queryServices) { obj.query_services = message.queryServices.map(e => e ? QueryServiceDescriptor.toAmino(e) : undefined); } else { - obj.query_services = []; + obj.query_services = message.queryServices; } return obj; }, @@ -2525,12 +2525,12 @@ export const QueryServiceDescriptor = { }, toAmino(message: QueryServiceDescriptor): QueryServiceDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; - obj.is_module = message.isModule; + obj.fullname = message.fullname === "" ? undefined : message.fullname; + obj.is_module = message.isModule === false ? undefined : message.isModule; if (message.methods) { obj.methods = message.methods.map(e => e ? QueryMethodDescriptor.toAmino(e) : undefined); } else { - obj.methods = []; + obj.methods = message.methods; } return obj; }, @@ -2611,8 +2611,8 @@ export const QueryMethodDescriptor = { }, toAmino(message: QueryMethodDescriptor): QueryMethodDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.full_query_path = message.fullQueryPath; + obj.name = message.name === "" ? undefined : message.name; + obj.full_query_path = message.fullQueryPath === "" ? undefined : message.fullQueryPath; return obj; }, fromAminoMsg(object: QueryMethodDescriptorAminoMsg): QueryMethodDescriptor { diff --git a/__fixtures__/v-next/outputsign/cosmos/base/snapshots/v1beta1/snapshot.ts b/__fixtures__/v-next/outputsign/cosmos/base/snapshots/v1beta1/snapshot.ts index b1200c240d..964df2aa93 100644 --- a/__fixtures__/v-next/outputsign/cosmos/base/snapshots/v1beta1/snapshot.ts +++ b/__fixtures__/v-next/outputsign/cosmos/base/snapshots/v1beta1/snapshot.ts @@ -321,9 +321,9 @@ export const Snapshot = { }, toAmino(message: Snapshot): SnapshotAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunks = message.chunks; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunks = message.chunks === 0 ? undefined : message.chunks; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; @@ -395,7 +395,7 @@ export const Metadata = { if (message.chunkHashes) { obj.chunk_hashes = message.chunkHashes.map(e => base64FromBytes(e)); } else { - obj.chunk_hashes = []; + obj.chunk_hashes = message.chunkHashes; } return obj; }, @@ -606,7 +606,7 @@ export const SnapshotStoreItem = { }, toAmino(message: SnapshotStoreItem): SnapshotStoreItemAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: SnapshotStoreItemAminoMsg): SnapshotStoreItem { @@ -712,8 +712,8 @@ export const SnapshotIAVLItem = { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; - obj.version = message.version ? message.version.toString() : undefined; - obj.height = message.height; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; + obj.height = message.height === 0 ? undefined : message.height; return obj; }, fromAminoMsg(object: SnapshotIAVLItemAminoMsg): SnapshotIAVLItem { @@ -793,8 +793,8 @@ export const SnapshotExtensionMeta = { }, toAmino(message: SnapshotExtensionMeta): SnapshotExtensionMetaAmino { const obj: any = {}; - obj.name = message.name; - obj.format = message.format; + obj.name = message.name === "" ? undefined : message.name; + obj.format = message.format === 0 ? undefined : message.format; return obj; }, fromAminoMsg(object: SnapshotExtensionMetaAminoMsg): SnapshotExtensionMeta { @@ -1014,7 +1014,7 @@ export const SnapshotSchema = { if (message.keys) { obj.keys = message.keys.map(e => base64FromBytes(e)); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/base/store/v1beta1/commit_info.ts b/__fixtures__/v-next/outputsign/cosmos/base/store/v1beta1/commit_info.ts index f6185675bd..9952dde2a4 100644 --- a/__fixtures__/v-next/outputsign/cosmos/base/store/v1beta1/commit_info.ts +++ b/__fixtures__/v-next/outputsign/cosmos/base/store/v1beta1/commit_info.ts @@ -152,11 +152,11 @@ export const CommitInfo = { }, toAmino(message: CommitInfo): CommitInfoAmino { const obj: any = {}; - obj.version = message.version ? message.version.toString() : undefined; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; if (message.storeInfos) { obj.store_infos = message.storeInfos.map(e => e ? StoreInfo.toAmino(e) : undefined); } else { - obj.store_infos = []; + obj.store_infos = message.storeInfos; } return obj; }, @@ -239,7 +239,7 @@ export const StoreInfo = { }, toAmino(message: StoreInfo): StoreInfoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.commit_id = message.commitId ? CommitID.toAmino(message.commitId) : undefined; return obj; }, @@ -322,7 +322,7 @@ export const CommitID = { }, toAmino(message: CommitID): CommitIDAmino { const obj: any = {}; - obj.version = message.version ? message.version.toString() : undefined; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/base/store/v1beta1/listening.ts b/__fixtures__/v-next/outputsign/cosmos/base/store/v1beta1/listening.ts index e32956be99..33f261efc5 100644 --- a/__fixtures__/v-next/outputsign/cosmos/base/store/v1beta1/listening.ts +++ b/__fixtures__/v-next/outputsign/cosmos/base/store/v1beta1/listening.ts @@ -129,8 +129,8 @@ export const StoreKVPair = { }, toAmino(message: StoreKVPair): StoreKVPairAmino { const obj: any = {}; - obj.store_key = message.storeKey; - obj.delete = message.delete; + obj.store_key = message.storeKey === "" ? undefined : message.storeKey; + obj.delete = message.delete === false ? undefined : message.delete; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/cosmos/base/tendermint/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/base/tendermint/v1beta1/query.ts index a50943b75a..0670214496 100644 --- a/__fixtures__/v-next/outputsign/cosmos/base/tendermint/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/base/tendermint/v1beta1/query.ts @@ -423,7 +423,7 @@ export const GetValidatorSetByHeightRequest = { }, toAmino(message: GetValidatorSetByHeightRequest): GetValidatorSetByHeightRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -517,11 +517,11 @@ export const GetValidatorSetByHeightResponse = { }, toAmino(message: GetValidatorSetByHeightResponse): GetValidatorSetByHeightResponseAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -687,11 +687,11 @@ export const GetLatestValidatorSetResponse = { }, toAmino(message: GetLatestValidatorSetResponse): GetLatestValidatorSetResponseAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -801,10 +801,10 @@ export const Validator = { }, toAmino(message: Validator): ValidatorAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority !== BigInt(0) ? message.proposerPriority.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -875,7 +875,7 @@ export const GetBlockByHeightRequest = { }, toAmino(message: GetBlockByHeightRequest): GetBlockByHeightRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: GetBlockByHeightRequestAminoMsg): GetBlockByHeightRequest { @@ -1226,7 +1226,7 @@ export const GetSyncingResponse = { }, toAmino(message: GetSyncingResponse): GetSyncingResponseAmino { const obj: any = {}; - obj.syncing = message.syncing; + obj.syncing = message.syncing === false ? undefined : message.syncing; return obj; }, fromAminoMsg(object: GetSyncingResponseAminoMsg): GetSyncingResponse { @@ -1511,18 +1511,18 @@ export const VersionInfo = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.app_name = message.appName === "" ? undefined : message.appName; + obj.version = message.version === "" ? undefined : message.version; + obj.git_commit = message.gitCommit === "" ? undefined : message.gitCommit; + obj.build_tags = message.buildTags === "" ? undefined : message.buildTags; + obj.go_version = message.goVersion === "" ? undefined : message.goVersion; if (message.buildDeps) { obj.build_deps = message.buildDeps.map(e => e ? Module.toAmino(e) : undefined); } else { - obj.build_deps = []; + obj.build_deps = message.buildDeps; } - obj.cosmos_sdk_version = message.cosmosSdkVersion; + obj.cosmos_sdk_version = message.cosmosSdkVersion === "" ? undefined : message.cosmosSdkVersion; return obj; }, fromAminoMsg(object: VersionInfoAminoMsg): VersionInfo { @@ -1613,9 +1613,9 @@ export const Module = { }, toAmino(message: Module): ModuleAmino { const obj: any = {}; - obj.path = message.path; - obj.version = message.version; - obj.sum = message.sum; + obj.path = message.path === "" ? undefined : message.path; + obj.version = message.version === "" ? undefined : message.version; + obj.sum = message.sum === "" ? undefined : message.sum; return obj; }, fromAminoMsg(object: ModuleAminoMsg): Module { diff --git a/__fixtures__/v-next/outputsign/cosmos/base/v1beta1/coin.ts b/__fixtures__/v-next/outputsign/cosmos/base/v1beta1/coin.ts index d6cbec17e8..fa7fa77bca 100644 --- a/__fixtures__/v-next/outputsign/cosmos/base/v1beta1/coin.ts +++ b/__fixtures__/v-next/outputsign/cosmos/base/v1beta1/coin.ts @@ -172,8 +172,8 @@ export const Coin = { }, toAmino(message: Coin): CoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: CoinAminoMsg): Coin { @@ -253,8 +253,8 @@ export const DecCoin = { }, toAmino(message: DecCoin): DecCoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: DecCoinAminoMsg): DecCoin { @@ -323,7 +323,7 @@ export const IntProto = { }, toAmino(message: IntProto): IntProtoAmino { const obj: any = {}; - obj.int = message.int; + obj.int = message.int === "" ? undefined : message.int; return obj; }, fromAminoMsg(object: IntProtoAminoMsg): IntProto { @@ -392,7 +392,7 @@ export const DecProto = { }, toAmino(message: DecProto): DecProtoAmino { const obj: any = {}; - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; return obj; }, fromAminoMsg(object: DecProtoAminoMsg): DecProto { diff --git a/__fixtures__/v-next/outputsign/cosmos/capability/v1beta1/capability.ts b/__fixtures__/v-next/outputsign/cosmos/capability/v1beta1/capability.ts index aee939e26e..c2b4ec8d77 100644 --- a/__fixtures__/v-next/outputsign/cosmos/capability/v1beta1/capability.ts +++ b/__fixtures__/v-next/outputsign/cosmos/capability/v1beta1/capability.ts @@ -137,7 +137,7 @@ export const Capability = { }, toAmino(message: Capability): CapabilityAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; return obj; }, fromAminoMsg(object: CapabilityAminoMsg): Capability { @@ -217,8 +217,8 @@ export const Owner = { }, toAmino(message: Owner): OwnerAmino { const obj: any = {}; - obj.module = message.module; - obj.name = message.name; + obj.module = message.module === "" ? undefined : message.module; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: OwnerAminoMsg): Owner { @@ -288,7 +288,7 @@ export const CapabilityOwners = { if (message.owners) { obj.owners = message.owners.map(e => e ? Owner.toAmino(e) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/capability/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/capability/v1beta1/genesis.ts index e9014a508b..8aba75de4c 100644 --- a/__fixtures__/v-next/outputsign/cosmos/capability/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/capability/v1beta1/genesis.ts @@ -121,7 +121,7 @@ export const GenesisOwners = { }, toAmino(message: GenesisOwners): GenesisOwnersAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.index_owners = message.indexOwners ? CapabilityOwners.toAmino(message.indexOwners) : undefined; return obj; }, @@ -202,11 +202,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; if (message.owners) { obj.owners = message.owners.map(e => e ? GenesisOwners.toAmino(e) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/crisis/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/crisis/v1beta1/tx.ts index 76c31d6392..95c291ba38 100644 --- a/__fixtures__/v-next/outputsign/cosmos/crisis/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/crisis/v1beta1/tx.ts @@ -107,9 +107,9 @@ export const MsgVerifyInvariant = { }, toAmino(message: MsgVerifyInvariant): MsgVerifyInvariantAmino { const obj: any = {}; - obj.sender = message.sender; - obj.invariant_module_name = message.invariantModuleName; - obj.invariant_route = message.invariantRoute; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.invariant_module_name = message.invariantModuleName === "" ? undefined : message.invariantModuleName; + obj.invariant_route = message.invariantRoute === "" ? undefined : message.invariantRoute; return obj; }, fromAminoMsg(object: MsgVerifyInvariantAminoMsg): MsgVerifyInvariant { diff --git a/__fixtures__/v-next/outputsign/cosmos/crypto/hd/v1/hd.ts b/__fixtures__/v-next/outputsign/cosmos/crypto/hd/v1/hd.ts index eea5209e1d..45468ca166 100644 --- a/__fixtures__/v-next/outputsign/cosmos/crypto/hd/v1/hd.ts +++ b/__fixtures__/v-next/outputsign/cosmos/crypto/hd/v1/hd.ts @@ -137,11 +137,11 @@ export const BIP44Params = { }, 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; + obj.purpose = message.purpose === 0 ? undefined : message.purpose; + obj.coin_type = message.coinType === 0 ? undefined : message.coinType; + obj.account = message.account === 0 ? undefined : message.account; + obj.change = message.change === false ? undefined : message.change; + obj.address_index = message.addressIndex === 0 ? undefined : message.addressIndex; return obj; }, fromAminoMsg(object: BIP44ParamsAminoMsg): BIP44Params { diff --git a/__fixtures__/v-next/outputsign/cosmos/crypto/keyring/v1/record.ts b/__fixtures__/v-next/outputsign/cosmos/crypto/keyring/v1/record.ts index 4b42d6a91a..1deea3f4f0 100644 --- a/__fixtures__/v-next/outputsign/cosmos/crypto/keyring/v1/record.ts +++ b/__fixtures__/v-next/outputsign/cosmos/crypto/keyring/v1/record.ts @@ -239,7 +239,7 @@ export const Record = { }, toAmino(message: Record): RecordAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : 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; @@ -327,7 +327,7 @@ export const Record_Local = { 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; + obj.priv_key_type = message.privKeyType === "" ? undefined : message.privKeyType; return obj; }, fromAminoMsg(object: Record_LocalAminoMsg): Record_Local { diff --git a/__fixtures__/v-next/outputsign/cosmos/crypto/multisig/keys.ts b/__fixtures__/v-next/outputsign/cosmos/crypto/multisig/keys.ts index 29fa1e95f5..c68f7a29cf 100644 --- a/__fixtures__/v-next/outputsign/cosmos/crypto/multisig/keys.ts +++ b/__fixtures__/v-next/outputsign/cosmos/crypto/multisig/keys.ts @@ -90,11 +90,11 @@ export const LegacyAminoPubKey = { }, toAmino(message: LegacyAminoPubKey): LegacyAminoPubKeyAmino { const obj: any = {}; - obj.threshold = message.threshold; + obj.threshold = message.threshold === 0 ? undefined : message.threshold; if (message.publicKeys) { obj.public_keys = message.publicKeys.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.public_keys = []; + obj.public_keys = message.publicKeys; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/crypto/multisig/v1beta1/multisig.ts b/__fixtures__/v-next/outputsign/cosmos/crypto/multisig/v1beta1/multisig.ts index 53363158ff..7b210521b7 100644 --- a/__fixtures__/v-next/outputsign/cosmos/crypto/multisig/v1beta1/multisig.ts +++ b/__fixtures__/v-next/outputsign/cosmos/crypto/multisig/v1beta1/multisig.ts @@ -116,7 +116,7 @@ export const MultiSignature = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -197,7 +197,7 @@ export const CompactBitArray = { }, toAmino(message: CompactBitArray): CompactBitArrayAmino { const obj: any = {}; - obj.extra_bits_stored = message.extraBitsStored; + obj.extra_bits_stored = message.extraBitsStored === 0 ? undefined : message.extraBitsStored; obj.elems = message.elems ? base64FromBytes(message.elems) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/distribution.ts b/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/distribution.ts index 6afe9c7dc4..28b1015173 100644 --- a/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/distribution.ts +++ b/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/distribution.ts @@ -334,7 +334,7 @@ export interface DelegatorStartingInfoProtoMsg { export interface DelegatorStartingInfoAmino { previous_period?: string; stake?: string; - height?: string; + height: string; } export interface DelegatorStartingInfoAminoMsg { type: "cosmos-sdk/DelegatorStartingInfo"; @@ -503,10 +503,10 @@ export const Params = { }, 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; + obj.community_tax = message.communityTax === "" ? undefined : message.communityTax; + obj.base_proposer_reward = message.baseProposerReward === "" ? undefined : message.baseProposerReward; + obj.bonus_proposer_reward = message.bonusProposerReward === "" ? undefined : message.bonusProposerReward; + obj.withdraw_addr_enabled = message.withdrawAddrEnabled === false ? undefined : message.withdrawAddrEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -587,9 +587,9 @@ export const ValidatorHistoricalRewards = { if (message.cumulativeRewardRatio) { obj.cumulative_reward_ratio = message.cumulativeRewardRatio.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.cumulative_reward_ratio = []; + obj.cumulative_reward_ratio = message.cumulativeRewardRatio; } - obj.reference_count = message.referenceCount; + obj.reference_count = message.referenceCount === 0 ? undefined : message.referenceCount; return obj; }, fromAminoMsg(object: ValidatorHistoricalRewardsAminoMsg): ValidatorHistoricalRewards { @@ -672,9 +672,9 @@ export const ValidatorCurrentRewards = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } - obj.period = message.period ? message.period.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorCurrentRewardsAminoMsg): ValidatorCurrentRewards { @@ -744,7 +744,7 @@ export const ValidatorAccumulatedCommission = { if (message.commission) { obj.commission = message.commission.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.commission = []; + obj.commission = message.commission; } return obj; }, @@ -815,7 +815,7 @@ export const ValidatorOutstandingRewards = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, @@ -898,8 +898,8 @@ export const ValidatorSlashEvent = { }, toAmino(message: ValidatorSlashEvent): ValidatorSlashEventAmino { const obj: any = {}; - obj.validator_period = message.validatorPeriod ? message.validatorPeriod.toString() : undefined; - obj.fraction = message.fraction; + obj.validator_period = message.validatorPeriod !== BigInt(0) ? message.validatorPeriod.toString() : undefined; + obj.fraction = message.fraction === "" ? undefined : message.fraction; return obj; }, fromAminoMsg(object: ValidatorSlashEventAminoMsg): ValidatorSlashEvent { @@ -969,7 +969,7 @@ export const ValidatorSlashEvents = { if (message.validatorSlashEvents) { obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEvent.toAmino(e) : undefined); } else { - obj.validator_slash_events = []; + obj.validator_slash_events = message.validatorSlashEvents; } return obj; }, @@ -1040,7 +1040,7 @@ export const FeePool = { if (message.communityPool) { obj.community_pool = message.communityPool.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.community_pool = []; + obj.community_pool = message.communityPool; } return obj; }, @@ -1141,13 +1141,13 @@ export const CommunityPoolSpendProposal = { }, toAmino(message: CommunityPoolSpendProposal): CommunityPoolSpendProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.recipient = message.recipient; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.recipient = message.recipient === "" ? undefined : message.recipient; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -1243,9 +1243,9 @@ export const DelegatorStartingInfo = { }, 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; + obj.previous_period = message.previousPeriod !== BigInt(0) ? message.previousPeriod.toString() : undefined; + obj.stake = message.stake === "" ? undefined : message.stake; + obj.height = message.height ? message.height.toString() : "0"; return obj; }, fromAminoMsg(object: DelegatorStartingInfoAminoMsg): DelegatorStartingInfo { @@ -1323,11 +1323,11 @@ export const DelegationDelegatorReward = { }, toAmino(message: DelegationDelegatorReward): DelegationDelegatorRewardAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.reward) { obj.reward = message.reward.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.reward = []; + obj.reward = message.reward; } return obj; }, @@ -1441,11 +1441,11 @@ export const CommunityPoolSpendProposalWithDeposit = { }, 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; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.recipient = message.recipient === "" ? undefined : message.recipient; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.deposit = message.deposit === "" ? undefined : message.deposit; return obj; }, fromAminoMsg(object: CommunityPoolSpendProposalWithDepositAminoMsg): CommunityPoolSpendProposalWithDeposit { diff --git a/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/genesis.ts index f1414f459f..8e7cb693b3 100644 --- a/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/genesis.ts @@ -364,8 +364,8 @@ export const DelegatorWithdrawInfo = { }, toAmino(message: DelegatorWithdrawInfo): DelegatorWithdrawInfoAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.withdraw_address = message.withdrawAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: DelegatorWithdrawInfoAminoMsg): DelegatorWithdrawInfo { @@ -443,11 +443,11 @@ export const ValidatorOutstandingRewardsRecord = { }, toAmino(message: ValidatorOutstandingRewardsRecord): ValidatorOutstandingRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.outstandingRewards) { obj.outstanding_rewards = message.outstandingRewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.outstanding_rewards = []; + obj.outstanding_rewards = message.outstandingRewards; } return obj; }, @@ -530,7 +530,7 @@ export const ValidatorAccumulatedCommissionRecord = { }, toAmino(message: ValidatorAccumulatedCommissionRecord): ValidatorAccumulatedCommissionRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.accumulated = message.accumulated ? ValidatorAccumulatedCommission.toAmino(message.accumulated) : undefined; return obj; }, @@ -626,8 +626,8 @@ export const ValidatorHistoricalRewardsRecord = { }, toAmino(message: ValidatorHistoricalRewardsRecord): ValidatorHistoricalRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.period = message.period ? message.period.toString() : undefined; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; obj.rewards = message.rewards ? ValidatorHistoricalRewards.toAmino(message.rewards) : undefined; return obj; }, @@ -710,7 +710,7 @@ export const ValidatorCurrentRewardsRecord = { }, toAmino(message: ValidatorCurrentRewardsRecord): ValidatorCurrentRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.rewards = message.rewards ? ValidatorCurrentRewards.toAmino(message.rewards) : undefined; return obj; }, @@ -804,8 +804,8 @@ export const DelegatorStartingInfoRecord = { }, toAmino(message: DelegatorStartingInfoRecord): DelegatorStartingInfoRecordAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.starting_info = message.startingInfo ? DelegatorStartingInfo.toAmino(message.startingInfo) : undefined; return obj; }, @@ -914,9 +914,9 @@ export const ValidatorSlashEventRecord = { }, 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_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; obj.validator_slash_event = message.validatorSlashEvent ? ValidatorSlashEvent.toAmino(message.validatorSlashEvent) : undefined; return obj; }, @@ -1080,38 +1080,38 @@ export const GenesisState = { if (message.delegatorWithdrawInfos) { obj.delegator_withdraw_infos = message.delegatorWithdrawInfos.map(e => e ? DelegatorWithdrawInfo.toAmino(e) : undefined); } else { - obj.delegator_withdraw_infos = []; + obj.delegator_withdraw_infos = message.delegatorWithdrawInfos; } - obj.previous_proposer = message.previousProposer; + obj.previous_proposer = message.previousProposer === "" ? undefined : message.previousProposer; if (message.outstandingRewards) { obj.outstanding_rewards = message.outstandingRewards.map(e => e ? ValidatorOutstandingRewardsRecord.toAmino(e) : undefined); } else { - obj.outstanding_rewards = []; + obj.outstanding_rewards = message.outstandingRewards; } if (message.validatorAccumulatedCommissions) { obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions.map(e => e ? ValidatorAccumulatedCommissionRecord.toAmino(e) : undefined); } else { - obj.validator_accumulated_commissions = []; + obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions; } if (message.validatorHistoricalRewards) { obj.validator_historical_rewards = message.validatorHistoricalRewards.map(e => e ? ValidatorHistoricalRewardsRecord.toAmino(e) : undefined); } else { - obj.validator_historical_rewards = []; + obj.validator_historical_rewards = message.validatorHistoricalRewards; } if (message.validatorCurrentRewards) { obj.validator_current_rewards = message.validatorCurrentRewards.map(e => e ? ValidatorCurrentRewardsRecord.toAmino(e) : undefined); } else { - obj.validator_current_rewards = []; + obj.validator_current_rewards = message.validatorCurrentRewards; } if (message.delegatorStartingInfos) { obj.delegator_starting_infos = message.delegatorStartingInfos.map(e => e ? DelegatorStartingInfoRecord.toAmino(e) : undefined); } else { - obj.delegator_starting_infos = []; + obj.delegator_starting_infos = message.delegatorStartingInfos; } if (message.validatorSlashEvents) { obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEventRecord.toAmino(e) : undefined); } else { - obj.validator_slash_events = []; + obj.validator_slash_events = message.validatorSlashEvents; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/query.ts index 0f54a2f281..e3c08a9613 100644 --- a/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/query.ts @@ -727,7 +727,7 @@ export const QueryValidatorOutstandingRewardsRequest = { }, toAmino(message: QueryValidatorOutstandingRewardsRequest): QueryValidatorOutstandingRewardsRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryValidatorOutstandingRewardsRequestAminoMsg): QueryValidatorOutstandingRewardsRequest { @@ -867,7 +867,7 @@ export const QueryValidatorCommissionRequest = { }, toAmino(message: QueryValidatorCommissionRequest): QueryValidatorCommissionRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryValidatorCommissionRequestAminoMsg): QueryValidatorCommissionRequest { @@ -1046,9 +1046,9 @@ export const QueryValidatorSlashesRequest = { }, 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.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.starting_height = message.startingHeight !== BigInt(0) ? message.startingHeight.toString() : undefined; + obj.ending_height = message.endingHeight !== BigInt(0) ? message.endingHeight.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1132,7 +1132,7 @@ export const QueryValidatorSlashesResponse = { if (message.slashes) { obj.slashes = message.slashes.map(e => e ? ValidatorSlashEvent.toAmino(e) : undefined); } else { - obj.slashes = []; + obj.slashes = message.slashes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1214,8 +1214,8 @@ export const QueryDelegationRewardsRequest = { }, toAmino(message: QueryDelegationRewardsRequest): QueryDelegationRewardsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryDelegationRewardsRequestAminoMsg): QueryDelegationRewardsRequest { @@ -1285,7 +1285,7 @@ export const QueryDelegationRewardsResponse = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, @@ -1355,7 +1355,7 @@ export const QueryDelegationTotalRewardsRequest = { }, toAmino(message: QueryDelegationTotalRewardsRequest): QueryDelegationTotalRewardsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegationTotalRewardsRequestAminoMsg): QueryDelegationTotalRewardsRequest { @@ -1434,12 +1434,12 @@ export const QueryDelegationTotalRewardsResponse = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DelegationDelegatorReward.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } if (message.total) { obj.total = message.total.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.total = []; + obj.total = message.total; } return obj; }, @@ -1509,7 +1509,7 @@ export const QueryDelegatorValidatorsRequest = { }, toAmino(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegatorValidatorsRequestAminoMsg): QueryDelegatorValidatorsRequest { @@ -1579,7 +1579,7 @@ export const QueryDelegatorValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e); } else { - obj.validators = []; + obj.validators = message.validators; } return obj; }, @@ -1649,7 +1649,7 @@ export const QueryDelegatorWithdrawAddressRequest = { }, toAmino(message: QueryDelegatorWithdrawAddressRequest): QueryDelegatorWithdrawAddressRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegatorWithdrawAddressRequestAminoMsg): QueryDelegatorWithdrawAddressRequest { @@ -1718,7 +1718,7 @@ export const QueryDelegatorWithdrawAddressResponse = { }, toAmino(message: QueryDelegatorWithdrawAddressResponse): QueryDelegatorWithdrawAddressResponseAmino { const obj: any = {}; - obj.withdraw_address = message.withdrawAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: QueryDelegatorWithdrawAddressResponseAminoMsg): QueryDelegatorWithdrawAddressResponse { @@ -1844,7 +1844,7 @@ export const QueryCommunityPoolResponse = { if (message.pool) { obj.pool = message.pool.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.pool = []; + obj.pool = message.pool; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/tx.ts index 1c56606356..46efb37705 100644 --- a/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/distribution/v1beta1/tx.ts @@ -250,8 +250,8 @@ export const MsgSetWithdrawAddress = { }, toAmino(message: MsgSetWithdrawAddress): MsgSetWithdrawAddressAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.withdraw_address = message.withdrawAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: MsgSetWithdrawAddressAminoMsg): MsgSetWithdrawAddress { @@ -387,8 +387,8 @@ export const MsgWithdrawDelegatorReward = { }, toAmino(message: MsgWithdrawDelegatorReward): MsgWithdrawDelegatorRewardAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: MsgWithdrawDelegatorRewardAminoMsg): MsgWithdrawDelegatorReward { @@ -458,7 +458,7 @@ export const MsgWithdrawDelegatorRewardResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -528,7 +528,7 @@ export const MsgWithdrawValidatorCommission = { }, toAmino(message: MsgWithdrawValidatorCommission): MsgWithdrawValidatorCommissionAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: MsgWithdrawValidatorCommissionAminoMsg): MsgWithdrawValidatorCommission { @@ -598,7 +598,7 @@ export const MsgWithdrawValidatorCommissionResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -680,9 +680,9 @@ export const MsgFundCommunityPool = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.depositor = message.depositor; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: MsgFundCommunityPoolAminoMsg): MsgFundCommunityPool { diff --git a/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/evidence.ts b/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/evidence.ts index 6796c13d31..8629d48486 100644 --- a/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/evidence.ts +++ b/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/evidence.ts @@ -121,10 +121,10 @@ export const Equivocation = { }, toAmino(message: Equivocation): EquivocationAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.power = message.power ? message.power.toString() : undefined; - obj.consensus_address = message.consensusAddress; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; + obj.consensus_address = message.consensusAddress === "" ? undefined : message.consensusAddress; return obj; }, fromAminoMsg(object: EquivocationAminoMsg): Equivocation { diff --git a/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/genesis.ts index f5d4faca5a..638fb9e03d 100644 --- a/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/genesis.ts @@ -69,7 +69,7 @@ export const GenesisState = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/query.ts index 8903dd17b6..f06c2f1ee8 100644 --- a/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/query.ts @@ -383,7 +383,7 @@ export const QueryAllEvidenceResponse = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/tx.ts index 668a9e8434..1991e1a58a 100644 --- a/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/evidence/v1beta1/tx.ts @@ -113,7 +113,7 @@ export const MsgSubmitEvidence = { }, toAmino(message: MsgSubmitEvidence): MsgSubmitEvidenceAmino { const obj: any = {}; - obj.submitter = message.submitter; + obj.submitter = message.submitter === "" ? undefined : message.submitter; obj.evidence = message.evidence ? Any.toAmino(message.evidence) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/feegrant.ts index 41bd9b92ff..ea80e8f326 100644 --- a/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/feegrant.ts +++ b/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/feegrant.ts @@ -235,7 +235,7 @@ export const BasicAllowance = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -355,12 +355,12 @@ export const PeriodicAllowance = { if (message.periodSpendLimit) { obj.period_spend_limit = message.periodSpendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.period_spend_limit = []; + obj.period_spend_limit = message.periodSpendLimit; } if (message.periodCanSpend) { obj.period_can_spend = message.periodCanSpend.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.period_can_spend = []; + obj.period_can_spend = message.periodCanSpend; } obj.period_reset = message.periodReset ? Timestamp.toAmino(toTimestamp(message.periodReset)) : undefined; return obj; @@ -446,7 +446,7 @@ export const AllowedMsgAllowance = { if (message.allowedMessages) { obj.allowed_messages = message.allowedMessages.map(e => e); } else { - obj.allowed_messages = []; + obj.allowed_messages = message.allowedMessages; } return obj; }, @@ -540,8 +540,8 @@ export const Grant = { }, toAmino(message: Grant): GrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.allowance = message.allowance ? Any.toAmino(message.allowance) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/genesis.ts index b5a05cdc52..67012d8865 100644 --- a/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/genesis.ts @@ -67,7 +67,7 @@ export const GenesisState = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/query.ts index b37d5efdf2..98f1c1de0b 100644 --- a/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/query.ts @@ -211,8 +211,8 @@ export const QueryAllowanceRequest = { }, toAmino(message: QueryAllowanceRequest): QueryAllowanceRequestAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; return obj; }, fromAminoMsg(object: QueryAllowanceRequestAminoMsg): QueryAllowanceRequest { @@ -365,7 +365,7 @@ export const QueryAllowancesRequest = { }, toAmino(message: QueryAllowancesRequest): QueryAllowancesRequestAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -449,7 +449,7 @@ export const QueryAllowancesResponse = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -533,7 +533,7 @@ export const QueryAllowancesByGranterRequest = { }, toAmino(message: QueryAllowancesByGranterRequest): QueryAllowancesByGranterRequestAmino { const obj: any = {}; - obj.granter = message.granter; + obj.granter = message.granter === "" ? undefined : message.granter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -617,7 +617,7 @@ export const QueryAllowancesByGranterResponse = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/tx.ts index 70f182a7d8..f4f793b9ef 100644 --- a/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/feegrant/v1beta1/tx.ts @@ -166,8 +166,8 @@ export const MsgGrantAllowance = { }, toAmino(message: MsgGrantAllowance): MsgGrantAllowanceAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.allowance = message.allowance ? Any.toAmino(message.allowance) : undefined; return obj; }, @@ -304,8 +304,8 @@ export const MsgRevokeAllowance = { }, toAmino(message: MsgRevokeAllowance): MsgRevokeAllowanceAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; return obj; }, fromAminoMsg(object: MsgRevokeAllowanceAminoMsg): MsgRevokeAllowance { diff --git a/__fixtures__/v-next/outputsign/cosmos/genutil/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/genutil/v1beta1/genesis.ts index 0144f038c0..878b839c5d 100644 --- a/__fixtures__/v-next/outputsign/cosmos/genutil/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/genutil/v1beta1/genesis.ts @@ -13,7 +13,7 @@ export interface GenesisStateProtoMsg { /** GenesisState defines the raw genesis transaction in JSON. */ export interface GenesisStateAmino { /** gen_txs defines the genesis transactions. */ - gen_txs?: string[]; + gen_txs: string[]; } export interface GenesisStateAminoMsg { type: "cosmos-sdk/GenesisState"; @@ -68,7 +68,7 @@ export const GenesisState = { if (message.genTxs) { obj.gen_txs = message.genTxs.map(e => base64FromBytes(e)); } else { - obj.gen_txs = []; + obj.gen_txs = message.genTxs; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/gov/v1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/gov/v1/genesis.ts index 077400e0f3..aceda8643c 100644 --- a/__fixtures__/v-next/outputsign/cosmos/gov/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/gov/v1/genesis.ts @@ -166,21 +166,21 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + obj.starting_proposal_id = message.startingProposalId !== BigInt(0) ? message.startingProposalId.toString() : undefined; if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; diff --git a/__fixtures__/v-next/outputsign/cosmos/gov/v1/gov.ts b/__fixtures__/v-next/outputsign/cosmos/gov/v1/gov.ts index 975e735303..bf0530ac91 100644 --- a/__fixtures__/v-next/outputsign/cosmos/gov/v1/gov.ts +++ b/__fixtures__/v-next/outputsign/cosmos/gov/v1/gov.ts @@ -470,7 +470,7 @@ export const WeightedVoteOption = { fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { const message = createBaseWeightedVoteOption(); if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.weight !== undefined && object.weight !== null) { message.weight = object.weight; @@ -479,8 +479,8 @@ export const WeightedVoteOption = { }, toAmino(message: WeightedVoteOption): WeightedVoteOptionAmino { const obj: any = {}; - obj.option = message.option; - obj.weight = message.weight; + obj.option = message.option === 0 ? undefined : message.option; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption { @@ -571,12 +571,12 @@ export const Deposit = { }, toAmino(message: Deposit): DepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -720,7 +720,7 @@ export const Proposal = { } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -745,24 +745,24 @@ export const Proposal = { }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.status = message.status; + obj.status = message.status === 0 ? undefined : message.status; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined; if (message.totalDeposit) { obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_deposit = []; + obj.total_deposit = message.totalDeposit; } obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined; obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined; - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: ProposalAminoMsg): Proposal { @@ -864,10 +864,10 @@ export const TallyResult = { }, 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; + obj.yes_count = message.yesCount === "" ? undefined : message.yesCount; + obj.abstain_count = message.abstainCount === "" ? undefined : message.abstainCount; + obj.no_count = message.noCount === "" ? undefined : message.noCount; + obj.no_with_veto_count = message.noWithVetoCount === "" ? undefined : message.noWithVetoCount; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -969,14 +969,14 @@ export const Vote = { }, toAmino(message: Vote): VoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: VoteAminoMsg): Vote { @@ -1059,7 +1059,7 @@ export const DepositParams = { if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; return obj; @@ -1223,9 +1223,9 @@ export const TallyParams = { }, toAmino(message: TallyParams): TallyParamsAmino { const obj: any = {}; - obj.quorum = message.quorum; - obj.threshold = message.threshold; - obj.veto_threshold = message.vetoThreshold; + obj.quorum = message.quorum === "" ? undefined : message.quorum; + obj.threshold = message.threshold === "" ? undefined : message.threshold; + obj.veto_threshold = message.vetoThreshold === "" ? undefined : message.vetoThreshold; return obj; }, fromAminoMsg(object: TallyParamsAminoMsg): TallyParams { diff --git a/__fixtures__/v-next/outputsign/cosmos/gov/v1/query.ts b/__fixtures__/v-next/outputsign/cosmos/gov/v1/query.ts index 1db555f811..d2d8f6bf5b 100644 --- a/__fixtures__/v-next/outputsign/cosmos/gov/v1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/gov/v1/query.ts @@ -1,4 +1,4 @@ -import { ProposalStatus, ProposalStatusSDKType, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, VotingParams, VotingParamsAmino, VotingParamsSDKType, DepositParams, DepositParamsAmino, DepositParamsSDKType, TallyParams, TallyParamsAmino, TallyParamsSDKType, Deposit, DepositAmino, DepositSDKType, TallyResult, TallyResultAmino, TallyResultSDKType, proposalStatusFromJSON } from "./gov"; +import { ProposalStatus, ProposalStatusSDKType, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, VotingParams, VotingParamsAmino, VotingParamsSDKType, DepositParams, DepositParamsAmino, DepositParamsSDKType, TallyParams, TallyParamsAmino, TallyParamsSDKType, Deposit, DepositAmino, DepositSDKType, TallyResult, TallyResultAmino, TallyResultSDKType } from "./gov"; import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; @@ -470,7 +470,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -630,7 +630,7 @@ export const QueryProposalsRequest = { fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { const message = createBaseQueryProposalsRequest(); if (object.proposal_status !== undefined && object.proposal_status !== null) { - message.proposalStatus = proposalStatusFromJSON(object.proposal_status); + message.proposalStatus = object.proposal_status; } if (object.voter !== undefined && object.voter !== null) { message.voter = object.voter; @@ -645,9 +645,9 @@ export const QueryProposalsRequest = { }, toAmino(message: QueryProposalsRequest): QueryProposalsRequestAmino { const obj: any = {}; - obj.proposal_status = message.proposalStatus; - obj.voter = message.voter; - obj.depositor = message.depositor; + obj.proposal_status = message.proposalStatus === 0 ? undefined : message.proposalStatus; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.depositor = message.depositor === "" ? undefined : message.depositor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -731,7 +731,7 @@ export const QueryProposalsResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -815,8 +815,8 @@ export const QueryVoteRequest = { }, toAmino(message: QueryVoteRequest): QueryVoteRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest { @@ -971,7 +971,7 @@ export const QueryVotesRequest = { }, toAmino(message: QueryVotesRequest): QueryVotesRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1055,7 +1055,7 @@ export const QueryVotesResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1126,7 +1126,7 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.params_type = message.paramsType; + obj.params_type = message.paramsType === "" ? undefined : message.paramsType; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -1307,8 +1307,8 @@ export const QueryDepositRequest = { }, toAmino(message: QueryDepositRequest): QueryDepositRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest { @@ -1463,7 +1463,7 @@ export const QueryDepositsRequest = { }, toAmino(message: QueryDepositsRequest): QueryDepositsRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1547,7 +1547,7 @@ export const QueryDepositsResponse = { if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1620,7 +1620,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputsign/cosmos/gov/v1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/gov/v1/tx.ts index bedbe36ea5..0655fa50dc 100644 --- a/__fixtures__/v-next/outputsign/cosmos/gov/v1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/gov/v1/tx.ts @@ -1,6 +1,6 @@ import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType, voteOptionFromJSON } from "./gov"; +import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType } from "./gov"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1"; @@ -127,7 +127,7 @@ export interface MsgVoteProtoMsg { } /** MsgVote defines a message to cast a vote. */ export interface MsgVoteAmino { - proposal_id?: string; + proposal_id: string; voter?: string; option?: VoteOption; metadata?: string; @@ -170,7 +170,7 @@ export interface MsgVoteWeightedProtoMsg { } /** MsgVoteWeighted defines a message to cast a vote. */ export interface MsgVoteWeightedAmino { - proposal_id?: string; + proposal_id: string; voter?: string; options?: WeightedVoteOptionAmino[]; metadata?: string; @@ -212,7 +212,7 @@ export interface MsgDepositProtoMsg { } /** MsgDeposit defines a message to submit a deposit to an existing proposal. */ export interface MsgDepositAmino { - proposal_id?: string; + proposal_id: string; depositor?: string; amount?: CoinAmino[]; } @@ -316,15 +316,15 @@ export const MsgSubmitProposal = { if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; - obj.metadata = message.metadata; + obj.proposer = message.proposer === "" ? undefined : message.proposer; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -395,7 +395,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -478,7 +478,7 @@ export const MsgExecLegacyContent = { toAmino(message: MsgExecLegacyContent): MsgExecLegacyContentAmino { const obj: any = {}; obj.content = message.content ? Any.toAmino(message.content) : undefined; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; return obj; }, fromAminoMsg(object: MsgExecLegacyContentAminoMsg): MsgExecLegacyContent { @@ -629,7 +629,7 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; @@ -638,10 +638,10 @@ export const MsgVote = { }, 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.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -799,14 +799,14 @@ export const MsgVoteWeighted = { }, toAmino(message: MsgVoteWeighted): MsgVoteWeightedAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgVoteWeightedAminoMsg): MsgVoteWeighted { @@ -953,12 +953,12 @@ export const MsgDeposit = { }, toAmino(message: MsgDeposit): MsgDepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/genesis.ts index 7be9632721..1fbb949655 100644 --- a/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/genesis.ts @@ -166,21 +166,21 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + obj.starting_proposal_id = message.startingProposalId !== BigInt(0) ? message.startingProposalId.toString() : undefined; if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; diff --git a/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/gov.ts b/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/gov.ts index 3e57882eef..96b581df2c 100644 --- a/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/gov.ts @@ -351,7 +351,7 @@ export interface VoteProtoMsg { * A Vote consists of a proposal ID, the voter, and the vote option. */ export interface VoteAmino { - proposal_id?: string; + proposal_id: string; voter?: string; /** * Deprecated: Prefer to use `options` instead. This field is set in queries @@ -523,7 +523,7 @@ export const WeightedVoteOption = { fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { const message = createBaseWeightedVoteOption(); if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.weight !== undefined && object.weight !== null) { message.weight = object.weight; @@ -532,8 +532,8 @@ export const WeightedVoteOption = { }, toAmino(message: WeightedVoteOption): WeightedVoteOptionAmino { const obj: any = {}; - obj.option = message.option; - obj.weight = message.weight; + obj.option = message.option === 0 ? undefined : message.option; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption { @@ -613,8 +613,8 @@ export const TextProposal = { }, toAmino(message: TextProposal): TextProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: TextProposalAminoMsg): TextProposal { @@ -705,12 +705,12 @@ export const Deposit = { }, toAmino(message: Deposit): DepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -850,7 +850,7 @@ export const Proposal = { message.content = Any.fromAmino(object.content); } if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -872,16 +872,16 @@ export const Proposal = { }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.content = message.content ? Any.toAmino(message.content) : undefined; - obj.status = message.status; + obj.status = message.status === 0 ? undefined : message.status; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined; if (message.totalDeposit) { obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_deposit = []; + obj.total_deposit = message.totalDeposit; } obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined; obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined; @@ -986,10 +986,10 @@ export const TallyResult = { }, 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; + obj.yes = message.yes === "" ? undefined : message.yes; + obj.abstain = message.abstain === "" ? undefined : message.abstain; + obj.no = message.no === "" ? undefined : message.no; + obj.no_with_veto = message.noWithVeto === "" ? undefined : message.noWithVeto; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -1084,20 +1084,20 @@ export const Vote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } message.options = object.options?.map(e => WeightedVoteOption.fromAmino(e)) || []; return message; }, 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.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -1181,7 +1181,7 @@ export const DepositParams = { if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/query.ts index f42b2d7123..476b84ce30 100644 --- a/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/query.ts @@ -1,4 +1,4 @@ -import { ProposalStatus, ProposalStatusSDKType, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, VotingParams, VotingParamsAmino, VotingParamsSDKType, DepositParams, DepositParamsAmino, DepositParamsSDKType, TallyParams, TallyParamsAmino, TallyParamsSDKType, Deposit, DepositAmino, DepositSDKType, TallyResult, TallyResultAmino, TallyResultSDKType, proposalStatusFromJSON } from "./gov"; +import { ProposalStatus, ProposalStatusSDKType, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, VotingParams, VotingParamsAmino, VotingParamsSDKType, DepositParams, DepositParamsAmino, DepositParamsSDKType, TallyParams, TallyParamsAmino, TallyParamsSDKType, Deposit, DepositAmino, DepositSDKType, TallyResult, TallyResultAmino, TallyResultSDKType } from "./gov"; import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; @@ -470,7 +470,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -630,7 +630,7 @@ export const QueryProposalsRequest = { fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { const message = createBaseQueryProposalsRequest(); if (object.proposal_status !== undefined && object.proposal_status !== null) { - message.proposalStatus = proposalStatusFromJSON(object.proposal_status); + message.proposalStatus = object.proposal_status; } if (object.voter !== undefined && object.voter !== null) { message.voter = object.voter; @@ -645,9 +645,9 @@ export const QueryProposalsRequest = { }, toAmino(message: QueryProposalsRequest): QueryProposalsRequestAmino { const obj: any = {}; - obj.proposal_status = message.proposalStatus; - obj.voter = message.voter; - obj.depositor = message.depositor; + obj.proposal_status = message.proposalStatus === 0 ? undefined : message.proposalStatus; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.depositor = message.depositor === "" ? undefined : message.depositor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -731,7 +731,7 @@ export const QueryProposalsResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -815,8 +815,8 @@ export const QueryVoteRequest = { }, toAmino(message: QueryVoteRequest): QueryVoteRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest { @@ -971,7 +971,7 @@ export const QueryVotesRequest = { }, toAmino(message: QueryVotesRequest): QueryVotesRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1055,7 +1055,7 @@ export const QueryVotesResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1126,7 +1126,7 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.params_type = message.paramsType; + obj.params_type = message.paramsType === "" ? undefined : message.paramsType; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -1307,8 +1307,8 @@ export const QueryDepositRequest = { }, toAmino(message: QueryDepositRequest): QueryDepositRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest { @@ -1463,7 +1463,7 @@ export const QueryDepositsRequest = { }, toAmino(message: QueryDepositsRequest): QueryDepositsRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1547,7 +1547,7 @@ export const QueryDepositsResponse = { if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1620,7 +1620,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/tx.ts index 0e7f474fbb..fbe80718a2 100644 --- a/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/gov/v1beta1/tx.ts @@ -1,6 +1,6 @@ import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType, voteOptionFromJSON } from "./gov"; +import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType } from "./gov"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1beta1"; @@ -49,7 +49,7 @@ export interface MsgSubmitProposalResponseProtoMsg { } /** MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. */ export interface MsgSubmitProposalResponseAmino { - proposal_id?: string; + proposal_id: string; } export interface MsgSubmitProposalResponseAminoMsg { type: "cosmos-sdk/MsgSubmitProposalResponse"; @@ -119,7 +119,7 @@ export interface MsgVoteWeightedProtoMsg { * Since: cosmos-sdk 0.43 */ export interface MsgVoteWeightedAmino { - proposal_id?: string; + proposal_id: string; voter?: string; options?: WeightedVoteOptionAmino[]; } @@ -175,7 +175,7 @@ export interface MsgDepositProtoMsg { } /** MsgDeposit defines a message to submit a deposit to an existing proposal. */ export interface MsgDepositAmino { - proposal_id?: string; + proposal_id: string; depositor?: string; amount?: CoinAmino[]; } @@ -273,9 +273,9 @@ export const MsgSubmitProposal = { if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; + obj.proposer = message.proposer === "" ? undefined : message.proposer; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -346,7 +346,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -433,15 +433,15 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } return message; }, 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.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -588,12 +588,12 @@ export const MsgVoteWeighted = { }, toAmino(message: MsgVoteWeighted): MsgVoteWeightedAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -741,12 +741,12 @@ export const MsgDeposit = { }, toAmino(message: MsgDeposit): MsgDepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/group/v1/events.ts b/__fixtures__/v-next/outputsign/cosmos/group/v1/events.ts index 1605565aaa..7084fd4206 100644 --- a/__fixtures__/v-next/outputsign/cosmos/group/v1/events.ts +++ b/__fixtures__/v-next/outputsign/cosmos/group/v1/events.ts @@ -1,4 +1,4 @@ -import { ProposalExecutorResult, ProposalExecutorResultSDKType, proposalExecutorResultFromJSON } from "./types"; +import { ProposalExecutorResult, ProposalExecutorResultSDKType } from "./types"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.group.v1"; @@ -256,7 +256,7 @@ export const EventCreateGroup = { }, toAmino(message: EventCreateGroup): EventCreateGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: EventCreateGroupAminoMsg): EventCreateGroup { @@ -327,7 +327,7 @@ export const EventUpdateGroup = { }, toAmino(message: EventUpdateGroup): EventUpdateGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: EventUpdateGroupAminoMsg): EventUpdateGroup { @@ -396,7 +396,7 @@ export const EventCreateGroupPolicy = { }, toAmino(message: EventCreateGroupPolicy): EventCreateGroupPolicyAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventCreateGroupPolicyAminoMsg): EventCreateGroupPolicy { @@ -465,7 +465,7 @@ export const EventUpdateGroupPolicy = { }, toAmino(message: EventUpdateGroupPolicy): EventUpdateGroupPolicyAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventUpdateGroupPolicyAminoMsg): EventUpdateGroupPolicy { @@ -536,7 +536,7 @@ export const EventSubmitProposal = { }, toAmino(message: EventSubmitProposal): EventSubmitProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventSubmitProposalAminoMsg): EventSubmitProposal { @@ -607,7 +607,7 @@ export const EventWithdrawProposal = { }, toAmino(message: EventWithdrawProposal): EventWithdrawProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventWithdrawProposalAminoMsg): EventWithdrawProposal { @@ -678,7 +678,7 @@ export const EventVote = { }, toAmino(message: EventVote): EventVoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventVoteAminoMsg): EventVote { @@ -754,14 +754,14 @@ export const EventExec = { message.proposalId = BigInt(object.proposal_id); } if (object.result !== undefined && object.result !== null) { - message.result = proposalExecutorResultFromJSON(object.result); + message.result = object.result; } return message; }, toAmino(message: EventExec): EventExecAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.result = message.result; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.result = message.result === 0 ? undefined : message.result; return obj; }, fromAminoMsg(object: EventExecAminoMsg): EventExec { @@ -843,8 +843,8 @@ export const EventLeaveGroup = { }, toAmino(message: EventLeaveGroup): EventLeaveGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.address = message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventLeaveGroupAminoMsg): EventLeaveGroup { diff --git a/__fixtures__/v-next/outputsign/cosmos/group/v1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/group/v1/genesis.ts index 1eeb6ef0b0..eb0992a890 100644 --- a/__fixtures__/v-next/outputsign/cosmos/group/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/group/v1/genesis.ts @@ -194,33 +194,33 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.group_seq = message.groupSeq ? message.groupSeq.toString() : undefined; + obj.group_seq = message.groupSeq !== BigInt(0) ? message.groupSeq.toString() : undefined; if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } if (message.groupMembers) { obj.group_members = message.groupMembers.map(e => e ? GroupMember.toAmino(e) : undefined); } else { - obj.group_members = []; + obj.group_members = message.groupMembers; } - obj.group_policy_seq = message.groupPolicySeq ? message.groupPolicySeq.toString() : undefined; + obj.group_policy_seq = message.groupPolicySeq !== BigInt(0) ? message.groupPolicySeq.toString() : undefined; if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } - obj.proposal_seq = message.proposalSeq ? message.proposalSeq.toString() : undefined; + obj.proposal_seq = message.proposalSeq !== BigInt(0) ? message.proposalSeq.toString() : undefined; if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/group/v1/query.ts b/__fixtures__/v-next/outputsign/cosmos/group/v1/query.ts index fd906b3a9c..21bb6f00ab 100644 --- a/__fixtures__/v-next/outputsign/cosmos/group/v1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/group/v1/query.ts @@ -706,7 +706,7 @@ export const QueryGroupInfoRequest = { }, toAmino(message: QueryGroupInfoRequest): QueryGroupInfoRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGroupInfoRequestAminoMsg): QueryGroupInfoRequest { @@ -846,7 +846,7 @@ export const QueryGroupPolicyInfoRequest = { }, toAmino(message: QueryGroupPolicyInfoRequest): QueryGroupPolicyInfoRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryGroupPolicyInfoRequestAminoMsg): QueryGroupPolicyInfoRequest { @@ -1001,7 +1001,7 @@ export const QueryGroupMembersRequest = { }, toAmino(message: QueryGroupMembersRequest): QueryGroupMembersRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1085,7 +1085,7 @@ export const QueryGroupMembersResponse = { if (message.members) { obj.members = message.members.map(e => e ? GroupMember.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1169,7 +1169,7 @@ export const QueryGroupsByAdminRequest = { }, toAmino(message: QueryGroupsByAdminRequest): QueryGroupsByAdminRequestAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1253,7 +1253,7 @@ export const QueryGroupsByAdminResponse = { if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1339,7 +1339,7 @@ export const QueryGroupPoliciesByGroupRequest = { }, toAmino(message: QueryGroupPoliciesByGroupRequest): QueryGroupPoliciesByGroupRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1423,7 +1423,7 @@ export const QueryGroupPoliciesByGroupResponse = { if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1507,7 +1507,7 @@ export const QueryGroupPoliciesByAdminRequest = { }, toAmino(message: QueryGroupPoliciesByAdminRequest): QueryGroupPoliciesByAdminRequestAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1591,7 +1591,7 @@ export const QueryGroupPoliciesByAdminResponse = { if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1664,7 +1664,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -1817,7 +1817,7 @@ export const QueryProposalsByGroupPolicyRequest = { }, toAmino(message: QueryProposalsByGroupPolicyRequest): QueryProposalsByGroupPolicyRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1901,7 +1901,7 @@ export const QueryProposalsByGroupPolicyResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1985,8 +1985,8 @@ export const QueryVoteByProposalVoterRequest = { }, toAmino(message: QueryVoteByProposalVoterRequest): QueryVoteByProposalVoterRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteByProposalVoterRequestAminoMsg): QueryVoteByProposalVoterRequest { @@ -2141,7 +2141,7 @@ export const QueryVotesByProposalRequest = { }, toAmino(message: QueryVotesByProposalRequest): QueryVotesByProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2225,7 +2225,7 @@ export const QueryVotesByProposalResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2309,7 +2309,7 @@ export const QueryVotesByVoterRequest = { }, toAmino(message: QueryVotesByVoterRequest): QueryVotesByVoterRequestAmino { const obj: any = {}; - obj.voter = message.voter; + obj.voter = message.voter === "" ? undefined : message.voter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2393,7 +2393,7 @@ export const QueryVotesByVoterResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2477,7 +2477,7 @@ export const QueryGroupsByMemberRequest = { }, toAmino(message: QueryGroupsByMemberRequest): QueryGroupsByMemberRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2561,7 +2561,7 @@ export const QueryGroupsByMemberResponse = { if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2634,7 +2634,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputsign/cosmos/group/v1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/group/v1/tx.ts index d9d6b2891e..5e626bf23c 100644 --- a/__fixtures__/v-next/outputsign/cosmos/group/v1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/group/v1/tx.ts @@ -1,4 +1,4 @@ -import { Member, MemberAmino, MemberSDKType, VoteOption, VoteOptionSDKType, voteOptionFromJSON } from "./types"; +import { Member, MemberAmino, MemberSDKType, VoteOption, VoteOptionSDKType } from "./types"; import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; @@ -842,13 +842,13 @@ export const MsgCreateGroup = { }, toAmino(message: MsgCreateGroup): MsgCreateGroupAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgCreateGroupAminoMsg): MsgCreateGroup { @@ -919,7 +919,7 @@ export const MsgCreateGroupResponse = { }, toAmino(message: MsgCreateGroupResponse): MsgCreateGroupResponseAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateGroupResponseAminoMsg): MsgCreateGroupResponse { @@ -1010,12 +1010,12 @@ export const MsgUpdateGroupMembers = { }, toAmino(message: MsgUpdateGroupMembers): MsgUpdateGroupMembersAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; if (message.memberUpdates) { obj.member_updates = message.memberUpdates.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.member_updates = []; + obj.member_updates = message.memberUpdates; } return obj; }, @@ -1165,9 +1165,9 @@ export const MsgUpdateGroupAdmin = { }, 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; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgUpdateGroupAdminAminoMsg): MsgUpdateGroupAdmin { @@ -1316,9 +1316,9 @@ export const MsgUpdateGroupMetadata = { }, toAmino(message: MsgUpdateGroupMetadata): MsgUpdateGroupMetadataAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgUpdateGroupMetadataAminoMsg): MsgUpdateGroupMetadata { @@ -1480,9 +1480,9 @@ export const MsgCreateGroupPolicy = { }, 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.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; return obj; }, @@ -1552,7 +1552,7 @@ export const MsgCreateGroupPolicyResponse = { }, toAmino(message: MsgCreateGroupPolicyResponse): MsgCreateGroupPolicyResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: MsgCreateGroupPolicyResponseAminoMsg): MsgCreateGroupPolicyResponse { @@ -1643,9 +1643,9 @@ export const MsgUpdateGroupPolicyAdmin = { }, toAmino(message: MsgUpdateGroupPolicyAdmin): MsgUpdateGroupPolicyAdminAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; - obj.new_admin = message.newAdmin; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgUpdateGroupPolicyAdminAminoMsg): MsgUpdateGroupPolicyAdmin { @@ -1769,15 +1769,15 @@ export const MsgCreateGroupWithPolicy = { }, toAmino(message: MsgCreateGroupWithPolicy): MsgCreateGroupWithPolicyAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } - obj.group_metadata = message.groupMetadata; - obj.group_policy_metadata = message.groupPolicyMetadata; - obj.group_policy_as_admin = message.groupPolicyAsAdmin; + obj.group_metadata = message.groupMetadata === "" ? undefined : message.groupMetadata; + obj.group_policy_metadata = message.groupPolicyMetadata === "" ? undefined : message.groupPolicyMetadata; + obj.group_policy_as_admin = message.groupPolicyAsAdmin === false ? undefined : message.groupPolicyAsAdmin; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; return obj; }, @@ -1860,8 +1860,8 @@ export const MsgCreateGroupWithPolicyResponse = { }, toAmino(message: MsgCreateGroupWithPolicyResponse): MsgCreateGroupWithPolicyResponseAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.group_policy_address = message.groupPolicyAddress; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.group_policy_address = message.groupPolicyAddress === "" ? undefined : message.groupPolicyAddress; return obj; }, fromAminoMsg(object: MsgCreateGroupWithPolicyResponseAminoMsg): MsgCreateGroupWithPolicyResponse { @@ -2010,8 +2010,8 @@ export const MsgUpdateGroupPolicyDecisionPolicy = { }, toAmino(message: MsgUpdateGroupPolicyDecisionPolicy): MsgUpdateGroupPolicyDecisionPolicyAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; return obj; }, @@ -2159,9 +2159,9 @@ export const MsgUpdateGroupPolicyMetadata = { }, toAmino(message: MsgUpdateGroupPolicyMetadata): MsgUpdateGroupPolicyMetadataAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgUpdateGroupPolicyMetadataAminoMsg): MsgUpdateGroupPolicyMetadata { @@ -2320,25 +2320,25 @@ export const MsgSubmitProposal = { } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; if (object.exec !== undefined && object.exec !== null) { - message.exec = execFromJSON(object.exec); + message.exec = object.exec; } return message; }, toAmino(message: MsgSubmitProposal): MsgSubmitProposalAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.proposers) { obj.proposers = message.proposers.map(e => e); } else { - obj.proposers = []; + obj.proposers = message.proposers; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.exec = message.exec; + obj.exec = message.exec === 0 ? undefined : message.exec; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -2409,7 +2409,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -2491,8 +2491,8 @@ export const MsgWithdrawProposal = { }, toAmino(message: MsgWithdrawProposal): MsgWithdrawProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.address = message.address; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: MsgWithdrawProposalAminoMsg): MsgWithdrawProposal { @@ -2651,23 +2651,23 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; } if (object.exec !== undefined && object.exec !== null) { - message.exec = execFromJSON(object.exec); + message.exec = object.exec; } return message; }, 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; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.exec = message.exec === 0 ? undefined : message.exec; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -2805,8 +2805,8 @@ export const MsgExec = { }, toAmino(message: MsgExec): MsgExecAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.signer = message.signer; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgExecAminoMsg): MsgExec { @@ -2944,8 +2944,8 @@ export const MsgLeaveGroup = { }, toAmino(message: MsgLeaveGroup): MsgLeaveGroupAmino { const obj: any = {}; - obj.address = message.address; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLeaveGroupAminoMsg): MsgLeaveGroup { diff --git a/__fixtures__/v-next/outputsign/cosmos/group/v1/types.ts b/__fixtures__/v-next/outputsign/cosmos/group/v1/types.ts index e6a66e89ab..18a61663fc 100644 --- a/__fixtures__/v-next/outputsign/cosmos/group/v1/types.ts +++ b/__fixtures__/v-next/outputsign/cosmos/group/v1/types.ts @@ -831,9 +831,9 @@ export const Member = { }, toAmino(message: Member): MemberAmino { const obj: any = {}; - obj.address = message.address; - obj.weight = message.weight; - obj.metadata = message.metadata; + obj.address = message.address === "" ? undefined : message.address; + obj.weight = message.weight === "" ? undefined : message.weight; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.added_at = message.addedAt ? Timestamp.toAmino(toTimestamp(message.addedAt)) : undefined; return obj; }, @@ -904,7 +904,7 @@ export const Members = { if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } return obj; }, @@ -987,7 +987,7 @@ export const ThresholdDecisionPolicy = { }, toAmino(message: ThresholdDecisionPolicy): ThresholdDecisionPolicyAmino { const obj: any = {}; - obj.threshold = message.threshold; + obj.threshold = message.threshold === "" ? undefined : message.threshold; obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined; return obj; }, @@ -1070,7 +1070,7 @@ export const PercentageDecisionPolicy = { }, toAmino(message: PercentageDecisionPolicy): PercentageDecisionPolicyAmino { const obj: any = {}; - obj.percentage = message.percentage; + obj.percentage = message.percentage === "" ? undefined : message.percentage; obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined; return obj; }, @@ -1284,11 +1284,11 @@ export const GroupInfo = { }, 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.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; obj.created_at = message.createdAt ? Timestamp.toAmino(toTimestamp(message.createdAt)) : undefined; return obj; }, @@ -1373,7 +1373,7 @@ export const GroupMember = { }, toAmino(message: GroupMember): GroupMemberAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.member = message.member ? Member.toAmino(message.member) : undefined; return obj; }, @@ -1515,11 +1515,11 @@ export const GroupPolicyInfo = { }, 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.address = message.address === "" ? undefined : message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; obj.created_at = message.createdAt ? Timestamp.toAmino(toTimestamp(message.createdAt)) : undefined; return obj; @@ -1707,10 +1707,10 @@ export const Proposal = { message.groupPolicyVersion = BigInt(object.group_policy_version); } if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.result !== undefined && object.result !== null) { - message.result = proposalResultFromJSON(object.result); + message.result = object.result; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -1719,33 +1719,33 @@ export const Proposal = { message.votingPeriodEnd = fromTimestamp(Timestamp.fromAmino(object.voting_period_end)); } if (object.executor_result !== undefined && object.executor_result !== null) { - message.executorResult = proposalExecutorResultFromJSON(object.executor_result); + message.executorResult = object.executor_result; } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; return message; }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.address = message.address; - obj.metadata = message.metadata; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.metadata = message.metadata === "" ? undefined : message.metadata; if (message.proposers) { obj.proposers = message.proposers.map(e => e); } else { - obj.proposers = []; + obj.proposers = message.proposers; } obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; - 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.group_version = message.groupVersion !== BigInt(0) ? message.groupVersion.toString() : undefined; + obj.group_policy_version = message.groupPolicyVersion !== BigInt(0) ? message.groupPolicyVersion.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.result = message.result === 0 ? undefined : message.result; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.voting_period_end = message.votingPeriodEnd ? Timestamp.toAmino(toTimestamp(message.votingPeriodEnd)) : undefined; - obj.executor_result = message.executorResult; + obj.executor_result = message.executorResult === 0 ? undefined : message.executorResult; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } return obj; }, @@ -1848,10 +1848,10 @@ export const TallyResult = { }, 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; + obj.yes_count = message.yesCount === "" ? undefined : message.yesCount; + obj.abstain_count = message.abstainCount === "" ? undefined : message.abstainCount; + obj.no_count = message.noCount === "" ? undefined : message.noCount; + obj.no_with_veto_count = message.noWithVetoCount === "" ? undefined : message.noWithVetoCount; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -1954,7 +1954,7 @@ export const Vote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; @@ -1966,10 +1966,10 @@ export const Vote = { }, 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.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputsign/cosmos/mint/v1beta1/mint.ts index 877e221a02..29322fc701 100644 --- a/__fixtures__/v-next/outputsign/cosmos/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputsign/cosmos/mint/v1beta1/mint.ts @@ -131,8 +131,8 @@ export const Minter = { }, toAmino(message: Minter): MinterAmino { const obj: any = {}; - obj.inflation = message.inflation; - obj.annual_provisions = message.annualProvisions; + obj.inflation = message.inflation === "" ? undefined : message.inflation; + obj.annual_provisions = message.annualProvisions === "" ? undefined : message.annualProvisions; return obj; }, fromAminoMsg(object: MinterAminoMsg): Minter { @@ -258,12 +258,12 @@ export const Params = { }, 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; + obj.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; + obj.inflation_rate_change = message.inflationRateChange === "" ? undefined : message.inflationRateChange; + obj.inflation_max = message.inflationMax === "" ? undefined : message.inflationMax; + obj.inflation_min = message.inflationMin === "" ? undefined : message.inflationMin; + obj.goal_bonded = message.goalBonded === "" ? undefined : message.goalBonded; + obj.blocks_per_year = message.blocksPerYear !== BigInt(0) ? message.blocksPerYear.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/event.ts b/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/event.ts index 6e46ad4b51..a37903ced1 100644 --- a/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/event.ts +++ b/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/event.ts @@ -159,10 +159,10 @@ export const EventSend = { }, toAmino(message: EventSend): EventSendAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: EventSendAminoMsg): EventSend { @@ -253,9 +253,9 @@ export const EventMint = { }, toAmino(message: EventMint): EventMintAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: EventMintAminoMsg): EventMint { @@ -346,9 +346,9 @@ export const EventBurn = { }, toAmino(message: EventBurn): EventBurnAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: EventBurnAminoMsg): EventBurn { diff --git a/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/genesis.ts index 17e6064b63..81da93c3e9 100644 --- a/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/genesis.ts @@ -108,12 +108,12 @@ export const GenesisState = { if (message.classes) { obj.classes = message.classes.map(e => e ? Class.toAmino(e) : undefined); } else { - obj.classes = []; + obj.classes = message.classes; } if (message.entries) { obj.entries = message.entries.map(e => e ? Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -192,11 +192,11 @@ export const Entry = { }, toAmino(message: Entry): EntryAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; if (message.nfts) { obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e) : undefined); } else { - obj.nfts = []; + obj.nfts = message.nfts; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/nft.ts b/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/nft.ts index 417aeb6205..f363ebeb12 100644 --- a/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/nft.ts +++ b/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/nft.ts @@ -208,12 +208,12 @@ export const Class = { }, 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.id = message.id === "" ? undefined : message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.symbol = message.symbol === "" ? undefined : message.symbol; + obj.description = message.description === "" ? undefined : message.description; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; obj.data = message.data ? Any.toAmino(message.data) : undefined; return obj; }, @@ -329,10 +329,10 @@ export const NFT = { }, 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.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; obj.data = message.data ? Any.toAmino(message.data) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/query.ts index cef52a33f7..c16a018e21 100644 --- a/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/query.ts @@ -361,8 +361,8 @@ export const QueryBalanceRequest = { }, toAmino(message: QueryBalanceRequest): QueryBalanceRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest { @@ -433,7 +433,7 @@ export const QueryBalanceResponse = { }, toAmino(message: QueryBalanceResponse): QueryBalanceResponseAmino { const obj: any = {}; - obj.amount = message.amount ? message.amount.toString() : undefined; + obj.amount = message.amount !== BigInt(0) ? message.amount.toString() : undefined; return obj; }, fromAminoMsg(object: QueryBalanceResponseAminoMsg): QueryBalanceResponse { @@ -513,8 +513,8 @@ export const QueryOwnerRequest = { }, toAmino(message: QueryOwnerRequest): QueryOwnerRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: QueryOwnerRequestAminoMsg): QueryOwnerRequest { @@ -583,7 +583,7 @@ export const QueryOwnerResponse = { }, toAmino(message: QueryOwnerResponse): QueryOwnerResponseAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryOwnerResponseAminoMsg): QueryOwnerResponse { @@ -652,7 +652,7 @@ export const QuerySupplyRequest = { }, toAmino(message: QuerySupplyRequest): QuerySupplyRequestAmino { const obj: any = {}; - obj.class_id = message.classId; + obj.class_id = message.classId === "" ? undefined : message.classId; return obj; }, fromAminoMsg(object: QuerySupplyRequestAminoMsg): QuerySupplyRequest { @@ -723,7 +723,7 @@ export const QuerySupplyResponse = { }, toAmino(message: QuerySupplyResponse): QuerySupplyResponseAmino { const obj: any = {}; - obj.amount = message.amount ? message.amount.toString() : undefined; + obj.amount = message.amount !== BigInt(0) ? message.amount.toString() : undefined; return obj; }, fromAminoMsg(object: QuerySupplyResponseAminoMsg): QuerySupplyResponse { @@ -816,8 +816,8 @@ export const QueryNFTsRequest = { }, toAmino(message: QueryNFTsRequest): QueryNFTsRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.owner = message.owner === "" ? undefined : message.owner; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -901,7 +901,7 @@ export const QueryNFTsResponse = { if (message.nfts) { obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e) : undefined); } else { - obj.nfts = []; + obj.nfts = message.nfts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -983,8 +983,8 @@ export const QueryNFTRequest = { }, toAmino(message: QueryNFTRequest): QueryNFTRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: QueryNFTRequestAminoMsg): QueryNFTRequest { @@ -1124,7 +1124,7 @@ export const QueryClassRequest = { }, toAmino(message: QueryClassRequest): QueryClassRequestAmino { const obj: any = {}; - obj.class_id = message.classId; + obj.class_id = message.classId === "" ? undefined : message.classId; return obj; }, fromAminoMsg(object: QueryClassRequestAminoMsg): QueryClassRequest { @@ -1349,7 +1349,7 @@ export const QueryClassesResponse = { if (message.classes) { obj.classes = message.classes.map(e => e ? Class.toAmino(e) : undefined); } else { - obj.classes = []; + obj.classes = message.classes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/tx.ts index 679e84df78..8886a6c57e 100644 --- a/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/nft/v1beta1/tx.ts @@ -129,10 +129,10 @@ export const MsgSend = { }, toAmino(message: MsgSend): MsgSendAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: MsgSendAminoMsg): MsgSend { diff --git a/__fixtures__/v-next/outputsign/cosmos/orm/v1/orm.ts b/__fixtures__/v-next/outputsign/cosmos/orm/v1/orm.ts index 30d86a2853..a32389a0db 100644 --- a/__fixtures__/v-next/outputsign/cosmos/orm/v1/orm.ts +++ b/__fixtures__/v-next/outputsign/cosmos/orm/v1/orm.ts @@ -298,9 +298,9 @@ export const TableDescriptor = { if (message.index) { obj.index = message.index.map(e => e ? SecondaryIndexDescriptor.toAmino(e) : undefined); } else { - obj.index = []; + obj.index = message.index; } - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: TableDescriptorAminoMsg): TableDescriptor { @@ -380,8 +380,8 @@ export const PrimaryKeyDescriptor = { }, toAmino(message: PrimaryKeyDescriptor): PrimaryKeyDescriptorAmino { const obj: any = {}; - obj.fields = message.fields; - obj.auto_increment = message.autoIncrement; + obj.fields = message.fields === "" ? undefined : message.fields; + obj.auto_increment = message.autoIncrement === false ? undefined : message.autoIncrement; return obj; }, fromAminoMsg(object: PrimaryKeyDescriptorAminoMsg): PrimaryKeyDescriptor { @@ -472,9 +472,9 @@ export const SecondaryIndexDescriptor = { }, toAmino(message: SecondaryIndexDescriptor): SecondaryIndexDescriptorAmino { const obj: any = {}; - obj.fields = message.fields; - obj.id = message.id; - obj.unique = message.unique; + obj.fields = message.fields === "" ? undefined : message.fields; + obj.id = message.id === 0 ? undefined : message.id; + obj.unique = message.unique === false ? undefined : message.unique; return obj; }, fromAminoMsg(object: SecondaryIndexDescriptorAminoMsg): SecondaryIndexDescriptor { @@ -543,7 +543,7 @@ export const SingletonDescriptor = { }, toAmino(message: SingletonDescriptor): SingletonDescriptorAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: SingletonDescriptorAminoMsg): SingletonDescriptor { diff --git a/__fixtures__/v-next/outputsign/cosmos/orm/v1alpha1/schema.ts b/__fixtures__/v-next/outputsign/cosmos/orm/v1alpha1/schema.ts index a3b22ebd92..20404fd7cf 100644 --- a/__fixtures__/v-next/outputsign/cosmos/orm/v1alpha1/schema.ts +++ b/__fixtures__/v-next/outputsign/cosmos/orm/v1alpha1/schema.ts @@ -227,7 +227,7 @@ export const ModuleSchemaDescriptor = { if (message.schemaFile) { obj.schema_file = message.schemaFile.map(e => e ? ModuleSchemaDescriptor_FileEntry.toAmino(e) : undefined); } else { - obj.schema_file = []; + obj.schema_file = message.schemaFile; } obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; @@ -314,15 +314,15 @@ export const ModuleSchemaDescriptor_FileEntry = { message.protoFileName = object.proto_file_name; } if (object.storage_type !== undefined && object.storage_type !== null) { - message.storageType = storageTypeFromJSON(object.storage_type); + message.storageType = object.storage_type; } return message; }, toAmino(message: ModuleSchemaDescriptor_FileEntry): ModuleSchemaDescriptor_FileEntryAmino { const obj: any = {}; - obj.id = message.id; - obj.proto_file_name = message.protoFileName; - obj.storage_type = message.storageType; + obj.id = message.id === 0 ? undefined : message.id; + obj.proto_file_name = message.protoFileName === "" ? undefined : message.protoFileName; + obj.storage_type = message.storageType === 0 ? undefined : message.storageType; return obj; }, fromAminoMsg(object: ModuleSchemaDescriptor_FileEntryAminoMsg): ModuleSchemaDescriptor_FileEntry { diff --git a/__fixtures__/v-next/outputsign/cosmos/params/v1beta1/params.ts b/__fixtures__/v-next/outputsign/cosmos/params/v1beta1/params.ts index 8807d744c2..49c179aecc 100644 --- a/__fixtures__/v-next/outputsign/cosmos/params/v1beta1/params.ts +++ b/__fixtures__/v-next/outputsign/cosmos/params/v1beta1/params.ts @@ -126,12 +126,12 @@ export const ParameterChangeProposal = { }, toAmino(message: ParameterChangeProposal): ParameterChangeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.changes) { obj.changes = message.changes.map(e => e ? ParamChange.toAmino(e) : undefined); } else { - obj.changes = []; + obj.changes = message.changes; } return obj; }, @@ -223,9 +223,9 @@ export const ParamChange = { }, toAmino(message: ParamChange): ParamChangeAmino { const obj: any = {}; - obj.subspace = message.subspace; - obj.key = message.key; - obj.value = message.value; + obj.subspace = message.subspace === "" ? undefined : message.subspace; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: ParamChangeAminoMsg): ParamChange { diff --git a/__fixtures__/v-next/outputsign/cosmos/params/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/params/v1beta1/query.ts index 1d4f464d8e..d4913a6de7 100644 --- a/__fixtures__/v-next/outputsign/cosmos/params/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/params/v1beta1/query.ts @@ -190,8 +190,8 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.subspace = message.subspace; - obj.key = message.key; + obj.subspace = message.subspace === "" ? undefined : message.subspace; + obj.key = message.key === "" ? undefined : message.key; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -388,7 +388,7 @@ export const QuerySubspacesResponse = { if (message.subspaces) { obj.subspaces = message.subspaces.map(e => e ? Subspace.toAmino(e) : undefined); } else { - obj.subspaces = []; + obj.subspaces = message.subspaces; } return obj; }, @@ -467,11 +467,11 @@ export const Subspace = { }, toAmino(message: Subspace): SubspaceAmino { const obj: any = {}; - obj.subspace = message.subspace; + obj.subspace = message.subspace === "" ? undefined : message.subspace; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/genesis.ts index d252c94f0d..14d94bc21f 100644 --- a/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/genesis.ts @@ -204,12 +204,12 @@ export const GenesisState = { if (message.signingInfos) { obj.signing_infos = message.signingInfos.map(e => e ? SigningInfo.toAmino(e) : undefined); } else { - obj.signing_infos = []; + obj.signing_infos = message.signingInfos; } if (message.missedBlocks) { obj.missed_blocks = message.missedBlocks.map(e => e ? ValidatorMissedBlocks.toAmino(e) : undefined); } else { - obj.missed_blocks = []; + obj.missed_blocks = message.missedBlocks; } return obj; }, @@ -292,7 +292,7 @@ export const SigningInfo = { }, toAmino(message: SigningInfo): SigningInfoAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.validator_signing_info = message.validatorSigningInfo ? ValidatorSigningInfo.toAmino(message.validatorSigningInfo) : undefined; return obj; }, @@ -371,11 +371,11 @@ export const ValidatorMissedBlocks = { }, toAmino(message: ValidatorMissedBlocks): ValidatorMissedBlocksAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.missedBlocks) { obj.missed_blocks = message.missedBlocks.map(e => e ? MissedBlock.toAmino(e) : undefined); } else { - obj.missed_blocks = []; + obj.missed_blocks = message.missedBlocks; } return obj; }, @@ -458,8 +458,8 @@ export const MissedBlock = { }, toAmino(message: MissedBlock): MissedBlockAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; - obj.missed = message.missed; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; + obj.missed = message.missed === false ? undefined : message.missed; return obj; }, fromAminoMsg(object: MissedBlockAminoMsg): MissedBlock { diff --git a/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/query.ts index 90a641340a..9ca5b944bb 100644 --- a/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/query.ts @@ -333,7 +333,7 @@ export const QuerySigningInfoRequest = { }, toAmino(message: QuerySigningInfoRequest): QuerySigningInfoRequestAmino { const obj: any = {}; - obj.cons_address = message.consAddress; + obj.cons_address = message.consAddress === "" ? undefined : message.consAddress; return obj; }, fromAminoMsg(object: QuerySigningInfoRequestAminoMsg): QuerySigningInfoRequest { @@ -558,7 +558,7 @@ export const QuerySigningInfosResponse = { if (message.info) { obj.info = message.info.map(e => e ? ValidatorSigningInfo.toAmino(e) : undefined); } else { - obj.info = []; + obj.info = message.info; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/slashing.ts b/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/slashing.ts index a8149264d1..f43d516797 100644 --- a/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/slashing.ts +++ b/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/slashing.ts @@ -214,12 +214,12 @@ export const ValidatorSigningInfo = { }, 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.address = message.address === "" ? undefined : message.address; + obj.start_height = message.startHeight !== BigInt(0) ? message.startHeight.toString() : undefined; + obj.index_offset = message.indexOffset !== BigInt(0) ? message.indexOffset.toString() : undefined; obj.jailed_until = message.jailedUntil ? Timestamp.toAmino(toTimestamp(message.jailedUntil)) : undefined; - obj.tombstoned = message.tombstoned; - obj.missed_blocks_counter = message.missedBlocksCounter ? message.missedBlocksCounter.toString() : undefined; + obj.tombstoned = message.tombstoned === false ? undefined : message.tombstoned; + obj.missed_blocks_counter = message.missedBlocksCounter !== BigInt(0) ? message.missedBlocksCounter.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorSigningInfoAminoMsg): ValidatorSigningInfo { @@ -336,7 +336,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.signed_blocks_window = message.signedBlocksWindow ? message.signedBlocksWindow.toString() : undefined; + obj.signed_blocks_window = message.signedBlocksWindow !== BigInt(0) ? message.signedBlocksWindow.toString() : undefined; obj.min_signed_per_window = message.minSignedPerWindow ? base64FromBytes(message.minSignedPerWindow) : undefined; obj.downtime_jail_duration = message.downtimeJailDuration ? Duration.toAmino(message.downtimeJailDuration) : undefined; obj.slash_fraction_double_sign = message.slashFractionDoubleSign ? base64FromBytes(message.slashFractionDoubleSign) : undefined; diff --git a/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/tx.ts index 864aa5e180..87972e6806 100644 --- a/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/slashing/v1beta1/tx.ts @@ -11,7 +11,7 @@ export interface MsgUnjailProtoMsg { } /** MsgUnjail defines the Msg/Unjail request type */ export interface MsgUnjailAmino { - validator_addr?: string; + validator_addr: string; } export interface MsgUnjailAminoMsg { type: "cosmos-sdk/MsgUnjail"; @@ -79,7 +79,7 @@ export const MsgUnjail = { }, toAmino(message: MsgUnjail): MsgUnjailAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr ?? ""; return obj; }, fromAminoMsg(object: MsgUnjailAminoMsg): MsgUnjail { diff --git a/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/authz.ts b/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/authz.ts index dbd698e07d..7cba3b9331 100644 --- a/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/authz.ts @@ -213,7 +213,7 @@ export const StakeAuthorization = { message.denyList = StakeAuthorization_Validators.fromAmino(object.deny_list); } if (object.authorization_type !== undefined && object.authorization_type !== null) { - message.authorizationType = authorizationTypeFromJSON(object.authorization_type); + message.authorizationType = object.authorization_type; } return message; }, @@ -222,7 +222,7 @@ export const StakeAuthorization = { 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; + obj.authorization_type = message.authorizationType === 0 ? undefined : message.authorizationType; return obj; }, fromAminoMsg(object: StakeAuthorizationAminoMsg): StakeAuthorization { @@ -292,7 +292,7 @@ export const StakeAuthorization_Validators = { if (message.address) { obj.address = message.address.map(e => e); } else { - obj.address = []; + obj.address = message.address; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/genesis.ts index 190092b82f..76f304ddc2 100644 --- a/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/genesis.ts @@ -214,29 +214,29 @@ export const GenesisState = { if (message.lastValidatorPowers) { obj.last_validator_powers = message.lastValidatorPowers.map(e => e ? LastValidatorPower.toAmino(e) : undefined); } else { - obj.last_validator_powers = []; + obj.last_validator_powers = message.lastValidatorPowers; } if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } if (message.delegations) { obj.delegations = message.delegations.map(e => e ? Delegation.toAmino(e) : undefined); } else { - obj.delegations = []; + obj.delegations = message.delegations; } if (message.unbondingDelegations) { obj.unbonding_delegations = message.unbondingDelegations.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_delegations = []; + obj.unbonding_delegations = message.unbondingDelegations; } if (message.redelegations) { obj.redelegations = message.redelegations.map(e => e ? Redelegation.toAmino(e) : undefined); } else { - obj.redelegations = []; + obj.redelegations = message.redelegations; } - obj.exported = message.exported; + obj.exported = message.exported === false ? undefined : message.exported; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -318,8 +318,8 @@ export const LastValidatorPower = { }, toAmino(message: LastValidatorPower): LastValidatorPowerAmino { const obj: any = {}; - obj.address = message.address; - obj.power = message.power ? message.power.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: LastValidatorPowerAminoMsg): LastValidatorPower { diff --git a/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/query.ts index 30cf1ab938..070e12287e 100644 --- a/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/query.ts @@ -909,7 +909,7 @@ export const QueryValidatorsRequest = { }, toAmino(message: QueryValidatorsRequest): QueryValidatorsRequestAmino { const obj: any = {}; - obj.status = message.status; + obj.status = message.status === "" ? undefined : message.status; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -993,7 +993,7 @@ export const QueryValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1064,7 +1064,7 @@ export const QueryValidatorRequest = { }, toAmino(message: QueryValidatorRequest): QueryValidatorRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryValidatorRequestAminoMsg): QueryValidatorRequest { @@ -1217,7 +1217,7 @@ export const QueryValidatorDelegationsRequest = { }, toAmino(message: QueryValidatorDelegationsRequest): QueryValidatorDelegationsRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1301,7 +1301,7 @@ export const QueryValidatorDelegationsResponse = { if (message.delegationResponses) { obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_responses = []; + obj.delegation_responses = message.delegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1385,7 +1385,7 @@ export const QueryValidatorUnbondingDelegationsRequest = { }, toAmino(message: QueryValidatorUnbondingDelegationsRequest): QueryValidatorUnbondingDelegationsRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1469,7 +1469,7 @@ export const QueryValidatorUnbondingDelegationsResponse = { if (message.unbondingResponses) { obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_responses = []; + obj.unbonding_responses = message.unbondingResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1551,8 +1551,8 @@ export const QueryDelegationRequest = { }, toAmino(message: QueryDelegationRequest): QueryDelegationRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryDelegationRequestAminoMsg): QueryDelegationRequest { @@ -1703,8 +1703,8 @@ export const QueryUnbondingDelegationRequest = { }, toAmino(message: QueryUnbondingDelegationRequest): QueryUnbondingDelegationRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryUnbondingDelegationRequestAminoMsg): QueryUnbondingDelegationRequest { @@ -1857,7 +1857,7 @@ export const QueryDelegatorDelegationsRequest = { }, toAmino(message: QueryDelegatorDelegationsRequest): QueryDelegatorDelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1941,7 +1941,7 @@ export const QueryDelegatorDelegationsResponse = { if (message.delegationResponses) { obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_responses = []; + obj.delegation_responses = message.delegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2025,7 +2025,7 @@ export const QueryDelegatorUnbondingDelegationsRequest = { }, toAmino(message: QueryDelegatorUnbondingDelegationsRequest): QueryDelegatorUnbondingDelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2109,7 +2109,7 @@ export const QueryDelegatorUnbondingDelegationsResponse = { if (message.unbondingResponses) { obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_responses = []; + obj.unbonding_responses = message.unbondingResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2215,9 +2215,9 @@ export const QueryRedelegationsRequest = { }, 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.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.src_validator_addr = message.srcValidatorAddr === "" ? undefined : message.srcValidatorAddr; + obj.dst_validator_addr = message.dstValidatorAddr === "" ? undefined : message.dstValidatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2301,7 +2301,7 @@ export const QueryRedelegationsResponse = { if (message.redelegationResponses) { obj.redelegation_responses = message.redelegationResponses.map(e => e ? RedelegationResponse.toAmino(e) : undefined); } else { - obj.redelegation_responses = []; + obj.redelegation_responses = message.redelegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2385,7 +2385,7 @@ export const QueryDelegatorValidatorsRequest = { }, toAmino(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2469,7 +2469,7 @@ export const QueryDelegatorValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2551,8 +2551,8 @@ export const QueryDelegatorValidatorRequest = { }, toAmino(message: QueryDelegatorValidatorRequest): QueryDelegatorValidatorRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryDelegatorValidatorRequestAminoMsg): QueryDelegatorValidatorRequest { @@ -2694,7 +2694,7 @@ export const QueryHistoricalInfoRequest = { }, toAmino(message: QueryHistoricalInfoRequest): QueryHistoricalInfoRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: QueryHistoricalInfoRequestAminoMsg): QueryHistoricalInfoRequest { diff --git a/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/staking.ts index 140e7d049e..be5d7ef149 100644 --- a/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/staking.ts +++ b/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/staking.ts @@ -811,8 +811,8 @@ export interface PoolProtoMsg { * denomination. */ export interface PoolAmino { - not_bonded_tokens?: string; - bonded_tokens?: string; + not_bonded_tokens: string; + bonded_tokens: string; } export interface PoolAminoMsg { type: "cosmos-sdk/Pool"; @@ -885,7 +885,7 @@ export const HistoricalInfo = { if (message.valset) { obj.valset = message.valset.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.valset = []; + obj.valset = message.valset; } return obj; }, @@ -977,9 +977,9 @@ export const CommissionRates = { }, toAmino(message: CommissionRates): CommissionRatesAmino { const obj: any = {}; - obj.rate = message.rate; - obj.max_rate = message.maxRate; - obj.max_change_rate = message.maxChangeRate; + obj.rate = message.rate === "" ? undefined : message.rate; + obj.max_rate = message.maxRate === "" ? undefined : message.maxRate; + obj.max_change_rate = message.maxChangeRate === "" ? undefined : message.maxChangeRate; return obj; }, fromAminoMsg(object: CommissionRatesAminoMsg): CommissionRates { @@ -1175,11 +1175,11 @@ export const Description = { }, 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; + obj.moniker = message.moniker === "" ? undefined : message.moniker; + obj.identity = message.identity === "" ? undefined : message.identity; + obj.website = message.website === "" ? undefined : message.website; + obj.security_contact = message.securityContact === "" ? undefined : message.securityContact; + obj.details = message.details === "" ? undefined : message.details; return obj; }, fromAminoMsg(object: DescriptionAminoMsg): Description { @@ -1339,7 +1339,7 @@ export const Validator = { message.jailed = object.jailed; } if (object.status !== undefined && object.status !== null) { - message.status = bondStatusFromJSON(object.status); + message.status = object.status; } if (object.tokens !== undefined && object.tokens !== null) { message.tokens = object.tokens; @@ -1366,17 +1366,17 @@ export const Validator = { }, toAmino(message: Validator): ValidatorAmino { const obj: any = {}; - obj.operator_address = message.operatorAddress; + obj.operator_address = message.operatorAddress === "" ? undefined : 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.jailed = message.jailed === false ? undefined : message.jailed; + obj.status = message.status === 0 ? undefined : message.status; + obj.tokens = message.tokens === "" ? undefined : message.tokens; + obj.delegator_shares = message.delegatorShares === "" ? undefined : message.delegatorShares; obj.description = message.description ? Description.toAmino(message.description) : undefined; - obj.unbonding_height = message.unbondingHeight ? message.unbondingHeight.toString() : undefined; + obj.unbonding_height = message.unbondingHeight !== BigInt(0) ? message.unbondingHeight.toString() : undefined; obj.unbonding_time = message.unbondingTime ? Timestamp.toAmino(toTimestamp(message.unbondingTime)) : undefined; obj.commission = message.commission ? Commission.toAmino(message.commission) : undefined; - obj.min_self_delegation = message.minSelfDelegation; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -1446,7 +1446,7 @@ export const ValAddresses = { if (message.addresses) { obj.addresses = message.addresses.map(e => e); } else { - obj.addresses = []; + obj.addresses = message.addresses; } return obj; }, @@ -1527,8 +1527,8 @@ export const DVPair = { }, toAmino(message: DVPair): DVPairAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: DVPairAminoMsg): DVPair { @@ -1598,7 +1598,7 @@ export const DVPairs = { if (message.pairs) { obj.pairs = message.pairs.map(e => e ? DVPair.toAmino(e) : undefined); } else { - obj.pairs = []; + obj.pairs = message.pairs; } return obj; }, @@ -1690,9 +1690,9 @@ export const DVVTriplet = { }, toAmino(message: DVVTriplet): DVVTripletAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; return obj; }, fromAminoMsg(object: DVVTripletAminoMsg): DVVTriplet { @@ -1762,7 +1762,7 @@ export const DVVTriplets = { if (message.triplets) { obj.triplets = message.triplets.map(e => e ? DVVTriplet.toAmino(e) : undefined); } else { - obj.triplets = []; + obj.triplets = message.triplets; } return obj; }, @@ -1854,9 +1854,9 @@ export const Delegation = { }, toAmino(message: Delegation): DelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.shares = message.shares; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.shares = message.shares === "" ? undefined : message.shares; return obj; }, fromAminoMsg(object: DelegationAminoMsg): Delegation { @@ -1945,12 +1945,12 @@ export const UnbondingDelegation = { }, toAmino(message: UnbondingDelegation): UnbondingDelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.entries) { obj.entries = message.entries.map(e => e ? UnbondingDelegationEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2055,10 +2055,10 @@ export const UnbondingDelegationEntry = { }, toAmino(message: UnbondingDelegationEntry): UnbondingDelegationEntryAmino { const obj: any = {}; - obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.creation_height = message.creationHeight !== BigInt(0) ? message.creationHeight.toString() : undefined; obj.completion_time = message.completionTime ? Timestamp.toAmino(toTimestamp(message.completionTime)) : undefined; - obj.initial_balance = message.initialBalance; - obj.balance = message.balance; + obj.initial_balance = message.initialBalance === "" ? undefined : message.initialBalance; + obj.balance = message.balance === "" ? undefined : message.balance; return obj; }, fromAminoMsg(object: UnbondingDelegationEntryAminoMsg): UnbondingDelegationEntry { @@ -2162,10 +2162,10 @@ export const RedelegationEntry = { }, toAmino(message: RedelegationEntry): RedelegationEntryAmino { const obj: any = {}; - obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.creation_height = message.creationHeight !== BigInt(0) ? message.creationHeight.toString() : undefined; obj.completion_time = message.completionTime ? Timestamp.toAmino(toTimestamp(message.completionTime)) : undefined; - obj.initial_balance = message.initialBalance; - obj.shares_dst = message.sharesDst; + obj.initial_balance = message.initialBalance === "" ? undefined : message.initialBalance; + obj.shares_dst = message.sharesDst === "" ? undefined : message.sharesDst; return obj; }, fromAminoMsg(object: RedelegationEntryAminoMsg): RedelegationEntry { @@ -2265,13 +2265,13 @@ export const Redelegation = { }, toAmino(message: Redelegation): RedelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; if (message.entries) { obj.entries = message.entries.map(e => e ? RedelegationEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2399,11 +2399,11 @@ export const Params = { 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; + obj.max_validators = message.maxValidators === 0 ? undefined : message.maxValidators; + obj.max_entries = message.maxEntries === 0 ? undefined : message.maxEntries; + obj.historical_entries = message.historicalEntries === 0 ? undefined : message.historicalEntries; + obj.bond_denom = message.bondDenom === "" ? undefined : message.bondDenom; + obj.min_commission_rate = message.minCommissionRate === "" ? undefined : message.minCommissionRate; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -2571,7 +2571,7 @@ export const RedelegationEntryResponse = { toAmino(message: RedelegationEntryResponse): RedelegationEntryResponseAmino { const obj: any = {}; obj.redelegation_entry = message.redelegationEntry ? RedelegationEntry.toAmino(message.redelegationEntry) : undefined; - obj.balance = message.balance; + obj.balance = message.balance === "" ? undefined : message.balance; return obj; }, fromAminoMsg(object: RedelegationEntryResponseAminoMsg): RedelegationEntryResponse { @@ -2655,7 +2655,7 @@ export const RedelegationResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? RedelegationEntryResponse.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2736,8 +2736,8 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.not_bonded_tokens = message.notBondedTokens; - obj.bonded_tokens = message.bondedTokens; + obj.not_bonded_tokens = message.notBondedTokens ?? ""; + obj.bonded_tokens = message.bondedTokens ?? ""; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { diff --git a/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/tx.ts index 6caa794646..1e5c620c7f 100644 --- a/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/staking/v1beta1/tx.ts @@ -396,9 +396,9 @@ export const MsgCreateValidator = { 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.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; obj.value = message.value ? Coin.toAmino(message.value) : undefined; return obj; @@ -561,9 +561,9 @@ export const MsgEditValidator = { 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; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.commission_rate = message.commissionRate === "" ? undefined : message.commissionRate; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; return obj; }, fromAminoMsg(object: MsgEditValidatorAminoMsg): MsgEditValidator { @@ -712,8 +712,8 @@ export const MsgDelegate = { }, toAmino(message: MsgDelegate): MsgDelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -874,9 +874,9 @@ export const MsgBeginRedelegate = { }, 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.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -1039,8 +1039,8 @@ export const MsgUndelegate = { }, toAmino(message: MsgUndelegate): MsgUndelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/tx/signing/v1beta1/signing.ts b/__fixtures__/v-next/outputsign/cosmos/tx/signing/v1beta1/signing.ts index 5153967eb7..7786fc840e 100644 --- a/__fixtures__/v-next/outputsign/cosmos/tx/signing/v1beta1/signing.ts +++ b/__fixtures__/v-next/outputsign/cosmos/tx/signing/v1beta1/signing.ts @@ -289,7 +289,7 @@ export const SignatureDescriptors = { if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor.toAmino(e) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -389,7 +389,7 @@ export const SignatureDescriptor = { 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; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureDescriptorAminoMsg): SignatureDescriptor { @@ -545,7 +545,7 @@ export const SignatureDescriptor_Data_Single = { fromAmino(object: SignatureDescriptor_Data_SingleAmino): SignatureDescriptor_Data_Single { const message = createBaseSignatureDescriptor_Data_Single(); if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.signature !== undefined && object.signature !== null) { message.signature = bytesFromBase64(object.signature); @@ -554,7 +554,7 @@ export const SignatureDescriptor_Data_Single = { }, toAmino(message: SignatureDescriptor_Data_Single): SignatureDescriptor_Data_SingleAmino { const obj: any = {}; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; return obj; }, @@ -639,7 +639,7 @@ export const SignatureDescriptor_Data_Multi = { if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor_Data.toAmino(e) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/tx/v1beta1/service.ts b/__fixtures__/v-next/outputsign/cosmos/tx/v1beta1/service.ts index e41e84578c..f47bff1506 100644 --- a/__fixtures__/v-next/outputsign/cosmos/tx/v1beta1/service.ts +++ b/__fixtures__/v-next/outputsign/cosmos/tx/v1beta1/service.ts @@ -545,7 +545,7 @@ export const GetTxsEventRequest = { message.pagination = PageRequest.fromAmino(object.pagination); } if (object.order_by !== undefined && object.order_by !== null) { - message.orderBy = orderByFromJSON(object.order_by); + message.orderBy = object.order_by; } return message; }, @@ -554,10 +554,10 @@ export const GetTxsEventRequest = { if (message.events) { obj.events = message.events.map(e => e); } else { - obj.events = []; + obj.events = message.events; } obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; - obj.order_by = message.orderBy; + obj.order_by = message.orderBy === 0 ? undefined : message.orderBy; return obj; }, fromAminoMsg(object: GetTxsEventRequestAminoMsg): GetTxsEventRequest { @@ -649,12 +649,12 @@ export const GetTxsEventResponse = { if (message.txs) { obj.txs = message.txs.map(e => e ? Tx.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } if (message.txResponses) { obj.tx_responses = message.txResponses.map(e => e ? TxResponse.toAmino(e) : undefined); } else { - obj.tx_responses = []; + obj.tx_responses = message.txResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -730,14 +730,14 @@ export const BroadcastTxRequest = { message.txBytes = bytesFromBase64(object.tx_bytes); } if (object.mode !== undefined && object.mode !== null) { - message.mode = broadcastModeFromJSON(object.mode); + message.mode = object.mode; } return message; }, toAmino(message: BroadcastTxRequest): BroadcastTxRequestAmino { const obj: any = {}; obj.tx_bytes = message.txBytes ? base64FromBytes(message.txBytes) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; return obj; }, fromAminoMsg(object: BroadcastTxRequestAminoMsg): BroadcastTxRequest { @@ -1045,7 +1045,7 @@ export const GetTxRequest = { }, toAmino(message: GetTxRequest): GetTxRequestAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === "" ? undefined : message.hash; return obj; }, fromAminoMsg(object: GetTxRequestAminoMsg): GetTxRequest { @@ -1214,7 +1214,7 @@ export const GetBlockWithTxsRequest = { }, toAmino(message: GetBlockWithTxsRequest): GetBlockWithTxsRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1324,7 +1324,7 @@ export const GetBlockWithTxsResponse = { if (message.txs) { obj.txs = message.txs.map(e => e ? Tx.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.block = message.block ? Block.toAmino(message.block) : undefined; diff --git a/__fixtures__/v-next/outputsign/cosmos/tx/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/tx/v1beta1/tx.ts index 0a88b08ba9..9072a6c7d2 100644 --- a/__fixtures__/v-next/outputsign/cosmos/tx/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/tx/v1beta1/tx.ts @@ -1,5 +1,5 @@ import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { SignMode, SignModeSDKType, signModeFromJSON } from "../signing/v1beta1/signing"; +import { SignMode, SignModeSDKType } from "../signing/v1beta1/signing"; import { CompactBitArray, CompactBitArrayAmino, CompactBitArraySDKType } from "../../crypto/multisig/v1beta1/multisig"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../binary"; @@ -831,7 +831,7 @@ export const Tx = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -926,7 +926,7 @@ export const TxRaw = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -1033,8 +1033,8 @@ export const SignDoc = { const obj: any = {}; obj.body_bytes = message.bodyBytes ? base64FromBytes(message.bodyBytes) : undefined; obj.auth_info_bytes = message.authInfoBytes ? base64FromBytes(message.authInfoBytes) : undefined; - obj.chain_id = message.chainId; - obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; return obj; }, fromAminoMsg(object: SignDocAminoMsg): SignDoc { @@ -1168,9 +1168,9 @@ export const SignDocDirectAux = { const obj: any = {}; obj.body_bytes = message.bodyBytes ? base64FromBytes(message.bodyBytes) : undefined; 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.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined; return obj; }, @@ -1283,19 +1283,19 @@ export const TxBody = { if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.memo = message.memo; - obj.timeout_height = message.timeoutHeight ? message.timeoutHeight.toString() : undefined; + obj.memo = message.memo === "" ? undefined : message.memo; + obj.timeout_height = message.timeoutHeight !== BigInt(0) ? message.timeoutHeight.toString() : undefined; if (message.extensionOptions) { obj.extension_options = message.extensionOptions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extension_options = []; + obj.extension_options = message.extensionOptions; } if (message.nonCriticalExtensionOptions) { obj.non_critical_extension_options = message.nonCriticalExtensionOptions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.non_critical_extension_options = []; + obj.non_critical_extension_options = message.nonCriticalExtensionOptions; } return obj; }, @@ -1392,7 +1392,7 @@ export const AuthInfo = { if (message.signerInfos) { obj.signer_infos = message.signerInfos.map(e => e ? SignerInfo.toAmino(e) : undefined); } else { - obj.signer_infos = []; + obj.signer_infos = message.signerInfos; } obj.fee = message.fee ? Fee.toAmino(message.fee) : undefined; obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined; @@ -1494,7 +1494,7 @@ export const SignerInfo = { 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; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: SignerInfoAminoMsg): SignerInfo { @@ -1642,13 +1642,13 @@ export const ModeInfo_Single = { fromAmino(object: ModeInfo_SingleAmino): ModeInfo_Single { const message = createBaseModeInfo_Single(); if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } return message; }, toAmino(message: ModeInfo_Single): ModeInfo_SingleAmino { const obj: any = {}; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; return obj; }, fromAminoMsg(object: ModeInfo_SingleAminoMsg): ModeInfo_Single { @@ -1732,7 +1732,7 @@ export const ModeInfo_Multi = { if (message.modeInfos) { obj.mode_infos = message.modeInfos.map(e => e ? ModeInfo.toAmino(e) : undefined); } else { - obj.mode_infos = []; + obj.mode_infos = message.modeInfos; } return obj; }, @@ -1838,11 +1838,11 @@ export const Fee = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.gas_limit = message.gasLimit ? message.gasLimit.toString() : undefined; - obj.payer = message.payer; - obj.granter = message.granter; + obj.gas_limit = message.gasLimit !== BigInt(0) ? message.gasLimit.toString() : undefined; + obj.payer = message.payer === "" ? undefined : message.payer; + obj.granter = message.granter === "" ? undefined : message.granter; return obj; }, fromAminoMsg(object: FeeAminoMsg): Fee { @@ -1923,9 +1923,9 @@ export const Tip = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.tipper = message.tipper; + obj.tipper = message.tipper === "" ? undefined : message.tipper; return obj; }, fromAminoMsg(object: TipAminoMsg): Tip { @@ -2020,7 +2020,7 @@ export const AuxSignerData = { message.signDoc = SignDocDirectAux.fromAmino(object.sign_doc); } if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.sig !== undefined && object.sig !== null) { message.sig = bytesFromBase64(object.sig); @@ -2029,9 +2029,9 @@ export const AuxSignerData = { }, toAmino(message: AuxSignerData): AuxSignerDataAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.sign_doc = message.signDoc ? SignDocDirectAux.toAmino(message.signDoc) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.sig = message.sig ? base64FromBytes(message.sig) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/upgrade/v1beta1/query.ts b/__fixtures__/v-next/outputsign/cosmos/upgrade/v1beta1/query.ts index bc0996e5f2..2d04e00e29 100644 --- a/__fixtures__/v-next/outputsign/cosmos/upgrade/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmos/upgrade/v1beta1/query.ts @@ -503,7 +503,7 @@ export const QueryAppliedPlanRequest = { }, toAmino(message: QueryAppliedPlanRequest): QueryAppliedPlanRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: QueryAppliedPlanRequestAminoMsg): QueryAppliedPlanRequest { @@ -574,7 +574,7 @@ export const QueryAppliedPlanResponse = { }, toAmino(message: QueryAppliedPlanResponse): QueryAppliedPlanResponseAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: QueryAppliedPlanResponseAminoMsg): QueryAppliedPlanResponse { @@ -645,7 +645,7 @@ export const QueryUpgradedConsensusStateRequest = { }, toAmino(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAmino { const obj: any = {}; - obj.last_height = message.lastHeight ? message.lastHeight.toString() : undefined; + obj.last_height = message.lastHeight !== BigInt(0) ? message.lastHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryUpgradedConsensusStateRequestAminoMsg): QueryUpgradedConsensusStateRequest { @@ -783,7 +783,7 @@ export const QueryModuleVersionsRequest = { }, toAmino(message: QueryModuleVersionsRequest): QueryModuleVersionsRequestAmino { const obj: any = {}; - obj.module_name = message.moduleName; + obj.module_name = message.moduleName === "" ? undefined : message.moduleName; return obj; }, fromAminoMsg(object: QueryModuleVersionsRequestAminoMsg): QueryModuleVersionsRequest { @@ -853,7 +853,7 @@ export const QueryModuleVersionsResponse = { if (message.moduleVersions) { obj.module_versions = message.moduleVersions.map(e => e ? ModuleVersion.toAmino(e) : undefined); } else { - obj.module_versions = []; + obj.module_versions = message.moduleVersions; } return obj; }, @@ -979,7 +979,7 @@ export const QueryAuthorityResponse = { }, toAmino(message: QueryAuthorityResponse): QueryAuthorityResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryAuthorityResponseAminoMsg): QueryAuthorityResponse { diff --git a/__fixtures__/v-next/outputsign/cosmos/upgrade/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/upgrade/v1beta1/tx.ts index 2df244db2c..dd103d1354 100644 --- a/__fixtures__/v-next/outputsign/cosmos/upgrade/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/upgrade/v1beta1/tx.ts @@ -184,7 +184,7 @@ export const MsgSoftwareUpgrade = { }, toAmino(message: MsgSoftwareUpgrade): MsgSoftwareUpgradeAmino { const obj: any = {}; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; return obj; }, @@ -310,7 +310,7 @@ export const MsgCancelUpgrade = { }, toAmino(message: MsgCancelUpgrade): MsgCancelUpgradeAmino { const obj: any = {}; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; return obj; }, fromAminoMsg(object: MsgCancelUpgradeAminoMsg): MsgCancelUpgrade { diff --git a/__fixtures__/v-next/outputsign/cosmos/upgrade/v1beta1/upgrade.ts b/__fixtures__/v-next/outputsign/cosmos/upgrade/v1beta1/upgrade.ts index 8d639b3d4e..1bc7112f21 100644 --- a/__fixtures__/v-next/outputsign/cosmos/upgrade/v1beta1/upgrade.ts +++ b/__fixtures__/v-next/outputsign/cosmos/upgrade/v1beta1/upgrade.ts @@ -311,10 +311,10 @@ export const Plan = { }, toAmino(message: Plan): PlanAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.height = message.height ? message.height.toString() : undefined; - obj.info = message.info; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.info = message.info === "" ? undefined : message.info; obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; return obj; }, @@ -408,8 +408,8 @@ export const SoftwareUpgradeProposal = { }, toAmino(message: SoftwareUpgradeProposal): SoftwareUpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; return obj; }, @@ -490,8 +490,8 @@ export const CancelSoftwareUpgradeProposal = { }, toAmino(message: CancelSoftwareUpgradeProposal): CancelSoftwareUpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: CancelSoftwareUpgradeProposalAminoMsg): CancelSoftwareUpgradeProposal { @@ -573,8 +573,8 @@ export const ModuleVersion = { }, toAmino(message: ModuleVersion): ModuleVersionAmino { const obj: any = {}; - obj.name = message.name; - obj.version = message.version ? message.version.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; return obj; }, fromAminoMsg(object: ModuleVersionAminoMsg): ModuleVersion { diff --git a/__fixtures__/v-next/outputsign/cosmos/vesting/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/cosmos/vesting/v1beta1/tx.ts index 1e643d1fc2..bdd13877ce 100644 --- a/__fixtures__/v-next/outputsign/cosmos/vesting/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmos/vesting/v1beta1/tx.ts @@ -256,15 +256,15 @@ export const MsgCreateVestingAccount = { }, toAmino(message: MsgCreateVestingAccount): MsgCreateVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.end_time = message.endTime ? message.endTime.toString() : undefined; - obj.delayed = message.delayed; + obj.end_time = message.endTime !== BigInt(0) ? message.endTime.toString() : undefined; + obj.delayed = message.delayed === false ? undefined : message.delayed; return obj; }, fromAminoMsg(object: MsgCreateVestingAccountAminoMsg): MsgCreateVestingAccount { @@ -409,12 +409,12 @@ export const MsgCreatePermanentLockedAccount = { }, toAmino(message: MsgCreatePermanentLockedAccount): MsgCreatePermanentLockedAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -573,13 +573,13 @@ export const MsgCreatePeriodicVestingAccount = { }, 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; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos/vesting/v1beta1/vesting.ts b/__fixtures__/v-next/outputsign/cosmos/vesting/v1beta1/vesting.ts index dfbc9aeb6b..bfbde8facc 100644 --- a/__fixtures__/v-next/outputsign/cosmos/vesting/v1beta1/vesting.ts +++ b/__fixtures__/v-next/outputsign/cosmos/vesting/v1beta1/vesting.ts @@ -294,19 +294,19 @@ export const BaseVestingAccount = { if (message.originalVesting) { obj.original_vesting = message.originalVesting.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.original_vesting = []; + obj.original_vesting = message.originalVesting; } if (message.delegatedFree) { obj.delegated_free = message.delegatedFree.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.delegated_free = []; + obj.delegated_free = message.delegatedFree; } if (message.delegatedVesting) { obj.delegated_vesting = message.delegatedVesting.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.delegated_vesting = []; + obj.delegated_vesting = message.delegatedVesting; } - obj.end_time = message.endTime ? message.endTime.toString() : undefined; + obj.end_time = message.endTime !== BigInt(0) ? message.endTime.toString() : undefined; return obj; }, fromAminoMsg(object: BaseVestingAccountAminoMsg): BaseVestingAccount { @@ -391,7 +391,7 @@ export const ContinuousVestingAccount = { 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; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; return obj; }, fromAminoMsg(object: ContinuousVestingAccountAminoMsg): ContinuousVestingAccount { @@ -542,11 +542,11 @@ export const Period = { }, toAmino(message: Period): PeriodAmino { const obj: any = {}; - obj.length = message.length ? message.length.toString() : undefined; + obj.length = message.length !== BigInt(0) ? message.length.toString() : undefined; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -641,11 +641,11 @@ export const PeriodicVestingAccount = { 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; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmos_proto/cosmos.ts b/__fixtures__/v-next/outputsign/cosmos_proto/cosmos.ts index c09690ff0b..0d87beca01 100644 --- a/__fixtures__/v-next/outputsign/cosmos_proto/cosmos.ts +++ b/__fixtures__/v-next/outputsign/cosmos_proto/cosmos.ts @@ -230,8 +230,8 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: InterfaceDescriptorAminoMsg): InterfaceDescriptor { @@ -318,17 +318,17 @@ export const ScalarDescriptor = { if (object.description !== undefined && object.description !== null) { message.description = object.description; } - message.fieldType = object.field_type?.map(e => scalarTypeFromJSON(e)) || []; + message.fieldType = object.field_type?.map(e => e) || []; return message; }, toAmino(message: ScalarDescriptor): ScalarDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; if (message.fieldType) { obj.field_type = message.fieldType.map(e => e); } else { - obj.field_type = []; + obj.field_type = message.fieldType; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/genesis.ts b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/genesis.ts index 850be8ea5d..a956a920f9 100644 --- a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/genesis.ts @@ -236,22 +236,22 @@ export const GenesisState = { if (message.codes) { obj.codes = message.codes.map(e => e ? Code.toAmino(e) : undefined); } else { - obj.codes = []; + obj.codes = message.codes; } if (message.contracts) { obj.contracts = message.contracts.map(e => e ? Contract.toAmino(e) : undefined); } else { - obj.contracts = []; + obj.contracts = message.contracts; } if (message.sequences) { obj.sequences = message.sequences.map(e => e ? Sequence.toAmino(e) : undefined); } else { - obj.sequences = []; + obj.sequences = message.sequences; } if (message.genMsgs) { obj.gen_msgs = message.genMsgs.map(e => e ? GenesisState_GenMsgs.toAmino(e) : undefined); } else { - obj.gen_msgs = []; + obj.gen_msgs = message.genMsgs; } return obj; }, @@ -457,10 +457,10 @@ export const Code = { }, toAmino(message: Code): CodeAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.code_info = message.codeInfo ? CodeInfo.toAmino(message.codeInfo) : undefined; obj.code_bytes = message.codeBytes ? base64FromBytes(message.codeBytes) : undefined; - obj.pinned = message.pinned; + obj.pinned = message.pinned === false ? undefined : message.pinned; return obj; }, fromAminoMsg(object: CodeAminoMsg): Code { @@ -551,12 +551,12 @@ export const Contract = { }, toAmino(message: Contract): ContractAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : 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 = []; + obj.contract_state = message.contractState; } return obj; }, @@ -640,7 +640,7 @@ export const Sequence = { toAmino(message: Sequence): SequenceAmino { const obj: any = {}; obj.id_key = message.idKey ? base64FromBytes(message.idKey) : undefined; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: SequenceAminoMsg): Sequence { diff --git a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/ibc.ts b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/ibc.ts index 8fd667e0bd..1c72b3b41a 100644 --- a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/ibc.ts +++ b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/ibc.ts @@ -157,9 +157,9 @@ export const MsgIBCSend = { }, 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.channel = message.channel === "" ? undefined : message.channel; + obj.timeout_height = message.timeoutHeight !== BigInt(0) ? message.timeoutHeight.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -229,7 +229,7 @@ export const MsgIBCCloseChannel = { }, toAmino(message: MsgIBCCloseChannel): MsgIBCCloseChannelAmino { const obj: any = {}; - obj.channel = message.channel; + obj.channel = message.channel === "" ? undefined : message.channel; return obj; }, fromAminoMsg(object: MsgIBCCloseChannelAminoMsg): MsgIBCCloseChannel { diff --git a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/proposal.ts b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/proposal.ts index e569fb952f..65219cb28f 100644 --- a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/proposal.ts +++ b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/proposal.ts @@ -497,9 +497,9 @@ export const StoreCodeProposal = { }, toAmino(message: StoreCodeProposal): StoreCodeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.run_as = message.runAs; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; return obj; @@ -647,17 +647,17 @@ export const InstantiateContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -773,10 +773,10 @@ export const MigrateContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -879,9 +879,9 @@ export const SudoContractProposal = { }, toAmino(message: SudoContractProposal): SudoContractProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1004,15 +1004,15 @@ export const ExecuteContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; + obj.contract = message.contract === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -1115,10 +1115,10 @@ export const UpdateAdminProposal = { }, toAmino(message: UpdateAdminProposal): UpdateAdminProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.new_admin = message.newAdmin; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: UpdateAdminProposalAminoMsg): UpdateAdminProposal { @@ -1209,9 +1209,9 @@ export const ClearAdminProposal = { }, toAmino(message: ClearAdminProposal): ClearAdminProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: ClearAdminProposalAminoMsg): ClearAdminProposal { @@ -1309,12 +1309,12 @@ export const PinCodesProposal = { }, toAmino(message: PinCodesProposal): PinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, @@ -1413,12 +1413,12 @@ export const UnpinCodesProposal = { }, toAmino(message: UnpinCodesProposal): UnpinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/query.ts index 2bf31dd821..15cbc1a709 100644 --- a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/query.ts @@ -451,7 +451,7 @@ export interface CodeInfoResponseProtoMsg { } /** CodeInfoResponse contains code meta data from CodeInfo */ export interface CodeInfoResponseAmino { - code_id?: string; + code_id: string; creator?: string; data_hash?: string; } @@ -477,7 +477,7 @@ export interface QueryCodeResponseProtoMsg { /** QueryCodeResponse is the response type for the Query/Code RPC method */ export interface QueryCodeResponseAmino { code_info?: CodeInfoResponseAmino; - data?: string; + data: string; } export interface QueryCodeResponseAminoMsg { type: "wasm/QueryCodeResponse"; @@ -644,7 +644,7 @@ export const QueryContractInfoRequest = { }, toAmino(message: QueryContractInfoRequest): QueryContractInfoRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryContractInfoRequestAminoMsg): QueryContractInfoRequest { @@ -726,7 +726,7 @@ export const QueryContractInfoResponse = { }, toAmino(message: QueryContractInfoResponse): QueryContractInfoResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.contract_info = message.contractInfo ? ContractInfo.toAmino(message.contractInfo) : undefined; return obj; }, @@ -809,7 +809,7 @@ export const QueryContractHistoryRequest = { }, toAmino(message: QueryContractHistoryRequest): QueryContractHistoryRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -893,7 +893,7 @@ export const QueryContractHistoryResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? ContractCodeHistoryEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -979,7 +979,7 @@ export const QueryContractsByCodeRequest = { }, toAmino(message: QueryContractsByCodeRequest): QueryContractsByCodeRequestAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1063,7 +1063,7 @@ export const QueryContractsByCodeResponse = { if (message.contracts) { obj.contracts = message.contracts.map(e => e); } else { - obj.contracts = []; + obj.contracts = message.contracts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1147,7 +1147,7 @@ export const QueryAllContractStateRequest = { }, toAmino(message: QueryAllContractStateRequest): QueryAllContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1231,7 +1231,7 @@ export const QueryAllContractStateResponse = { if (message.models) { obj.models = message.models.map(e => e ? Model.toAmino(e) : undefined); } else { - obj.models = []; + obj.models = message.models; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1313,7 +1313,7 @@ export const QueryRawContractStateRequest = { }, toAmino(message: QueryRawContractStateRequest): QueryRawContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? base64FromBytes(message.queryData) : undefined; return obj; }, @@ -1463,7 +1463,7 @@ export const QuerySmartContractStateRequest = { }, toAmino(message: QuerySmartContractStateRequest): QuerySmartContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? JSON.parse(fromUtf8(message.queryData)) : undefined; return obj; }, @@ -1604,7 +1604,7 @@ export const QueryCodeRequest = { }, toAmino(message: QueryCodeRequest): QueryCodeRequestAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCodeRequestAminoMsg): QueryCodeRequest { @@ -1697,8 +1697,8 @@ export const CodeInfoResponse = { }, toAmino(message: CodeInfoResponse): CodeInfoResponseAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; - obj.creator = message.creator; + obj.code_id = message.codeId ? message.codeId.toString() : "0"; + obj.creator = message.creator === "" ? undefined : message.creator; obj.data_hash = message.dataHash ? base64FromBytes(message.dataHash) : undefined; return obj; }, @@ -1782,7 +1782,7 @@ export const QueryCodeResponse = { toAmino(message: QueryCodeResponse): QueryCodeResponseAmino { const obj: any = {}; obj.code_info = message.codeInfo ? CodeInfoResponse.toAmino(message.codeInfo) : undefined; - obj.data = message.data ? base64FromBytes(message.data) : undefined; + obj.data = message.data ? base64FromBytes(message.data) : ""; return obj; }, fromAminoMsg(object: QueryCodeResponseAminoMsg): QueryCodeResponse { @@ -1936,7 +1936,7 @@ export const QueryCodesResponse = { if (message.codeInfos) { obj.code_infos = message.codeInfos.map(e => e ? CodeInfoResponse.toAmino(e) : undefined); } else { - obj.code_infos = []; + obj.code_infos = message.codeInfos; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2101,7 +2101,7 @@ export const QueryPinnedCodesResponse = { if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/tx.ts b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/tx.ts index e740a11520..fae9221080 100644 --- a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/tx.ts +++ b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/tx.ts @@ -426,7 +426,7 @@ export const MsgStoreCode = { }, toAmino(message: MsgStoreCode): MsgStoreCodeAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; return obj; @@ -499,7 +499,7 @@ export const MsgStoreCodeResponse = { }, toAmino(message: MsgStoreCodeResponse): MsgStoreCodeResponseAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgStoreCodeResponseAminoMsg): MsgStoreCodeResponse { @@ -623,15 +623,15 @@ export const MsgInstantiateContract = { }, 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.sender = message.sender === "" ? undefined : message.sender; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -712,7 +712,7 @@ export const MsgInstantiateContractResponse = { }, toAmino(message: MsgInstantiateContractResponse): MsgInstantiateContractResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -813,13 +813,13 @@ export const MsgExecuteContract = { }, toAmino(message: MsgExecuteContract): MsgExecuteContractAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -993,9 +993,9 @@ export const MsgMigrateContract = { }, 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.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1156,9 +1156,9 @@ export const MsgUpdateAdmin = { }, toAmino(message: MsgUpdateAdmin): MsgUpdateAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.new_admin = message.newAdmin; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: MsgUpdateAdminAminoMsg): MsgUpdateAdmin { @@ -1294,8 +1294,8 @@ export const MsgClearAdmin = { }, toAmino(message: MsgClearAdmin): MsgClearAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: MsgClearAdminAminoMsg): MsgClearAdmin { diff --git a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/types.ts b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/types.ts index 5fa82913d7..4ee9845466 100644 --- a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/types.ts +++ b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/types.ts @@ -406,13 +406,13 @@ export const AccessTypeParam = { fromAmino(object: AccessTypeParamAmino): AccessTypeParam { const message = createBaseAccessTypeParam(); if (object.value !== undefined && object.value !== null) { - message.value = accessTypeFromJSON(object.value); + message.value = object.value; } return message; }, toAmino(message: AccessTypeParam): AccessTypeParamAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: AccessTypeParamAminoMsg): AccessTypeParam { @@ -483,7 +483,7 @@ export const AccessConfig = { fromAmino(object: AccessConfigAmino): AccessConfig { const message = createBaseAccessConfig(); if (object.permission !== undefined && object.permission !== null) { - message.permission = accessTypeFromJSON(object.permission); + message.permission = object.permission; } if (object.address !== undefined && object.address !== null) { message.address = object.address; @@ -492,8 +492,8 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.permission = message.permission; - obj.address = message.address; + obj.permission = message.permission === 0 ? undefined : message.permission; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -579,7 +579,7 @@ export const Params = { message.codeUploadAccess = AccessConfig.fromAmino(object.code_upload_access); } if (object.instantiate_default_permission !== undefined && object.instantiate_default_permission !== null) { - message.instantiateDefaultPermission = accessTypeFromJSON(object.instantiate_default_permission); + message.instantiateDefaultPermission = object.instantiate_default_permission; } if (object.max_wasm_code_size !== undefined && object.max_wasm_code_size !== null) { message.maxWasmCodeSize = BigInt(object.max_wasm_code_size); @@ -589,8 +589,8 @@ export const Params = { 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; + obj.instantiate_default_permission = message.instantiateDefaultPermission === 0 ? undefined : message.instantiateDefaultPermission; + obj.max_wasm_code_size = message.maxWasmCodeSize !== BigInt(0) ? message.maxWasmCodeSize.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -684,7 +684,7 @@ export const CodeInfo = { toAmino(message: CodeInfo): CodeInfoAmino { const obj: any = {}; obj.code_hash = message.codeHash ? base64FromBytes(message.codeHash) : undefined; - obj.creator = message.creator; + obj.creator = message.creator === "" ? undefined : message.creator; obj.instantiate_config = message.instantiateConfig ? AccessConfig.toAmino(message.instantiateConfig) : undefined; return obj; }, @@ -826,12 +826,12 @@ export const ContractInfo = { }, 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.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.creator = message.creator === "" ? undefined : message.creator; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.label = message.label === "" ? undefined : message.label; obj.created = message.created ? AbsoluteTxPosition.toAmino(message.created) : undefined; - obj.ibc_port_id = message.ibcPortId; + obj.ibc_port_id = message.ibcPortId === "" ? undefined : message.ibcPortId; obj.extension = message.extension ? Any.toAmino(message.extension) : undefined; return obj; }, @@ -923,7 +923,7 @@ export const ContractCodeHistoryEntry = { fromAmino(object: ContractCodeHistoryEntryAmino): ContractCodeHistoryEntry { const message = createBaseContractCodeHistoryEntry(); if (object.operation !== undefined && object.operation !== null) { - message.operation = contractCodeHistoryOperationTypeFromJSON(object.operation); + message.operation = object.operation; } if (object.code_id !== undefined && object.code_id !== null) { message.codeId = BigInt(object.code_id); @@ -938,8 +938,8 @@ export const ContractCodeHistoryEntry = { }, toAmino(message: ContractCodeHistoryEntry): ContractCodeHistoryEntryAmino { const obj: any = {}; - obj.operation = message.operation; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.operation = message.operation === 0 ? undefined : message.operation; + obj.code_id = message.codeId !== BigInt(0) ? 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; @@ -1025,8 +1025,8 @@ export const AbsoluteTxPosition = { }, 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; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; + obj.tx_index = message.txIndex !== BigInt(0) ? message.txIndex.toString() : undefined; return obj; }, fromAminoMsg(object: AbsoluteTxPositionAminoMsg): AbsoluteTxPosition { diff --git a/__fixtures__/v-next/outputsign/evmos/claims/v1/claims.ts b/__fixtures__/v-next/outputsign/evmos/claims/v1/claims.ts index 501a9b5142..9b81e92a5c 100644 --- a/__fixtures__/v-next/outputsign/evmos/claims/v1/claims.ts +++ b/__fixtures__/v-next/outputsign/evmos/claims/v1/claims.ts @@ -220,7 +220,7 @@ export const Claim = { fromAmino(object: ClaimAmino): Claim { const message = createBaseClaim(); if (object.action !== undefined && object.action !== null) { - message.action = actionFromJSON(object.action); + message.action = object.action; } if (object.completed !== undefined && object.completed !== null) { message.completed = object.completed; @@ -232,9 +232,9 @@ export const Claim = { }, toAmino(message: Claim): ClaimAmino { const obj: any = {}; - obj.action = message.action; - obj.completed = message.completed; - obj.claimable_amount = message.claimableAmount; + obj.action = message.action === 0 ? undefined : message.action; + obj.completed = message.completed === false ? undefined : message.completed; + obj.claimable_amount = message.claimableAmount === "" ? undefined : message.claimableAmount; return obj; }, fromAminoMsg(object: ClaimAminoMsg): Claim { @@ -326,12 +326,12 @@ export const ClaimsRecordAddress = { }, toAmino(message: ClaimsRecordAddress): ClaimsRecordAddressAmino { const obj: any = {}; - obj.address = message.address; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.address = message.address === "" ? undefined : message.address; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.actionsCompleted) { obj.actions_completed = message.actionsCompleted.map(e => e); } else { - obj.actions_completed = []; + obj.actions_completed = message.actionsCompleted; } return obj; }, @@ -413,11 +413,11 @@ export const ClaimsRecord = { }, toAmino(message: ClaimsRecord): ClaimsRecordAmino { const obj: any = {}; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.actionsCompleted) { obj.actions_completed = message.actionsCompleted.map(e => e); } else { - obj.actions_completed = []; + obj.actions_completed = message.actionsCompleted; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/evmos/claims/v1/genesis.ts b/__fixtures__/v-next/outputsign/evmos/claims/v1/genesis.ts index e3333b84ac..ef5f59817b 100644 --- a/__fixtures__/v-next/outputsign/evmos/claims/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/evmos/claims/v1/genesis.ts @@ -148,7 +148,7 @@ export const GenesisState = { if (message.claimsRecords) { obj.claims_records = message.claimsRecords.map(e => e ? ClaimsRecordAddress.toAmino(e) : undefined); } else { - obj.claims_records = []; + obj.claims_records = message.claimsRecords; } return obj; }, @@ -278,20 +278,20 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_claims = message.enableClaims; + obj.enable_claims = message.enableClaims === false ? undefined : message.enableClaims; obj.airdrop_start_time = message.airdropStartTime ? Timestamp.toAmino(toTimestamp(message.airdropStartTime)) : undefined; 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; + obj.claims_denom = message.claimsDenom === "" ? undefined : message.claimsDenom; if (message.authorizedChannels) { obj.authorized_channels = message.authorizedChannels.map(e => e); } else { - obj.authorized_channels = []; + obj.authorized_channels = message.authorizedChannels; } if (message.evmChannels) { obj.evm_channels = message.evmChannels.map(e => e); } else { - obj.evm_channels = []; + obj.evm_channels = message.evmChannels; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/evmos/claims/v1/query.ts b/__fixtures__/v-next/outputsign/evmos/claims/v1/query.ts index 1f5dc63143..e3ebbda5d2 100644 --- a/__fixtures__/v-next/outputsign/evmos/claims/v1/query.ts +++ b/__fixtures__/v-next/outputsign/evmos/claims/v1/query.ts @@ -324,7 +324,7 @@ export const QueryTotalUnclaimedResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -582,7 +582,7 @@ export const QueryClaimsRecordsResponse = { if (message.claims) { obj.claims = message.claims.map(e => e ? ClaimsRecordAddress.toAmino(e) : undefined); } else { - obj.claims = []; + obj.claims = message.claims; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -647,7 +647,7 @@ export const QueryClaimsRecordRequest = { }, toAmino(message: QueryClaimsRecordRequest): QueryClaimsRecordRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryClaimsRecordRequestAminoMsg): QueryClaimsRecordRequest { @@ -719,11 +719,11 @@ export const QueryClaimsRecordResponse = { }, toAmino(message: QueryClaimsRecordResponse): QueryClaimsRecordResponseAmino { const obj: any = {}; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.claims) { obj.claims = message.claims.map(e => e ? Claim.toAmino(e) : undefined); } else { - obj.claims = []; + obj.claims = message.claims; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/evmos/epochs/v1/genesis.ts b/__fixtures__/v-next/outputsign/evmos/epochs/v1/genesis.ts index a4c923a5a6..6226eaf525 100644 --- a/__fixtures__/v-next/outputsign/evmos/epochs/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/evmos/epochs/v1/genesis.ts @@ -174,13 +174,13 @@ export const EpochInfo = { }, toAmino(message: EpochInfo): EpochInfoAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; obj.current_epoch_start_time = message.currentEpochStartTime ? Timestamp.toAmino(toTimestamp(message.currentEpochStartTime)) : undefined; - obj.epoch_counting_started = message.epochCountingStarted; - obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + obj.epoch_counting_started = message.epochCountingStarted === false ? undefined : message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight !== BigInt(0) ? message.currentEpochStartHeight.toString() : undefined; return obj; }, fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo { @@ -244,7 +244,7 @@ export const GenesisState = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/evmos/epochs/v1/query.ts b/__fixtures__/v-next/outputsign/evmos/epochs/v1/query.ts index a340c3e4d4..a072466cea 100644 --- a/__fixtures__/v-next/outputsign/evmos/epochs/v1/query.ts +++ b/__fixtures__/v-next/outputsign/evmos/epochs/v1/query.ts @@ -197,7 +197,7 @@ export const QueryEpochsInfoResponse = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -262,7 +262,7 @@ export const QueryCurrentEpochRequest = { }, toAmino(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; return obj; }, fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest { @@ -327,7 +327,7 @@ export const QueryCurrentEpochResponse = { }, toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { const obj: any = {}; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse { diff --git a/__fixtures__/v-next/outputsign/evmos/erc20/v1/erc20.ts b/__fixtures__/v-next/outputsign/evmos/erc20/v1/erc20.ts index ac76fb35bc..295521f9c9 100644 --- a/__fixtures__/v-next/outputsign/evmos/erc20/v1/erc20.ts +++ b/__fixtures__/v-next/outputsign/evmos/erc20/v1/erc20.ts @@ -290,16 +290,16 @@ export const TokenPair = { message.enabled = object.enabled; } if (object.contract_owner !== undefined && object.contract_owner !== null) { - message.contractOwner = ownerFromJSON(object.contract_owner); + message.contractOwner = object.contract_owner; } return message; }, 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; + obj.erc20_address = message.erc20Address === "" ? undefined : message.erc20Address; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.enabled = message.enabled === false ? undefined : message.enabled; + obj.contract_owner = message.contractOwner === 0 ? undefined : message.contractOwner; return obj; }, fromAminoMsg(object: TokenPairAminoMsg): TokenPair { @@ -386,8 +386,8 @@ export const RegisterCoinProposal = { }, toAmino(message: RegisterCoinProposal): RegisterCoinProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; }, @@ -473,9 +473,9 @@ export const RegisterERC20Proposal = { }, toAmino(message: RegisterERC20Proposal): RegisterERC20ProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.erc20address = message.erc20address; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.erc20address = message.erc20address === "" ? undefined : message.erc20address; return obj; }, fromAminoMsg(object: RegisterERC20ProposalAminoMsg): RegisterERC20Proposal { @@ -560,9 +560,9 @@ export const ToggleTokenConversionProposal = { }, toAmino(message: ToggleTokenConversionProposal): ToggleTokenConversionProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.token = message.token; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.token = message.token === "" ? undefined : message.token; return obj; }, fromAminoMsg(object: ToggleTokenConversionProposalAminoMsg): ToggleTokenConversionProposal { diff --git a/__fixtures__/v-next/outputsign/evmos/erc20/v1/genesis.ts b/__fixtures__/v-next/outputsign/evmos/erc20/v1/genesis.ts index 962673d34e..f79d65d01e 100644 --- a/__fixtures__/v-next/outputsign/evmos/erc20/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/evmos/erc20/v1/genesis.ts @@ -123,7 +123,7 @@ export const GenesisState = { if (message.tokenPairs) { obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e) : undefined); } else { - obj.token_pairs = []; + obj.token_pairs = message.tokenPairs; } return obj; }, @@ -198,8 +198,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_erc20 = message.enableErc20; - obj.enable_evm_hook = message.enableEvmHook; + obj.enable_erc20 = message.enableErc20 === false ? undefined : message.enableErc20; + obj.enable_evm_hook = message.enableEvmHook === false ? undefined : message.enableEvmHook; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/evmos/erc20/v1/query.ts b/__fixtures__/v-next/outputsign/evmos/erc20/v1/query.ts index ecc6979cae..f8e49f95c1 100644 --- a/__fixtures__/v-next/outputsign/evmos/erc20/v1/query.ts +++ b/__fixtures__/v-next/outputsign/evmos/erc20/v1/query.ts @@ -292,7 +292,7 @@ export const QueryTokenPairsResponse = { if (message.tokenPairs) { obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e) : undefined); } else { - obj.token_pairs = []; + obj.token_pairs = message.tokenPairs; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -357,7 +357,7 @@ export const QueryTokenPairRequest = { }, toAmino(message: QueryTokenPairRequest): QueryTokenPairRequestAmino { const obj: any = {}; - obj.token = message.token; + obj.token = message.token === "" ? undefined : message.token; return obj; }, fromAminoMsg(object: QueryTokenPairRequestAminoMsg): QueryTokenPairRequest { diff --git a/__fixtures__/v-next/outputsign/evmos/erc20/v1/tx.ts b/__fixtures__/v-next/outputsign/evmos/erc20/v1/tx.ts index ca4928d8c8..73e4705d19 100644 --- a/__fixtures__/v-next/outputsign/evmos/erc20/v1/tx.ts +++ b/__fixtures__/v-next/outputsign/evmos/erc20/v1/tx.ts @@ -183,8 +183,8 @@ export const MsgConvertCoin = { toAmino(message: MsgConvertCoin): MsgConvertCoinAmino { const obj: any = {}; obj.coin = message.coin ? Coin.toAmino(message.coin) : undefined; - obj.receiver = message.receiver; - obj.sender = message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgConvertCoinAminoMsg): MsgConvertCoin { @@ -330,10 +330,10 @@ export const MsgConvertERC20 = { }, toAmino(message: MsgConvertERC20): MsgConvertERC20Amino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.amount = message.amount; - obj.receiver = message.receiver; - obj.sender = message.sender; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.receiver = message.receiver === "" ? undefined : message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgConvertERC20AminoMsg): MsgConvertERC20 { diff --git a/__fixtures__/v-next/outputsign/evmos/fees/v1/fees.ts b/__fixtures__/v-next/outputsign/evmos/fees/v1/fees.ts index 828fac2e37..7ac6ed471c 100644 --- a/__fixtures__/v-next/outputsign/evmos/fees/v1/fees.ts +++ b/__fixtures__/v-next/outputsign/evmos/fees/v1/fees.ts @@ -114,9 +114,9 @@ export const DevFeeInfo = { }, toAmino(message: DevFeeInfo): DevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: DevFeeInfoAminoMsg): DevFeeInfo { diff --git a/__fixtures__/v-next/outputsign/evmos/fees/v1/genesis.ts b/__fixtures__/v-next/outputsign/evmos/fees/v1/genesis.ts index 99b1de5117..1009adaef3 100644 --- a/__fixtures__/v-next/outputsign/evmos/fees/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/evmos/fees/v1/genesis.ts @@ -149,7 +149,7 @@ export const GenesisState = { if (message.devFeeInfos) { obj.dev_fee_infos = message.devFeeInfos.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.dev_fee_infos = []; + obj.dev_fee_infos = message.devFeeInfos; } return obj; }, @@ -259,11 +259,11 @@ export const Params = { }, 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; + obj.enable_fees = message.enableFees === false ? undefined : message.enableFees; + obj.developer_shares = message.developerShares === "" ? undefined : message.developerShares; + obj.validator_shares = message.validatorShares === "" ? undefined : message.validatorShares; + obj.addr_derivation_cost_create = message.addrDerivationCostCreate !== BigInt(0) ? message.addrDerivationCostCreate.toString() : undefined; + obj.min_gas_price = message.minGasPrice === "" ? undefined : message.minGasPrice; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/evmos/fees/v1/query.ts b/__fixtures__/v-next/outputsign/evmos/fees/v1/query.ts index 948f895f3a..f910214b43 100644 --- a/__fixtures__/v-next/outputsign/evmos/fees/v1/query.ts +++ b/__fixtures__/v-next/outputsign/evmos/fees/v1/query.ts @@ -365,7 +365,7 @@ export const QueryDevFeeInfosResponse = { if (message.fees) { obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.fees = []; + obj.fees = message.fees; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -430,7 +430,7 @@ export const QueryDevFeeInfoRequest = { }, toAmino(message: QueryDevFeeInfoRequest): QueryDevFeeInfoRequestAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; return obj; }, fromAminoMsg(object: QueryDevFeeInfoRequestAminoMsg): QueryDevFeeInfoRequest { @@ -686,7 +686,7 @@ export const QueryDevFeeInfosPerDeployerRequest = { }, toAmino(message: QueryDevFeeInfosPerDeployerRequest): QueryDevFeeInfosPerDeployerRequestAmino { const obj: any = {}; - obj.deployer_address = message.deployerAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -764,7 +764,7 @@ export const QueryDevFeeInfosPerDeployerResponse = { if (message.fees) { obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.fees = []; + obj.fees = message.fees; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/evmos/fees/v1/tx.ts b/__fixtures__/v-next/outputsign/evmos/fees/v1/tx.ts index e040231e90..54d5687f30 100644 --- a/__fixtures__/v-next/outputsign/evmos/fees/v1/tx.ts +++ b/__fixtures__/v-next/outputsign/evmos/fees/v1/tx.ts @@ -264,13 +264,13 @@ export const MsgRegisterDevFeeInfo = { }, toAmino(message: MsgRegisterDevFeeInfo): MsgRegisterDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; if (message.nonces) { obj.nonces = message.nonces.map(e => e.toString()); } else { - obj.nonces = []; + obj.nonces = message.nonces; } return obj; }, @@ -395,8 +395,8 @@ export const MsgCancelDevFeeInfo = { }, toAmino(message: MsgCancelDevFeeInfo): MsgCancelDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; return obj; }, fromAminoMsg(object: MsgCancelDevFeeInfoAminoMsg): MsgCancelDevFeeInfo { @@ -531,9 +531,9 @@ export const MsgUpdateDevFeeInfo = { }, toAmino(message: MsgUpdateDevFeeInfo): MsgUpdateDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: MsgUpdateDevFeeInfoAminoMsg): MsgUpdateDevFeeInfo { diff --git a/__fixtures__/v-next/outputsign/evmos/incentives/v1/genesis.ts b/__fixtures__/v-next/outputsign/evmos/incentives/v1/genesis.ts index 255bf453a7..5497b9e665 100644 --- a/__fixtures__/v-next/outputsign/evmos/incentives/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/evmos/incentives/v1/genesis.ts @@ -140,12 +140,12 @@ export const GenesisState = { if (message.incentives) { obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e) : undefined); } else { - obj.incentives = []; + obj.incentives = message.incentives; } if (message.gasMeters) { obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e) : undefined); } else { - obj.gas_meters = []; + obj.gas_meters = message.gasMeters; } return obj; }, @@ -242,10 +242,10 @@ export const Params = { }, 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; + obj.enable_incentives = message.enableIncentives === false ? undefined : message.enableIncentives; + obj.allocation_limit = message.allocationLimit === "" ? undefined : message.allocationLimit; + obj.incentives_epoch_identifier = message.incentivesEpochIdentifier === "" ? undefined : message.incentivesEpochIdentifier; + obj.reward_scaler = message.rewardScaler === "" ? undefined : message.rewardScaler; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/evmos/incentives/v1/incentives.ts b/__fixtures__/v-next/outputsign/evmos/incentives/v1/incentives.ts index aa0d890ba3..413df93d10 100644 --- a/__fixtures__/v-next/outputsign/evmos/incentives/v1/incentives.ts +++ b/__fixtures__/v-next/outputsign/evmos/incentives/v1/incentives.ts @@ -248,15 +248,15 @@ export const Incentive = { }, toAmino(message: Incentive): IncentiveAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; if (message.allocations) { obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } - obj.epochs = message.epochs; + obj.epochs = message.epochs === 0 ? undefined : message.epochs; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.total_gas = message.totalGas ? message.totalGas.toString() : undefined; + obj.total_gas = message.totalGas !== BigInt(0) ? message.totalGas.toString() : undefined; return obj; }, fromAminoMsg(object: IncentiveAminoMsg): Incentive { @@ -343,9 +343,9 @@ export const GasMeter = { }, toAmino(message: GasMeter): GasMeterAmino { const obj: any = {}; - obj.contract = message.contract; - obj.participant = message.participant; - obj.cumulative_gas = message.cumulativeGas ? message.cumulativeGas.toString() : undefined; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.participant = message.participant === "" ? undefined : message.participant; + obj.cumulative_gas = message.cumulativeGas !== BigInt(0) ? message.cumulativeGas.toString() : undefined; return obj; }, fromAminoMsg(object: GasMeterAminoMsg): GasMeter { @@ -450,15 +450,15 @@ export const RegisterIncentiveProposal = { }, toAmino(message: RegisterIncentiveProposal): RegisterIncentiveProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; if (message.allocations) { obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } - obj.epochs = message.epochs; + obj.epochs = message.epochs === 0 ? undefined : message.epochs; return obj; }, fromAminoMsg(object: RegisterIncentiveProposalAminoMsg): RegisterIncentiveProposal { @@ -543,9 +543,9 @@ export const CancelIncentiveProposal = { }, toAmino(message: CancelIncentiveProposal): CancelIncentiveProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: CancelIncentiveProposalAminoMsg): CancelIncentiveProposal { diff --git a/__fixtures__/v-next/outputsign/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputsign/evmos/incentives/v1/query.ts index 8793ec0a76..094855e1e0 100644 --- a/__fixtures__/v-next/outputsign/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputsign/evmos/incentives/v1/query.ts @@ -546,7 +546,7 @@ export const QueryIncentivesResponse = { if (message.incentives) { obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e) : undefined); } else { - obj.incentives = []; + obj.incentives = message.incentives; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -611,7 +611,7 @@ export const QueryIncentiveRequest = { }, toAmino(message: QueryIncentiveRequest): QueryIncentiveRequestAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: QueryIncentiveRequestAminoMsg): QueryIncentiveRequest { @@ -752,7 +752,7 @@ export const QueryGasMetersRequest = { }, toAmino(message: QueryGasMetersRequest): QueryGasMetersRequestAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -830,7 +830,7 @@ export const QueryGasMetersResponse = { if (message.gasMeters) { obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e) : undefined); } else { - obj.gas_meters = []; + obj.gas_meters = message.gasMeters; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -906,8 +906,8 @@ export const QueryGasMeterRequest = { }, toAmino(message: QueryGasMeterRequest): QueryGasMeterRequestAmino { const obj: any = {}; - obj.contract = message.contract; - obj.participant = message.participant; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.participant = message.participant === "" ? undefined : message.participant; return obj; }, fromAminoMsg(object: QueryGasMeterRequestAminoMsg): QueryGasMeterRequest { @@ -972,7 +972,7 @@ export const QueryGasMeterResponse = { }, toAmino(message: QueryGasMeterResponse): QueryGasMeterResponseAmino { const obj: any = {}; - obj.gas_meter = message.gasMeter ? message.gasMeter.toString() : undefined; + obj.gas_meter = message.gasMeter !== BigInt(0) ? message.gasMeter.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGasMeterResponseAminoMsg): QueryGasMeterResponse { @@ -1114,7 +1114,7 @@ export const QueryAllocationMetersResponse = { if (message.allocationMeters) { obj.allocation_meters = message.allocationMeters.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocation_meters = []; + obj.allocation_meters = message.allocationMeters; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1179,7 +1179,7 @@ export const QueryAllocationMeterRequest = { }, toAmino(message: QueryAllocationMeterRequest): QueryAllocationMeterRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryAllocationMeterRequestAminoMsg): QueryAllocationMeterRequest { diff --git a/__fixtures__/v-next/outputsign/evmos/inflation/v1/genesis.ts b/__fixtures__/v-next/outputsign/evmos/inflation/v1/genesis.ts index 1ad94284c3..47e7ff5d6d 100644 --- a/__fixtures__/v-next/outputsign/evmos/inflation/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/evmos/inflation/v1/genesis.ts @@ -178,10 +178,10 @@ export const GenesisState = { 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; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; + obj.epoch_identifier = message.epochIdentifier === "" ? undefined : message.epochIdentifier; + obj.epochs_per_period = message.epochsPerPeriod !== BigInt(0) ? message.epochsPerPeriod.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs !== BigInt(0) ? message.skippedEpochs.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -281,10 +281,10 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.mint_denom = message.mintDenom; + obj.mint_denom = message.mintDenom === "" ? undefined : 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; + obj.enable_inflation = message.enableInflation === false ? undefined : message.enableInflation; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/evmos/inflation/v1/inflation.ts b/__fixtures__/v-next/outputsign/evmos/inflation/v1/inflation.ts index 77713df17f..06a48c2382 100644 --- a/__fixtures__/v-next/outputsign/evmos/inflation/v1/inflation.ts +++ b/__fixtures__/v-next/outputsign/evmos/inflation/v1/inflation.ts @@ -202,9 +202,9 @@ export const InflationDistribution = { }, toAmino(message: InflationDistribution): InflationDistributionAmino { const obj: any = {}; - obj.staking_rewards = message.stakingRewards; - obj.usage_incentives = message.usageIncentives; - obj.community_pool = message.communityPool; + obj.staking_rewards = message.stakingRewards === "" ? undefined : message.stakingRewards; + obj.usage_incentives = message.usageIncentives === "" ? undefined : message.usageIncentives; + obj.community_pool = message.communityPool === "" ? undefined : message.communityPool; return obj; }, fromAminoMsg(object: InflationDistributionAminoMsg): InflationDistribution { @@ -311,11 +311,11 @@ export const ExponentialCalculation = { }, 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; + obj.a = message.a === "" ? undefined : message.a; + obj.r = message.r === "" ? undefined : message.r; + obj.c = message.c === "" ? undefined : message.c; + obj.bonding_target = message.bondingTarget === "" ? undefined : message.bondingTarget; + obj.max_variance = message.maxVariance === "" ? undefined : message.maxVariance; return obj; }, fromAminoMsg(object: ExponentialCalculationAminoMsg): ExponentialCalculation { diff --git a/__fixtures__/v-next/outputsign/evmos/inflation/v1/query.ts b/__fixtures__/v-next/outputsign/evmos/inflation/v1/query.ts index 030d801a44..9fb79b60e4 100644 --- a/__fixtures__/v-next/outputsign/evmos/inflation/v1/query.ts +++ b/__fixtures__/v-next/outputsign/evmos/inflation/v1/query.ts @@ -388,7 +388,7 @@ export const QueryPeriodResponse = { }, toAmino(message: QueryPeriodResponse): QueryPeriodResponseAmino { const obj: any = {}; - obj.period = message.period ? message.period.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPeriodResponseAminoMsg): QueryPeriodResponse { @@ -618,7 +618,7 @@ export const QuerySkippedEpochsResponse = { }, toAmino(message: QuerySkippedEpochsResponse): QuerySkippedEpochsResponseAmino { const obj: any = {}; - obj.skipped_epochs = message.skippedEpochs ? message.skippedEpochs.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs !== BigInt(0) ? message.skippedEpochs.toString() : undefined; return obj; }, fromAminoMsg(object: QuerySkippedEpochsResponseAminoMsg): QuerySkippedEpochsResponse { @@ -846,7 +846,7 @@ export const QueryInflationRateResponse = { }, toAmino(message: QueryInflationRateResponse): QueryInflationRateResponseAmino { const obj: any = {}; - obj.inflation_rate = message.inflationRate; + obj.inflation_rate = message.inflationRate === "" ? undefined : message.inflationRate; return obj; }, fromAminoMsg(object: QueryInflationRateResponseAminoMsg): QueryInflationRateResponse { diff --git a/__fixtures__/v-next/outputsign/evmos/recovery/v1/genesis.ts b/__fixtures__/v-next/outputsign/evmos/recovery/v1/genesis.ts index 7426c3be6b..f2c63d4d02 100644 --- a/__fixtures__/v-next/outputsign/evmos/recovery/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/evmos/recovery/v1/genesis.ts @@ -173,7 +173,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_recovery = message.enableRecovery; + obj.enable_recovery = message.enableRecovery === false ? undefined : message.enableRecovery; obj.packet_timeout_duration = message.packetTimeoutDuration ? Duration.toAmino(message.packetTimeoutDuration) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/evmos/vesting/v1/query.ts b/__fixtures__/v-next/outputsign/evmos/vesting/v1/query.ts index c1168085d6..6b37d74561 100644 --- a/__fixtures__/v-next/outputsign/evmos/vesting/v1/query.ts +++ b/__fixtures__/v-next/outputsign/evmos/vesting/v1/query.ts @@ -109,7 +109,7 @@ export const QueryBalancesRequest = { }, toAmino(message: QueryBalancesRequest): QueryBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryBalancesRequestAminoMsg): QueryBalancesRequest { @@ -191,17 +191,17 @@ export const QueryBalancesResponse = { if (message.locked) { obj.locked = message.locked.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.locked = []; + obj.locked = message.locked; } if (message.unvested) { obj.unvested = message.unvested.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.unvested = []; + obj.unvested = message.unvested; } if (message.vested) { obj.vested = message.vested.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.vested = []; + obj.vested = message.vested; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/evmos/vesting/v1/tx.ts b/__fixtures__/v-next/outputsign/evmos/vesting/v1/tx.ts index 111770b181..ef5b73ee12 100644 --- a/__fixtures__/v-next/outputsign/evmos/vesting/v1/tx.ts +++ b/__fixtures__/v-next/outputsign/evmos/vesting/v1/tx.ts @@ -249,20 +249,20 @@ export const MsgCreateClawbackVestingAccount = { }, toAmino(message: MsgCreateClawbackVestingAccount): MsgCreateClawbackVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; if (message.lockupPeriods) { obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.lockup_periods = []; + obj.lockup_periods = message.lockupPeriods; } if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } - obj.merge = message.merge; + obj.merge = message.merge === false ? undefined : message.merge; return obj; }, fromAminoMsg(object: MsgCreateClawbackVestingAccountAminoMsg): MsgCreateClawbackVestingAccount { @@ -397,9 +397,9 @@ export const MsgClawback = { }, toAmino(message: MsgClawback): MsgClawbackAmino { const obj: any = {}; - obj.funder_address = message.funderAddress; - obj.account_address = message.accountAddress; - obj.dest_address = message.destAddress; + obj.funder_address = message.funderAddress === "" ? undefined : message.funderAddress; + obj.account_address = message.accountAddress === "" ? undefined : message.accountAddress; + obj.dest_address = message.destAddress === "" ? undefined : message.destAddress; return obj; }, fromAminoMsg(object: MsgClawbackAminoMsg): MsgClawback { diff --git a/__fixtures__/v-next/outputsign/evmos/vesting/v1/vesting.ts b/__fixtures__/v-next/outputsign/evmos/vesting/v1/vesting.ts index 2b9ec61fef..a3efaed7d9 100644 --- a/__fixtures__/v-next/outputsign/evmos/vesting/v1/vesting.ts +++ b/__fixtures__/v-next/outputsign/evmos/vesting/v1/vesting.ts @@ -153,17 +153,17 @@ export const ClawbackVestingAccount = { toAmino(message: ClawbackVestingAccount): ClawbackVestingAccountAmino { const obj: any = {}; obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined; - obj.funder_address = message.funderAddress; + obj.funder_address = message.funderAddress === "" ? undefined : message.funderAddress; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; if (message.lockupPeriods) { obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.lockup_periods = []; + obj.lockup_periods = message.lockupPeriods; } if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/auth.ts b/__fixtures__/v-next/outputsign/google/api/auth.ts index 530775d907..ed96874cc8 100644 --- a/__fixtures__/v-next/outputsign/google/api/auth.ts +++ b/__fixtures__/v-next/outputsign/google/api/auth.ts @@ -645,12 +645,12 @@ export const Authentication = { if (message.rules) { obj.rules = message.rules.map(e => e ? AuthenticationRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } if (message.providers) { obj.providers = message.providers.map(e => e ? AuthProvider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } return obj; }, @@ -747,13 +747,13 @@ export const AuthenticationRule = { }, toAmino(message: AuthenticationRule): AuthenticationRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.oauth = message.oauth ? OAuthRequirements.toAmino(message.oauth) : undefined; - obj.allow_without_credential = message.allowWithoutCredential; + obj.allow_without_credential = message.allowWithoutCredential === false ? undefined : message.allowWithoutCredential; if (message.requirements) { obj.requirements = message.requirements.map(e => e ? AuthRequirement.toAmino(e) : undefined); } else { - obj.requirements = []; + obj.requirements = message.requirements; } return obj; }, @@ -839,9 +839,9 @@ export const JwtLocation = { }, toAmino(message: JwtLocation): JwtLocationAmino { const obj: any = {}; - obj.header = message.header; - obj.query = message.query; - obj.value_prefix = message.valuePrefix; + obj.header = message.header === null ? undefined : message.header; + obj.query = message.query === null ? undefined : message.query; + obj.value_prefix = message.valuePrefix === "" ? undefined : message.valuePrefix; return obj; }, fromAminoMsg(object: JwtLocationAminoMsg): JwtLocation { @@ -957,15 +957,15 @@ export const AuthProvider = { }, 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; + obj.id = message.id === "" ? undefined : message.id; + obj.issuer = message.issuer === "" ? undefined : message.issuer; + obj.jwks_uri = message.jwksUri === "" ? undefined : message.jwksUri; + obj.audiences = message.audiences === "" ? undefined : message.audiences; + obj.authorization_url = message.authorizationUrl === "" ? undefined : message.authorizationUrl; if (message.jwtLocations) { obj.jwt_locations = message.jwtLocations.map(e => e ? JwtLocation.toAmino(e) : undefined); } else { - obj.jwt_locations = []; + obj.jwt_locations = message.jwtLocations; } return obj; }, @@ -1029,7 +1029,7 @@ export const OAuthRequirements = { }, toAmino(message: OAuthRequirements): OAuthRequirementsAmino { const obj: any = {}; - obj.canonical_scopes = message.canonicalScopes; + obj.canonical_scopes = message.canonicalScopes === "" ? undefined : message.canonicalScopes; return obj; }, fromAminoMsg(object: OAuthRequirementsAminoMsg): OAuthRequirements { @@ -1103,8 +1103,8 @@ export const AuthRequirement = { }, toAmino(message: AuthRequirement): AuthRequirementAmino { const obj: any = {}; - obj.provider_id = message.providerId; - obj.audiences = message.audiences; + obj.provider_id = message.providerId === "" ? undefined : message.providerId; + obj.audiences = message.audiences === "" ? undefined : message.audiences; return obj; }, fromAminoMsg(object: AuthRequirementAminoMsg): AuthRequirement { diff --git a/__fixtures__/v-next/outputsign/google/api/backend.ts b/__fixtures__/v-next/outputsign/google/api/backend.ts index ce3c7895c4..c9a25a242d 100644 --- a/__fixtures__/v-next/outputsign/google/api/backend.ts +++ b/__fixtures__/v-next/outputsign/google/api/backend.ts @@ -359,7 +359,7 @@ export const Backend = { if (message.rules) { obj.rules = message.rules.map(e => e ? BackendRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -496,7 +496,7 @@ export const BackendRule = { message.operationDeadline = object.operation_deadline; } if (object.path_translation !== undefined && object.path_translation !== null) { - message.pathTranslation = backendRule_PathTranslationFromJSON(object.path_translation); + message.pathTranslation = object.path_translation; } if (object.jwt_audience !== undefined && object.jwt_audience !== null) { message.jwtAudience = object.jwt_audience; @@ -511,15 +511,15 @@ export const BackendRule = { }, 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; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.address = message.address === "" ? undefined : message.address; + obj.deadline = message.deadline === 0 ? undefined : message.deadline; + obj.min_deadline = message.minDeadline === 0 ? undefined : message.minDeadline; + obj.operation_deadline = message.operationDeadline === 0 ? undefined : message.operationDeadline; + obj.path_translation = message.pathTranslation === 0 ? undefined : message.pathTranslation; + obj.jwt_audience = message.jwtAudience === null ? undefined : message.jwtAudience; + obj.disable_auth = message.disableAuth === null ? undefined : message.disableAuth; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: BackendRuleAminoMsg): BackendRule { diff --git a/__fixtures__/v-next/outputsign/google/api/billing.ts b/__fixtures__/v-next/outputsign/google/api/billing.ts index c11895b3c8..bb734746a0 100644 --- a/__fixtures__/v-next/outputsign/google/api/billing.ts +++ b/__fixtures__/v-next/outputsign/google/api/billing.ts @@ -225,7 +225,7 @@ export const Billing = { if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Billing_BillingDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -298,11 +298,11 @@ export const Billing_BillingDestination = { }, toAmino(message: Billing_BillingDestination): Billing_BillingDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.metrics) { obj.metrics = message.metrics.map(e => e); } else { - obj.metrics = []; + obj.metrics = message.metrics; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/config_change.ts b/__fixtures__/v-next/outputsign/google/api/config_change.ts index 04c6eb0992..a3a4f581c1 100644 --- a/__fixtures__/v-next/outputsign/google/api/config_change.ts +++ b/__fixtures__/v-next/outputsign/google/api/config_change.ts @@ -279,21 +279,21 @@ export const ConfigChange = { message.newValue = object.new_value; } if (object.change_type !== undefined && object.change_type !== null) { - message.changeType = changeTypeFromJSON(object.change_type); + message.changeType = object.change_type; } message.advices = object.advices?.map(e => Advice.fromAmino(e)) || []; return message; }, 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; + obj.element = message.element === "" ? undefined : message.element; + obj.old_value = message.oldValue === "" ? undefined : message.oldValue; + obj.new_value = message.newValue === "" ? undefined : message.newValue; + obj.change_type = message.changeType === 0 ? undefined : message.changeType; if (message.advices) { obj.advices = message.advices.map(e => e ? Advice.toAmino(e) : undefined); } else { - obj.advices = []; + obj.advices = message.advices; } return obj; }, @@ -357,7 +357,7 @@ export const Advice = { }, toAmino(message: Advice): AdviceAmino { const obj: any = {}; - obj.description = message.description; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: AdviceAminoMsg): Advice { diff --git a/__fixtures__/v-next/outputsign/google/api/consumer.ts b/__fixtures__/v-next/outputsign/google/api/consumer.ts index fe2dc2c5eb..4a25f0f461 100644 --- a/__fixtures__/v-next/outputsign/google/api/consumer.ts +++ b/__fixtures__/v-next/outputsign/google/api/consumer.ts @@ -240,7 +240,7 @@ export const ProjectProperties = { if (message.properties) { obj.properties = message.properties.map(e => e ? Property.toAmino(e) : undefined); } else { - obj.properties = []; + obj.properties = message.properties; } return obj; }, @@ -317,7 +317,7 @@ export const Property = { message.name = object.name; } if (object.type !== undefined && object.type !== null) { - message.type = property_PropertyTypeFromJSON(object.type); + message.type = object.type; } if (object.description !== undefined && object.description !== null) { message.description = object.description; @@ -326,9 +326,9 @@ export const Property = { }, toAmino(message: Property): PropertyAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === 0 ? undefined : message.type; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: PropertyAminoMsg): Property { diff --git a/__fixtures__/v-next/outputsign/google/api/context.ts b/__fixtures__/v-next/outputsign/google/api/context.ts index 65c5aafd9f..b01b4a19aa 100644 --- a/__fixtures__/v-next/outputsign/google/api/context.ts +++ b/__fixtures__/v-next/outputsign/google/api/context.ts @@ -258,7 +258,7 @@ export const Context = { if (message.rules) { obj.rules = message.rules.map(e => e ? ContextRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -358,26 +358,26 @@ export const ContextRule = { }, toAmino(message: ContextRule): ContextRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; if (message.requested) { obj.requested = message.requested.map(e => e); } else { - obj.requested = []; + obj.requested = message.requested; } if (message.provided) { obj.provided = message.provided.map(e => e); } else { - obj.provided = []; + obj.provided = message.provided; } if (message.allowedRequestExtensions) { obj.allowed_request_extensions = message.allowedRequestExtensions.map(e => e); } else { - obj.allowed_request_extensions = []; + obj.allowed_request_extensions = message.allowedRequestExtensions; } if (message.allowedResponseExtensions) { obj.allowed_response_extensions = message.allowedResponseExtensions.map(e => e); } else { - obj.allowed_response_extensions = []; + obj.allowed_response_extensions = message.allowedResponseExtensions; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/control.ts b/__fixtures__/v-next/outputsign/google/api/control.ts index 2832ea9867..1782c07cf7 100644 --- a/__fixtures__/v-next/outputsign/google/api/control.ts +++ b/__fixtures__/v-next/outputsign/google/api/control.ts @@ -85,7 +85,7 @@ export const Control = { }, toAmino(message: Control): ControlAmino { const obj: any = {}; - obj.environment = message.environment; + obj.environment = message.environment === "" ? undefined : message.environment; return obj; }, fromAminoMsg(object: ControlAminoMsg): Control { diff --git a/__fixtures__/v-next/outputsign/google/api/distribution.ts b/__fixtures__/v-next/outputsign/google/api/distribution.ts index cabafbefbf..a23cb60a8c 100644 --- a/__fixtures__/v-next/outputsign/google/api/distribution.ts +++ b/__fixtures__/v-next/outputsign/google/api/distribution.ts @@ -668,20 +668,20 @@ export const Distribution = { }, 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.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.mean = message.mean === 0 ? undefined : message.mean; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation === 0 ? undefined : 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 = []; + obj.bucket_counts = message.bucketCounts; } if (message.exemplars) { obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e) : undefined); } else { - obj.exemplars = []; + obj.exemplars = message.exemplars; } return obj; }, @@ -756,8 +756,8 @@ export const Distribution_Range = { }, toAmino(message: Distribution_Range): Distribution_RangeAmino { const obj: any = {}; - obj.min = message.min; - obj.max = message.max; + obj.min = message.min === 0 ? undefined : message.min; + obj.max = message.max === 0 ? undefined : message.max; return obj; }, fromAminoMsg(object: Distribution_RangeAminoMsg): Distribution_Range { @@ -935,9 +935,9 @@ export const Distribution_BucketOptions_Linear = { }, 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; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.width = message.width === 0 ? undefined : message.width; + obj.offset = message.offset === 0 ? undefined : message.offset; return obj; }, fromAminoMsg(object: Distribution_BucketOptions_LinearAminoMsg): Distribution_BucketOptions_Linear { @@ -1022,9 +1022,9 @@ export const Distribution_BucketOptions_Exponential = { }, 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; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.growth_factor = message.growthFactor === 0 ? undefined : message.growthFactor; + obj.scale = message.scale === 0 ? undefined : message.scale; return obj; }, fromAminoMsg(object: Distribution_BucketOptions_ExponentialAminoMsg): Distribution_BucketOptions_Exponential { @@ -1097,7 +1097,7 @@ export const Distribution_BucketOptions_Explicit = { if (message.bounds) { obj.bounds = message.bounds.map(e => e); } else { - obj.bounds = []; + obj.bounds = message.bounds; } return obj; }, @@ -1181,12 +1181,12 @@ export const Distribution_Exemplar = { }, toAmino(message: Distribution_Exemplar): Distribution_ExemplarAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; if (message.attachments) { obj.attachments = message.attachments.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.attachments = []; + obj.attachments = message.attachments; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/documentation.ts b/__fixtures__/v-next/outputsign/google/api/documentation.ts index 2f09600a56..7954fddf3e 100644 --- a/__fixtures__/v-next/outputsign/google/api/documentation.ts +++ b/__fixtures__/v-next/outputsign/google/api/documentation.ts @@ -498,20 +498,20 @@ export const Documentation = { }, toAmino(message: Documentation): DocumentationAmino { const obj: any = {}; - obj.summary = message.summary; + obj.summary = message.summary === "" ? undefined : message.summary; if (message.pages) { obj.pages = message.pages.map(e => e ? Page.toAmino(e) : undefined); } else { - obj.pages = []; + obj.pages = message.pages; } if (message.rules) { obj.rules = message.rules.map(e => e ? DocumentationRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.documentation_root_url = message.documentationRootUrl; - obj.service_root_url = message.serviceRootUrl; - obj.overview = message.overview; + obj.documentation_root_url = message.documentationRootUrl === "" ? undefined : message.documentationRootUrl; + obj.service_root_url = message.serviceRootUrl === "" ? undefined : message.serviceRootUrl; + obj.overview = message.overview === "" ? undefined : message.overview; return obj; }, fromAminoMsg(object: DocumentationAminoMsg): Documentation { @@ -596,9 +596,9 @@ export const DocumentationRule = { }, toAmino(message: DocumentationRule): DocumentationRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.description = message.description; - obj.deprecation_description = message.deprecationDescription; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.description = message.description === "" ? undefined : message.description; + obj.deprecation_description = message.deprecationDescription === "" ? undefined : message.deprecationDescription; return obj; }, fromAminoMsg(object: DocumentationRuleAminoMsg): DocumentationRule { @@ -681,12 +681,12 @@ export const Page = { }, toAmino(message: Page): PageAmino { const obj: any = {}; - obj.name = message.name; - obj.content = message.content; + obj.name = message.name === "" ? undefined : message.name; + obj.content = message.content === "" ? undefined : message.content; if (message.subpages) { obj.subpages = message.subpages.map(e => e ? Page.toAmino(e) : undefined); } else { - obj.subpages = []; + obj.subpages = message.subpages; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/endpoint.ts b/__fixtures__/v-next/outputsign/google/api/endpoint.ts index 1da508bb35..db4b95e4fe 100644 --- a/__fixtures__/v-next/outputsign/google/api/endpoint.ts +++ b/__fixtures__/v-next/outputsign/google/api/endpoint.ts @@ -209,14 +209,14 @@ export const Endpoint = { }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.aliases) { obj.aliases = message.aliases.map(e => e); } else { - obj.aliases = []; + obj.aliases = message.aliases; } - obj.target = message.target; - obj.allow_cors = message.allowCors; + obj.target = message.target === "" ? undefined : message.target; + obj.allow_cors = message.allowCors === false ? undefined : message.allowCors; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputsign/google/api/expr/conformance/v1alpha1/conformance_service.ts b/__fixtures__/v-next/outputsign/google/api/expr/conformance/v1alpha1/conformance_service.ts index 624369db04..72f4f86c7a 100644 --- a/__fixtures__/v-next/outputsign/google/api/expr/conformance/v1alpha1/conformance_service.ts +++ b/__fixtures__/v-next/outputsign/google/api/expr/conformance/v1alpha1/conformance_service.ts @@ -434,10 +434,10 @@ export const ParseRequest = { }, 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; + obj.cel_source = message.celSource === "" ? undefined : message.celSource; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.source_location = message.sourceLocation === "" ? undefined : message.sourceLocation; + obj.disable_macros = message.disableMacros === false ? undefined : message.disableMacros; return obj; }, fromAminoMsg(object: ParseRequestAminoMsg): ParseRequest { @@ -515,7 +515,7 @@ export const ParseResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -616,10 +616,10 @@ export const CheckRequest = { if (message.typeEnv) { obj.type_env = message.typeEnv.map(e => e ? Decl.toAmino(e) : undefined); } else { - obj.type_env = []; + obj.type_env = message.typeEnv; } - obj.container = message.container; - obj.no_std_env = message.noStdEnv; + obj.container = message.container === "" ? undefined : message.container; + obj.no_std_env = message.noStdEnv === false ? undefined : message.noStdEnv; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -697,7 +697,7 @@ export const CheckResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -773,7 +773,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -894,7 +894,7 @@ export const EvalRequest = { obj.bindings[k] = ExprValue.toAmino(v); }); } - obj.container = message.container; + obj.container = message.container === "" ? undefined : message.container; return obj; }, fromAminoMsg(object: EvalRequestAminoMsg): EvalRequest { @@ -972,7 +972,7 @@ export const EvalResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -1050,7 +1050,7 @@ export const IssueDetails = { fromAmino(object: IssueDetailsAmino): IssueDetails { const message = createBaseIssueDetails(); if (object.severity !== undefined && object.severity !== null) { - message.severity = issueDetails_SeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.position !== undefined && object.position !== null) { message.position = SourcePosition.fromAmino(object.position); @@ -1062,9 +1062,9 @@ export const IssueDetails = { }, toAmino(message: IssueDetails): IssueDetailsAmino { const obj: any = {}; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.position = message.position ? SourcePosition.toAmino(message.position) : undefined; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; return obj; }, fromAminoMsg(object: IssueDetailsAminoMsg): IssueDetails { diff --git a/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/checked.ts b/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/checked.ts index f31ced4c1f..1ef927f85d 100644 --- a/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/checked.ts +++ b/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/checked.ts @@ -1,6 +1,6 @@ import { SourceInfo, SourceInfoAmino, SourceInfoSDKType, Expr, ExprAmino, ExprSDKType, Constant, ConstantAmino, ConstantSDKType } from "./syntax"; import { Empty, EmptyAmino, EmptySDKType } from "../../../protobuf/empty"; -import { NullValue, NullValueSDKType, nullValueFromJSON } from "../../../protobuf/struct"; +import { NullValue, NullValueSDKType } from "../../../protobuf/struct"; import { BinaryReader, BinaryWriter } from "../../../../binary"; import { DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1alpha1"; @@ -956,7 +956,7 @@ export const CheckedExpr_ReferenceMapEntry = { }, toAmino(message: CheckedExpr_ReferenceMapEntry): CheckedExpr_ReferenceMapEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Reference.toAmino(message.value) : undefined; return obj; }, @@ -1028,7 +1028,7 @@ export const CheckedExpr_TypeMapEntry = { }, toAmino(message: CheckedExpr_TypeMapEntry): CheckedExpr_TypeMapEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Type.toAmino(message.value) : undefined; return obj; }, @@ -1183,7 +1183,7 @@ export const CheckedExpr = { }); } obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined; - obj.expr_version = message.exprVersion; + obj.expr_version = message.exprVersion === "" ? undefined : message.exprVersion; obj.expr = message.expr ? Expr.toAmino(message.expr) : undefined; return obj; }, @@ -1354,16 +1354,16 @@ export const Type = { message.dyn = Empty.fromAmino(object.dyn); } if (object.null !== undefined && object.null !== null) { - message.null = nullValueFromJSON(object.null); + message.null = object.null; } if (object.primitive !== undefined && object.primitive !== null) { - message.primitive = type_PrimitiveTypeFromJSON(object.primitive); + message.primitive = object.primitive; } if (object.wrapper !== undefined && object.wrapper !== null) { - message.wrapper = type_PrimitiveTypeFromJSON(object.wrapper); + message.wrapper = object.wrapper; } if (object.well_known !== undefined && object.well_known !== null) { - message.wellKnown = type_WellKnownTypeFromJSON(object.well_known); + message.wellKnown = object.well_known; } if (object.list_type !== undefined && object.list_type !== null) { message.listType = Type_ListType.fromAmino(object.list_type); @@ -1394,15 +1394,15 @@ export const Type = { 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.null = message.null === null ? undefined : message.null; + obj.primitive = message.primitive === null ? undefined : message.primitive; + obj.wrapper = message.wrapper === null ? undefined : message.wrapper; + obj.well_known = message.wellKnown === null ? undefined : 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.message_type = message.messageType === null ? undefined : message.messageType; + obj.type_param = message.typeParam === null ? undefined : 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; @@ -1627,7 +1627,7 @@ export const Type_FunctionType = { if (message.argTypes) { obj.arg_types = message.argTypes.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.arg_types = []; + obj.arg_types = message.argTypes; } return obj; }, @@ -1700,11 +1700,11 @@ export const Type_AbstractType = { }, toAmino(message: Type_AbstractType): Type_AbstractTypeAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.parameterTypes) { obj.parameter_types = message.parameterTypes.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.parameter_types = []; + obj.parameter_types = message.parameterTypes; } return obj; }, @@ -1794,7 +1794,7 @@ export const Decl = { }, toAmino(message: Decl): DeclAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.ident = message.ident ? Decl_IdentDecl.toAmino(message.ident) : undefined; obj.function = message.function ? Decl_FunctionDecl.toAmino(message.function) : undefined; return obj; @@ -1887,7 +1887,7 @@ export const Decl_IdentDecl = { 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; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromAminoMsg(object: Decl_IdentDeclAminoMsg): Decl_IdentDecl { @@ -1951,7 +1951,7 @@ export const Decl_FunctionDecl = { if (message.overloads) { obj.overloads = message.overloads.map(e => e ? Decl_FunctionDecl_Overload.toAmino(e) : undefined); } else { - obj.overloads = []; + obj.overloads = message.overloads; } return obj; }, @@ -2068,20 +2068,20 @@ export const Decl_FunctionDecl_Overload = { }, toAmino(message: Decl_FunctionDecl_Overload): Decl_FunctionDecl_OverloadAmino { const obj: any = {}; - obj.overload_id = message.overloadId; + obj.overload_id = message.overloadId === "" ? undefined : message.overloadId; if (message.params) { obj.params = message.params.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.params = []; + obj.params = message.params; } if (message.typeParams) { obj.type_params = message.typeParams.map(e => e); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } obj.result_type = message.resultType ? Type.toAmino(message.resultType) : undefined; - obj.is_instance_function = message.isInstanceFunction; - obj.doc = message.doc; + obj.is_instance_function = message.isInstanceFunction === false ? undefined : message.isInstanceFunction; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromAminoMsg(object: Decl_FunctionDecl_OverloadAminoMsg): Decl_FunctionDecl_Overload { @@ -2166,11 +2166,11 @@ export const Reference = { }, toAmino(message: Reference): ReferenceAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.overloadId) { obj.overload_id = message.overloadId.map(e => e); } else { - obj.overload_id = []; + obj.overload_id = message.overloadId; } obj.value = message.value ? Constant.toAmino(message.value) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/eval.ts b/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/eval.ts index eeb2793d84..13a09e0325 100644 --- a/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/eval.ts @@ -317,12 +317,12 @@ export const EvalState = { if (message.values) { obj.values = message.values.map(e => e ? ExprValue.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.results) { obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e) : undefined); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -401,8 +401,8 @@ export const EvalState_Result = { }, 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; + obj.expr = message.expr !== BigInt(0) ? message.expr.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result { @@ -559,7 +559,7 @@ export const ErrorSet = { if (message.errors) { obj.errors = message.errors.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.errors = []; + obj.errors = message.errors; } return obj; }, @@ -633,7 +633,7 @@ export const UnknownSet = { if (message.exprs) { obj.exprs = message.exprs.map(e => e.toString()); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/explain.ts b/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/explain.ts index f0185bd869..4569dfb94a 100644 --- a/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/explain.ts +++ b/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/explain.ts @@ -144,12 +144,12 @@ export const Explain = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.exprSteps) { obj.expr_steps = message.exprSteps.map(e => e ? Explain_ExprStep.toAmino(e) : undefined); } else { - obj.expr_steps = []; + obj.expr_steps = message.exprSteps; } return obj; }, @@ -226,8 +226,8 @@ export const Explain_ExprStep = { }, toAmino(message: Explain_ExprStep): Explain_ExprStepAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.value_index = message.valueIndex; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.value_index = message.valueIndex === 0 ? undefined : message.valueIndex; return obj; }, fromAminoMsg(object: Explain_ExprStepAminoMsg): Explain_ExprStep { diff --git a/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/syntax.ts b/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/syntax.ts index 0b527f5516..146a4f3c14 100644 --- a/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/syntax.ts +++ b/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/syntax.ts @@ -1,4 +1,4 @@ -import { NullValue, NullValueSDKType, nullValueFromJSON } from "../../../protobuf/struct"; +import { NullValue, NullValueSDKType } from "../../../protobuf/struct"; import { Duration, DurationAmino, DurationSDKType } from "../../../protobuf/duration"; import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../protobuf/timestamp"; import { BinaryReader, BinaryWriter } from "../../../../binary"; @@ -1113,7 +1113,7 @@ export const Expr = { }, toAmino(message: Expr): ExprAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? 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; @@ -1183,7 +1183,7 @@ export const Expr_Ident = { }, toAmino(message: Expr_Ident): Expr_IdentAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident { @@ -1271,8 +1271,8 @@ export const Expr_Select = { 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; + obj.field = message.field === "" ? undefined : message.field; + obj.test_only = message.testOnly === false ? undefined : message.testOnly; return obj; }, fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select { @@ -1358,11 +1358,11 @@ export const Expr_Call = { toAmino(message: Expr_Call): Expr_CallAmino { const obj: any = {}; obj.target = message.target ? Expr.toAmino(message.target) : undefined; - obj.function = message.function; + obj.function = message.function === "" ? undefined : message.function; if (message.args) { obj.args = message.args.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } return obj; }, @@ -1427,7 +1427,7 @@ export const Expr_CreateList = { if (message.elements) { obj.elements = message.elements.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.elements = []; + obj.elements = message.elements; } return obj; }, @@ -1500,11 +1500,11 @@ export const Expr_CreateStruct = { }, toAmino(message: Expr_CreateStruct): Expr_CreateStructAmino { const obj: any = {}; - obj.message_name = message.messageName; + obj.message_name = message.messageName === "" ? undefined : message.messageName; if (message.entries) { obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1607,8 +1607,8 @@ export const Expr_CreateStruct_Entry = { }, 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.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.field_key = message.fieldKey === null ? undefined : message.fieldKey; obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; @@ -1749,9 +1749,9 @@ export const Expr_Comprehension = { }, toAmino(message: Expr_Comprehension): Expr_ComprehensionAmino { const obj: any = {}; - obj.iter_var = message.iterVar; + obj.iter_var = message.iterVar === "" ? undefined : message.iterVar; obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange) : undefined; - obj.accu_var = message.accuVar; + obj.accu_var = message.accuVar === "" ? undefined : 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; @@ -1882,7 +1882,7 @@ export const Constant = { fromAmino(object: ConstantAmino): Constant { const message = createBaseConstant(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -1912,12 +1912,12 @@ export const Constant = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; obj.duration_value = message.durationValue ? Duration.toAmino(message.durationValue) : undefined; obj.timestamp_value = message.timestampValue ? Timestamp.toAmino(toTimestamp(message.timestampValue)) : undefined; @@ -1995,8 +1995,8 @@ export const SourceInfo_PositionsEntry = { }, toAmino(message: SourceInfo_PositionsEntry): SourceInfo_PositionsEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; - obj.value = message.value; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry { @@ -2067,7 +2067,7 @@ export const SourceInfo_MacroCallsEntry = { }, toAmino(message: SourceInfo_MacroCallsEntry): SourceInfo_MacroCallsEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; }, @@ -2212,12 +2212,12 @@ export const SourceInfo = { }, toAmino(message: SourceInfo): SourceInfoAmino { const obj: any = {}; - obj.syntax_version = message.syntaxVersion; - obj.location = message.location; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -2326,10 +2326,10 @@ export const SourcePosition = { }, toAmino(message: SourcePosition): SourcePositionAmino { const obj: any = {}; - obj.location = message.location; - obj.offset = message.offset; - obj.line = message.line; - obj.column = message.column; + obj.location = message.location === "" ? undefined : message.location; + obj.offset = message.offset === 0 ? undefined : message.offset; + obj.line = message.line === 0 ? undefined : message.line; + obj.column = message.column === 0 ? undefined : message.column; return obj; }, fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition { diff --git a/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/value.ts b/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/value.ts index cdf46ec182..cdffd1b69e 100644 --- a/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/value.ts +++ b/__fixtures__/v-next/outputsign/google/api/expr/v1alpha1/value.ts @@ -1,4 +1,4 @@ -import { NullValue, NullValueSDKType, nullValueFromJSON } from "../../../protobuf/struct"; +import { NullValue, NullValueSDKType } from "../../../protobuf/struct"; import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../protobuf/any"; import { BinaryReader, BinaryWriter } from "../../../../binary"; import { DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; @@ -381,7 +381,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -420,18 +420,18 @@ export const 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; 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; + obj.type_value = message.typeValue === null ? undefined : message.typeValue; return obj; }, fromAminoMsg(object: ValueAminoMsg): Value { @@ -505,8 +505,8 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.type = message.type; - obj.value = message.value; + obj.type = message.type === "" ? undefined : message.type; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EnumValueAminoMsg): EnumValue { @@ -570,7 +570,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, @@ -635,7 +635,7 @@ export const MapValue = { if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/decl.ts b/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/decl.ts index 481a3216e6..a4c169f563 100644 --- a/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/decl.ts +++ b/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/decl.ts @@ -248,9 +248,9 @@ export const Decl = { }, toAmino(message: Decl): DeclAmino { const obj: any = {}; - obj.id = message.id; - obj.name = message.name; - obj.doc = message.doc; + obj.id = message.id === 0 ? undefined : message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.doc = message.doc === "" ? undefined : message.doc; obj.ident = message.ident ? IdentDecl.toAmino(message.ident) : undefined; obj.function = message.function ? FunctionDecl.toAmino(message.function) : undefined; return obj; @@ -335,12 +335,12 @@ export const DeclType = { }, toAmino(message: DeclType): DeclTypeAmino { const obj: any = {}; - obj.id = message.id; - obj.type = message.type; + obj.id = message.id === 0 ? undefined : message.id; + obj.type = message.type === "" ? undefined : message.type; if (message.typeParams) { obj.type_params = message.typeParams.map(e => e ? DeclType.toAmino(e) : undefined); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } return obj; }, @@ -508,10 +508,10 @@ export const FunctionDecl = { if (message.args) { obj.args = message.args.map(e => e ? IdentDecl.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } obj.return_type = message.returnType ? DeclType.toAmino(message.returnType) : undefined; - obj.receiver_function = message.receiverFunction; + obj.receiver_function = message.receiverFunction === false ? undefined : message.receiverFunction; return obj; }, fromAminoMsg(object: FunctionDeclAminoMsg): FunctionDecl { diff --git a/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/eval.ts b/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/eval.ts index 9c8e23372d..c2abbe147a 100644 --- a/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/eval.ts +++ b/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/eval.ts @@ -339,12 +339,12 @@ export const EvalState = { if (message.values) { obj.values = message.values.map(e => e ? ExprValue.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.results) { obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e) : undefined); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -422,7 +422,7 @@ export const EvalState_Result = { toAmino(message: EvalState_Result): EvalState_ResultAmino { const obj: any = {}; obj.expr = message.expr ? IdRef.toAmino(message.expr) : undefined; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result { @@ -579,7 +579,7 @@ export const ErrorSet = { if (message.errors) { obj.errors = message.errors.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.errors = []; + obj.errors = message.errors; } return obj; }, @@ -644,7 +644,7 @@ export const UnknownSet = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -708,7 +708,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { diff --git a/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/expr.ts b/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/expr.ts index 5fc317a364..7cfd55324d 100644 --- a/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/expr.ts +++ b/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/expr.ts @@ -1,5 +1,5 @@ import { SourceInfo, SourceInfoAmino, SourceInfoSDKType } from "./source"; -import { NullValue, NullValueSDKType, nullValueFromJSON } from "../../../protobuf/struct"; +import { NullValue, NullValueSDKType } from "../../../protobuf/struct"; import { BinaryReader, BinaryWriter } from "../../../../binary"; import { DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1beta1"; @@ -742,7 +742,7 @@ export const ParsedExpr = { 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; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; return obj; }, fromAminoMsg(object: ParsedExprAminoMsg): ParsedExpr { @@ -896,7 +896,7 @@ export const Expr = { }, toAmino(message: Expr): ExprAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : 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; @@ -966,7 +966,7 @@ export const Expr_Ident = { }, toAmino(message: Expr_Ident): Expr_IdentAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident { @@ -1054,8 +1054,8 @@ export const Expr_Select = { 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; + obj.field = message.field === "" ? undefined : message.field; + obj.test_only = message.testOnly === false ? undefined : message.testOnly; return obj; }, fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select { @@ -1141,11 +1141,11 @@ export const Expr_Call = { toAmino(message: Expr_Call): Expr_CallAmino { const obj: any = {}; obj.target = message.target ? Expr.toAmino(message.target) : undefined; - obj.function = message.function; + obj.function = message.function === "" ? undefined : message.function; if (message.args) { obj.args = message.args.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } return obj; }, @@ -1210,7 +1210,7 @@ export const Expr_CreateList = { if (message.elements) { obj.elements = message.elements.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.elements = []; + obj.elements = message.elements; } return obj; }, @@ -1283,11 +1283,11 @@ export const Expr_CreateStruct = { }, toAmino(message: Expr_CreateStruct): Expr_CreateStructAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.entries) { obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1388,8 +1388,8 @@ export const Expr_CreateStruct_Entry = { }, toAmino(message: Expr_CreateStruct_Entry): Expr_CreateStruct_EntryAmino { const obj: any = {}; - obj.id = message.id; - obj.field_key = message.fieldKey; + obj.id = message.id === 0 ? undefined : message.id; + obj.field_key = message.fieldKey === null ? undefined : message.fieldKey; obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; @@ -1530,9 +1530,9 @@ export const Expr_Comprehension = { }, toAmino(message: Expr_Comprehension): Expr_ComprehensionAmino { const obj: any = {}; - obj.iter_var = message.iterVar; + obj.iter_var = message.iterVar === "" ? undefined : message.iterVar; obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange) : undefined; - obj.accu_var = message.accuVar; + obj.accu_var = message.accuVar === "" ? undefined : 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; @@ -1645,7 +1645,7 @@ export const Literal = { fromAmino(object: LiteralAmino): Literal { const message = createBaseLiteral(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -1669,12 +1669,12 @@ export const Literal = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/source.ts b/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/source.ts index 46fe26bd11..12ad164359 100644 --- a/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/source.ts +++ b/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/source.ts @@ -192,8 +192,8 @@ export const SourceInfo_PositionsEntry = { }, toAmino(message: SourceInfo_PositionsEntry): SourceInfo_PositionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === 0 ? undefined : message.key; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry { @@ -297,11 +297,11 @@ export const SourceInfo = { }, toAmino(message: SourceInfo): SourceInfoAmino { const obj: any = {}; - obj.location = message.location; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -404,10 +404,10 @@ export const SourcePosition = { }, toAmino(message: SourcePosition): SourcePositionAmino { const obj: any = {}; - obj.location = message.location; - obj.offset = message.offset; - obj.line = message.line; - obj.column = message.column; + obj.location = message.location === "" ? undefined : message.location; + obj.offset = message.offset === 0 ? undefined : message.offset; + obj.line = message.line === 0 ? undefined : message.line; + obj.column = message.column === 0 ? undefined : message.column; return obj; }, fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition { diff --git a/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/value.ts b/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/value.ts index 85cbffbf40..e1682df3fc 100644 --- a/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/value.ts +++ b/__fixtures__/v-next/outputsign/google/api/expr/v1beta1/value.ts @@ -1,4 +1,4 @@ -import { NullValue, NullValueSDKType, nullValueFromJSON } from "../../../protobuf/struct"; +import { NullValue, NullValueSDKType } from "../../../protobuf/struct"; import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../protobuf/any"; import { BinaryReader, BinaryWriter } from "../../../../binary"; import { DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; @@ -381,7 +381,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -420,18 +420,18 @@ export const 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; 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; + obj.type_value = message.typeValue === null ? undefined : message.typeValue; return obj; }, fromAminoMsg(object: ValueAminoMsg): Value { @@ -505,8 +505,8 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.type = message.type; - obj.value = message.value; + obj.type = message.type === "" ? undefined : message.type; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EnumValueAminoMsg): EnumValue { @@ -570,7 +570,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, @@ -635,7 +635,7 @@ export const MapValue = { if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/http.ts b/__fixtures__/v-next/outputsign/google/api/http.ts index 1a4856a636..136394d59f 100644 --- a/__fixtures__/v-next/outputsign/google/api/http.ts +++ b/__fixtures__/v-next/outputsign/google/api/http.ts @@ -1082,9 +1082,9 @@ export const Http = { if (message.rules) { obj.rules = message.rules.map(e => e ? HttpRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion; + obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion === false ? undefined : message.fullyDecodeReservedExpansion; return obj; }, fromAminoMsg(object: HttpAminoMsg): Http { @@ -1246,19 +1246,19 @@ export const HttpRule = { }, 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.selector = message.selector === "" ? undefined : message.selector; + obj.get = message.get === null ? undefined : message.get; + obj.put = message.put === null ? undefined : message.put; + obj.post = message.post === null ? undefined : message.post; + obj.delete = message.delete === null ? undefined : message.delete; + obj.patch = message.patch === null ? undefined : message.patch; obj.custom = message.custom ? CustomHttpPattern.toAmino(message.custom) : undefined; - obj.body = message.body; - obj.response_body = message.responseBody; + obj.body = message.body === "" ? undefined : message.body; + obj.response_body = message.responseBody === "" ? undefined : message.responseBody; if (message.additionalBindings) { obj.additional_bindings = message.additionalBindings.map(e => e ? HttpRule.toAmino(e) : undefined); } else { - obj.additional_bindings = []; + obj.additional_bindings = message.additionalBindings; } return obj; }, @@ -1333,8 +1333,8 @@ export const CustomHttpPattern = { }, toAmino(message: CustomHttpPattern): CustomHttpPatternAmino { const obj: any = {}; - obj.kind = message.kind; - obj.path = message.path; + obj.kind = message.kind === "" ? undefined : message.kind; + obj.path = message.path === "" ? undefined : message.path; return obj; }, fromAminoMsg(object: CustomHttpPatternAminoMsg): CustomHttpPattern { diff --git a/__fixtures__/v-next/outputsign/google/api/httpbody.ts b/__fixtures__/v-next/outputsign/google/api/httpbody.ts index 6d0887692c..600da24584 100644 --- a/__fixtures__/v-next/outputsign/google/api/httpbody.ts +++ b/__fixtures__/v-next/outputsign/google/api/httpbody.ts @@ -236,12 +236,12 @@ export const HttpBody = { }, toAmino(message: HttpBody): HttpBodyAmino { const obj: any = {}; - obj.content_type = message.contentType; + obj.content_type = message.contentType === "" ? undefined : message.contentType; obj.data = message.data ? base64FromBytes(message.data) : undefined; if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/label.ts b/__fixtures__/v-next/outputsign/google/api/label.ts index 25836053be..acc482d6f9 100644 --- a/__fixtures__/v-next/outputsign/google/api/label.ts +++ b/__fixtures__/v-next/outputsign/google/api/label.ts @@ -132,7 +132,7 @@ export const LabelDescriptor = { message.key = object.key; } if (object.value_type !== undefined && object.value_type !== null) { - message.valueType = labelDescriptor_ValueTypeFromJSON(object.value_type); + message.valueType = object.value_type; } if (object.description !== undefined && object.description !== null) { message.description = object.description; @@ -141,9 +141,9 @@ export const LabelDescriptor = { }, toAmino(message: LabelDescriptor): LabelDescriptorAmino { const obj: any = {}; - obj.key = message.key; - obj.value_type = message.valueType; - obj.description = message.description; + obj.key = message.key === "" ? undefined : message.key; + obj.value_type = message.valueType === 0 ? undefined : message.valueType; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: LabelDescriptorAminoMsg): LabelDescriptor { diff --git a/__fixtures__/v-next/outputsign/google/api/log.ts b/__fixtures__/v-next/outputsign/google/api/log.ts index a8aba5cef7..fb38a1879d 100644 --- a/__fixtures__/v-next/outputsign/google/api/log.ts +++ b/__fixtures__/v-next/outputsign/google/api/log.ts @@ -171,14 +171,14 @@ export const LogDescriptor = { }, toAmino(message: LogDescriptor): LogDescriptorAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.labels; } - obj.description = message.description; - obj.display_name = message.displayName; + obj.description = message.description === "" ? undefined : message.description; + obj.display_name = message.displayName === "" ? undefined : message.displayName; return obj; }, fromAminoMsg(object: LogDescriptorAminoMsg): LogDescriptor { diff --git a/__fixtures__/v-next/outputsign/google/api/logging.ts b/__fixtures__/v-next/outputsign/google/api/logging.ts index fff3eb6b69..bc90c7dda6 100644 --- a/__fixtures__/v-next/outputsign/google/api/logging.ts +++ b/__fixtures__/v-next/outputsign/google/api/logging.ts @@ -244,12 +244,12 @@ export const Logging = { if (message.producerDestinations) { obj.producer_destinations = message.producerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e) : undefined); } else { - obj.producer_destinations = []; + obj.producer_destinations = message.producerDestinations; } if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -322,11 +322,11 @@ export const Logging_LoggingDestination = { }, toAmino(message: Logging_LoggingDestination): Logging_LoggingDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.logs) { obj.logs = message.logs.map(e => e); } else { - obj.logs = []; + obj.logs = message.logs; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/metric.ts b/__fixtures__/v-next/outputsign/google/api/metric.ts index f40d846aee..fe0bb5b6dd 100644 --- a/__fixtures__/v-next/outputsign/google/api/metric.ts +++ b/__fixtures__/v-next/outputsign/google/api/metric.ts @@ -1,4 +1,4 @@ -import { LaunchStage, LaunchStageSDKType, launchStageFromJSON } from "./launch_stage"; +import { LaunchStage, LaunchStageSDKType } from "./launch_stage"; import { Duration, DurationAmino, DurationSDKType } from "../protobuf/duration"; import { LabelDescriptor, LabelDescriptorAmino, LabelDescriptorSDKType } from "./label"; import { BinaryReader, BinaryWriter } from "../../binary"; @@ -749,10 +749,10 @@ export const MetricDescriptor = { } message.labels = object.labels?.map(e => LabelDescriptor.fromAmino(e)) || []; if (object.metric_kind !== undefined && object.metric_kind !== null) { - message.metricKind = metricDescriptor_MetricKindFromJSON(object.metric_kind); + message.metricKind = object.metric_kind; } if (object.value_type !== undefined && object.value_type !== null) { - message.valueType = metricDescriptor_ValueTypeFromJSON(object.value_type); + message.valueType = object.value_type; } if (object.unit !== undefined && object.unit !== null) { message.unit = object.unit; @@ -767,31 +767,31 @@ export const MetricDescriptor = { message.metadata = MetricDescriptor_MetricDescriptorMetadata.fromAmino(object.metadata); } if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } message.monitoredResourceTypes = object.monitored_resource_types?.map(e => e) || []; return message; }, toAmino(message: MetricDescriptor): MetricDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.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.metric_kind = message.metricKind === 0 ? undefined : message.metricKind; + obj.value_type = message.valueType === 0 ? undefined : message.valueType; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.description = message.description === "" ? undefined : message.description; + obj.display_name = message.displayName === "" ? undefined : message.displayName; obj.metadata = message.metadata ? MetricDescriptor_MetricDescriptorMetadata.toAmino(message.metadata) : undefined; - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; if (message.monitoredResourceTypes) { obj.monitored_resource_types = message.monitoredResourceTypes.map(e => e); } else { - obj.monitored_resource_types = []; + obj.monitored_resource_types = message.monitoredResourceTypes; } return obj; }, @@ -869,7 +869,7 @@ export const MetricDescriptor_MetricDescriptorMetadata = { fromAmino(object: MetricDescriptor_MetricDescriptorMetadataAmino): MetricDescriptor_MetricDescriptorMetadata { const message = createBaseMetricDescriptor_MetricDescriptorMetadata(); if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } if (object.sample_period !== undefined && object.sample_period !== null) { message.samplePeriod = Duration.fromAmino(object.sample_period); @@ -881,7 +881,7 @@ export const MetricDescriptor_MetricDescriptorMetadata = { }, toAmino(message: MetricDescriptor_MetricDescriptorMetadata): MetricDescriptor_MetricDescriptorMetadataAmino { const obj: any = {}; - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; obj.sample_period = message.samplePeriod ? Duration.toAmino(message.samplePeriod) : undefined; obj.ingest_delay = message.ingestDelay ? Duration.toAmino(message.ingestDelay) : undefined; return obj; @@ -956,8 +956,8 @@ export const Metric_LabelsEntry = { }, toAmino(message: Metric_LabelsEntry): Metric_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: Metric_LabelsEntryAminoMsg): Metric_LabelsEntry { @@ -1043,7 +1043,7 @@ export const Metric = { }, toAmino(message: Metric): MetricAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { diff --git a/__fixtures__/v-next/outputsign/google/api/monitored_resource.ts b/__fixtures__/v-next/outputsign/google/api/monitored_resource.ts index 61c5e1f801..d944575645 100644 --- a/__fixtures__/v-next/outputsign/google/api/monitored_resource.ts +++ b/__fixtures__/v-next/outputsign/google/api/monitored_resource.ts @@ -1,5 +1,5 @@ import { LabelDescriptor, LabelDescriptorAmino, LabelDescriptorSDKType } from "./label"; -import { LaunchStage, LaunchStageSDKType, launchStageFromJSON } from "./launch_stage"; +import { LaunchStage, LaunchStageSDKType } from "./launch_stage"; import { Struct, StructAmino, StructSDKType } from "../protobuf/struct"; import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial } from "../../helpers"; @@ -423,22 +423,22 @@ export const MonitoredResourceDescriptor = { } message.labels = object.labels?.map(e => LabelDescriptor.fromAmino(e)) || []; if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } return message; }, toAmino(message: MonitoredResourceDescriptor): MonitoredResourceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.display_name = message.displayName; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; + obj.display_name = message.displayName === "" ? undefined : message.displayName; + obj.description = message.description === "" ? undefined : message.description; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.labels; } - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; return obj; }, fromAminoMsg(object: MonitoredResourceDescriptorAminoMsg): MonitoredResourceDescriptor { @@ -511,8 +511,8 @@ export const MonitoredResource_LabelsEntry = { }, toAmino(message: MonitoredResource_LabelsEntry): MonitoredResource_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MonitoredResource_LabelsEntryAminoMsg): MonitoredResource_LabelsEntry { @@ -598,7 +598,7 @@ export const MonitoredResource = { }, toAmino(message: MonitoredResource): MonitoredResourceAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -677,8 +677,8 @@ export const MonitoredResourceMetadata_UserLabelsEntry = { }, toAmino(message: MonitoredResourceMetadata_UserLabelsEntry): MonitoredResourceMetadata_UserLabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MonitoredResourceMetadata_UserLabelsEntryAminoMsg): MonitoredResourceMetadata_UserLabelsEntry { diff --git a/__fixtures__/v-next/outputsign/google/api/monitoring.ts b/__fixtures__/v-next/outputsign/google/api/monitoring.ts index 96d7c3e218..c07d4a9a34 100644 --- a/__fixtures__/v-next/outputsign/google/api/monitoring.ts +++ b/__fixtures__/v-next/outputsign/google/api/monitoring.ts @@ -317,12 +317,12 @@ export const Monitoring = { if (message.producerDestinations) { obj.producer_destinations = message.producerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e) : undefined); } else { - obj.producer_destinations = []; + obj.producer_destinations = message.producerDestinations; } if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -395,11 +395,11 @@ export const Monitoring_MonitoringDestination = { }, toAmino(message: Monitoring_MonitoringDestination): Monitoring_MonitoringDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.metrics) { obj.metrics = message.metrics.map(e => e); } else { - obj.metrics = []; + obj.metrics = message.metrics; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/quota.ts b/__fixtures__/v-next/outputsign/google/api/quota.ts index 103fa727ee..51c38c1fbf 100644 --- a/__fixtures__/v-next/outputsign/google/api/quota.ts +++ b/__fixtures__/v-next/outputsign/google/api/quota.ts @@ -563,12 +563,12 @@ export const Quota = { if (message.limits) { obj.limits = message.limits.map(e => e ? QuotaLimit.toAmino(e) : undefined); } else { - obj.limits = []; + obj.limits = message.limits; } if (message.metricRules) { obj.metric_rules = message.metricRules.map(e => e ? MetricRule.toAmino(e) : undefined); } else { - obj.metric_rules = []; + obj.metric_rules = message.metricRules; } return obj; }, @@ -644,8 +644,8 @@ export const MetricRule_MetricCostsEntry = { }, toAmino(message: MetricRule_MetricCostsEntry): MetricRule_MetricCostsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value ? message.value.toString() : undefined; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: MetricRule_MetricCostsEntryAminoMsg): MetricRule_MetricCostsEntry { @@ -731,7 +731,7 @@ export const MetricRule = { }, toAmino(message: MetricRule): MetricRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.metric_costs = {}; if (message.metricCosts) { Object.entries(message.metricCosts).forEach(([k, v]) => { @@ -812,8 +812,8 @@ export const QuotaLimit_ValuesEntry = { }, toAmino(message: QuotaLimit_ValuesEntry): QuotaLimit_ValuesEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value ? message.value.toString() : undefined; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: QuotaLimit_ValuesEntryAminoMsg): QuotaLimit_ValuesEntry { @@ -993,21 +993,21 @@ export const QuotaLimit = { }, 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.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.default_limit = message.defaultLimit !== BigInt(0) ? message.defaultLimit.toString() : undefined; + obj.max_limit = message.maxLimit !== BigInt(0) ? message.maxLimit.toString() : undefined; + obj.free_tier = message.freeTier !== BigInt(0) ? message.freeTier.toString() : undefined; + obj.duration = message.duration === "" ? undefined : message.duration; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; obj.values = {}; if (message.values) { Object.entries(message.values).forEach(([k, v]) => { obj.values[k] = v.toString(); }); } - obj.display_name = message.displayName; + obj.display_name = message.displayName === "" ? undefined : message.displayName; return obj; }, fromAminoMsg(object: QuotaLimitAminoMsg): QuotaLimit { diff --git a/__fixtures__/v-next/outputsign/google/api/resource.ts b/__fixtures__/v-next/outputsign/google/api/resource.ts index d73efaa335..ff7a50a98d 100644 --- a/__fixtures__/v-next/outputsign/google/api/resource.ts +++ b/__fixtures__/v-next/outputsign/google/api/resource.ts @@ -631,7 +631,7 @@ export const ResourceDescriptor = { message.nameField = object.name_field; } if (object.history !== undefined && object.history !== null) { - message.history = resourceDescriptor_HistoryFromJSON(object.history); + message.history = object.history; } if (object.plural !== undefined && object.plural !== null) { message.plural = object.plural; @@ -639,25 +639,25 @@ export const ResourceDescriptor = { if (object.singular !== undefined && object.singular !== null) { message.singular = object.singular; } - message.style = object.style?.map(e => resourceDescriptor_StyleFromJSON(e)) || []; + message.style = object.style?.map(e => e) || []; return message; }, toAmino(message: ResourceDescriptor): ResourceDescriptorAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.pattern) { obj.pattern = message.pattern.map(e => e); } else { - obj.pattern = []; + obj.pattern = message.pattern; } - obj.name_field = message.nameField; - obj.history = message.history; - obj.plural = message.plural; - obj.singular = message.singular; + obj.name_field = message.nameField === "" ? undefined : message.nameField; + obj.history = message.history === 0 ? undefined : message.history; + obj.plural = message.plural === "" ? undefined : message.plural; + obj.singular = message.singular === "" ? undefined : message.singular; if (message.style) { obj.style = message.style.map(e => e); } else { - obj.style = []; + obj.style = message.style; } return obj; }, @@ -732,8 +732,8 @@ export const ResourceReference = { }, toAmino(message: ResourceReference): ResourceReferenceAmino { const obj: any = {}; - obj.type = message.type; - obj.child_type = message.childType; + obj.type = message.type === "" ? undefined : message.type; + obj.child_type = message.childType === "" ? undefined : message.childType; return obj; }, fromAminoMsg(object: ResourceReferenceAminoMsg): ResourceReference { diff --git a/__fixtures__/v-next/outputsign/google/api/routing.ts b/__fixtures__/v-next/outputsign/google/api/routing.ts index 56893b9108..e30be4e3a2 100644 --- a/__fixtures__/v-next/outputsign/google/api/routing.ts +++ b/__fixtures__/v-next/outputsign/google/api/routing.ts @@ -1299,7 +1299,7 @@ export const RoutingRule = { if (message.routingParameters) { obj.routing_parameters = message.routingParameters.map(e => e ? RoutingParameter.toAmino(e) : undefined); } else { - obj.routing_parameters = []; + obj.routing_parameters = message.routingParameters; } return obj; }, @@ -1374,8 +1374,8 @@ export const RoutingParameter = { }, toAmino(message: RoutingParameter): RoutingParameterAmino { const obj: any = {}; - obj.field = message.field; - obj.path_template = message.pathTemplate; + obj.field = message.field === "" ? undefined : message.field; + obj.path_template = message.pathTemplate === "" ? undefined : message.pathTemplate; return obj; }, fromAminoMsg(object: RoutingParameterAminoMsg): RoutingParameter { diff --git a/__fixtures__/v-next/outputsign/google/api/service.ts b/__fixtures__/v-next/outputsign/google/api/service.ts index 4330465c7a..a3c3d4f959 100644 --- a/__fixtures__/v-next/outputsign/google/api/service.ts +++ b/__fixtures__/v-next/outputsign/google/api/service.ts @@ -647,24 +647,24 @@ export const Service = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; + obj.id = message.id === "" ? undefined : message.id; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } if (message.types) { obj.types = message.types.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.types = []; + obj.types = message.types; } if (message.enums) { obj.enums = message.enums.map(e => e ? Enum.toAmino(e) : undefined); } else { - obj.enums = []; + obj.enums = message.enums; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.backend = message.backend ? Backend.toAmino(message.backend) : undefined; @@ -676,23 +676,23 @@ export const Service = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.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 = []; + obj.logs = message.logs; } if (message.metrics) { obj.metrics = message.metrics.map(e => e ? MetricDescriptor.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.billing = message.billing ? Billing.toAmino(message.billing) : undefined; obj.logging = message.logging ? Logging.toAmino(message.logging) : undefined; diff --git a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/check_error.ts b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/check_error.ts index 86f823f39b..8717428cd8 100644 --- a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/check_error.ts +++ b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/check_error.ts @@ -323,7 +323,7 @@ export const CheckError = { fromAmino(object: CheckErrorAmino): CheckError { const message = createBaseCheckError(); if (object.code !== undefined && object.code !== null) { - message.code = checkError_CodeFromJSON(object.code); + message.code = object.code; } if (object.subject !== undefined && object.subject !== null) { message.subject = object.subject; @@ -338,9 +338,9 @@ export const CheckError = { }, toAmino(message: CheckError): CheckErrorAmino { const obj: any = {}; - obj.code = message.code; - obj.subject = message.subject; - obj.detail = message.detail; + obj.code = message.code === 0 ? undefined : message.code; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.detail = message.detail === "" ? undefined : message.detail; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/distribution.ts b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/distribution.ts index d236ea794d..2d8a7edaac 100644 --- a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/distribution.ts +++ b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/distribution.ts @@ -464,15 +464,15 @@ export const Distribution = { }, 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; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.mean = message.mean === 0 ? undefined : message.mean; + obj.minimum = message.minimum === 0 ? undefined : message.minimum; + obj.maximum = message.maximum === 0 ? undefined : message.maximum; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation === 0 ? undefined : message.sumOfSquaredDeviation; if (message.bucketCounts) { obj.bucket_counts = message.bucketCounts.map(e => e.toString()); } else { - obj.bucket_counts = []; + obj.bucket_counts = message.bucketCounts; } obj.linear_buckets = message.linearBuckets ? Distribution_LinearBuckets.toAmino(message.linearBuckets) : undefined; obj.exponential_buckets = message.exponentialBuckets ? Distribution_ExponentialBuckets.toAmino(message.exponentialBuckets) : undefined; @@ -480,7 +480,7 @@ export const Distribution = { if (message.exemplars) { obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e) : undefined); } else { - obj.exemplars = []; + obj.exemplars = message.exemplars; } return obj; }, @@ -566,9 +566,9 @@ export const Distribution_LinearBuckets = { }, toAmino(message: Distribution_LinearBuckets): Distribution_LinearBucketsAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.width = message.width; - obj.offset = message.offset; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.width = message.width === 0 ? undefined : message.width; + obj.offset = message.offset === 0 ? undefined : message.offset; return obj; }, fromAminoMsg(object: Distribution_LinearBucketsAminoMsg): Distribution_LinearBuckets { @@ -653,9 +653,9 @@ export const Distribution_ExponentialBuckets = { }, toAmino(message: Distribution_ExponentialBuckets): Distribution_ExponentialBucketsAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.growth_factor = message.growthFactor; - obj.scale = message.scale; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.growth_factor = message.growthFactor === 0 ? undefined : message.growthFactor; + obj.scale = message.scale === 0 ? undefined : message.scale; return obj; }, fromAminoMsg(object: Distribution_ExponentialBucketsAminoMsg): Distribution_ExponentialBuckets { @@ -728,7 +728,7 @@ export const Distribution_ExplicitBuckets = { if (message.bounds) { obj.bounds = message.bounds.map(e => e); } else { - obj.bounds = []; + obj.bounds = message.bounds; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/http_request.ts b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/http_request.ts index 8264d615bb..e9c41b444b 100644 --- a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/http_request.ts +++ b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/http_request.ts @@ -392,21 +392,21 @@ export const HttpRequest = { }, 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.request_method = message.requestMethod === "" ? undefined : message.requestMethod; + obj.request_url = message.requestUrl === "" ? undefined : message.requestUrl; + obj.request_size = message.requestSize !== BigInt(0) ? message.requestSize.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.response_size = message.responseSize !== BigInt(0) ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent === "" ? undefined : message.userAgent; + obj.remote_ip = message.remoteIp === "" ? undefined : message.remoteIp; + obj.server_ip = message.serverIp === "" ? undefined : message.serverIp; + obj.referer = message.referer === "" ? undefined : 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; + obj.cache_lookup = message.cacheLookup === false ? undefined : message.cacheLookup; + obj.cache_hit = message.cacheHit === false ? undefined : message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer === false ? undefined : message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes !== BigInt(0) ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest { diff --git a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/log_entry.ts b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/log_entry.ts index 88c72ca69f..c07f14bbaf 100644 --- a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/log_entry.ts +++ b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/log_entry.ts @@ -1,5 +1,5 @@ import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../protobuf/timestamp"; -import { LogSeverity, LogSeveritySDKType, logSeverityFromJSON } from "../../../logging/type/log_severity"; +import { LogSeverity, LogSeveritySDKType } from "../../../logging/type/log_severity"; import { HttpRequest, HttpRequestAmino, HttpRequestSDKType } from "./http_request"; import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../protobuf/any"; import { Struct, StructAmino, StructSDKType } from "../../../protobuf/struct"; @@ -362,8 +362,8 @@ export const LogEntry_LabelsEntry = { }, toAmino(message: LogEntry_LabelsEntry): LogEntry_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry { @@ -531,7 +531,7 @@ export const LogEntry = { message.timestamp = fromTimestamp(Timestamp.fromAmino(object.timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.http_request !== undefined && object.http_request !== null) { message.httpRequest = HttpRequest.fromAmino(object.http_request); @@ -569,12 +569,12 @@ export const LogEntry = { }, toAmino(message: LogEntry): LogEntryAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; - obj.trace = message.trace; - obj.insert_id = message.insertId; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -582,7 +582,7 @@ export const LogEntry = { }); } obj.proto_payload = message.protoPayload ? Any.toAmino(message.protoPayload) : undefined; - obj.text_payload = message.textPayload; + obj.text_payload = message.textPayload === null ? undefined : 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; @@ -681,10 +681,10 @@ export const LogEntryOperation = { }, toAmino(message: LogEntryOperation): LogEntryOperationAmino { const obj: any = {}; - obj.id = message.id; - obj.producer = message.producer; - obj.first = message.first; - obj.last = message.last; + obj.id = message.id === "" ? undefined : message.id; + obj.producer = message.producer === "" ? undefined : message.producer; + obj.first = message.first === false ? undefined : message.first; + obj.last = message.last === false ? undefined : message.last; return obj; }, fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation { @@ -771,9 +771,9 @@ export const LogEntrySourceLocation = { }, toAmino(message: LogEntrySourceLocation): LogEntrySourceLocationAmino { const obj: any = {}; - obj.file = message.file; - obj.line = message.line ? message.line.toString() : undefined; - obj.function = message.function; + obj.file = message.file === "" ? undefined : message.file; + obj.line = message.line !== BigInt(0) ? message.line.toString() : undefined; + obj.function = message.function === "" ? undefined : message.function; return obj; }, fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation { diff --git a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/metric_value.ts b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/metric_value.ts index 72c3e25d06..5bce256110 100644 --- a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/metric_value.ts +++ b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/metric_value.ts @@ -209,8 +209,8 @@ export const MetricValue_LabelsEntry = { }, toAmino(message: MetricValue_LabelsEntry): MetricValue_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MetricValue_LabelsEntryAminoMsg): MetricValue_LabelsEntry { @@ -374,10 +374,10 @@ export const MetricValue = { } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; - 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.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.distribution_value = message.distributionValue ? Distribution.toAmino(message.distributionValue) : undefined; return obj; }, @@ -450,11 +450,11 @@ export const MetricValueSet = { }, toAmino(message: MetricValueSet): MetricValueSetAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; if (message.metricValues) { obj.metric_values = message.metricValues.map(e => e ? MetricValue.toAmino(e) : undefined); } else { - obj.metric_values = []; + obj.metric_values = message.metricValues; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/operation.ts b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/operation.ts index abc8106ea2..7a62e4b7cd 100644 --- a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/operation.ts +++ b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/operation.ts @@ -308,8 +308,8 @@ export const Operation_LabelsEntry = { }, toAmino(message: Operation_LabelsEntry): Operation_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: Operation_LabelsEntryAminoMsg): Operation_LabelsEntry { @@ -470,16 +470,16 @@ export const Operation = { message.metricValueSets = object.metric_value_sets?.map(e => MetricValueSet.fromAmino(e)) || []; message.logEntries = object.log_entries?.map(e => LogEntry.fromAmino(e)) || []; if (object.importance !== undefined && object.importance !== null) { - message.importance = operation_ImportanceFromJSON(object.importance); + message.importance = object.importance; } message.extensions = object.extensions?.map(e => Any.fromAmino(e)) || []; return message; }, toAmino(message: Operation): OperationAmino { const obj: any = {}; - obj.operation_id = message.operationId; - obj.operation_name = message.operationName; - obj.consumer_id = message.consumerId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; + obj.operation_name = message.operationName === "" ? undefined : message.operationName; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; obj.labels = {}; @@ -491,18 +491,18 @@ export const Operation = { if (message.metricValueSets) { obj.metric_value_sets = message.metricValueSets.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.metric_value_sets = []; + obj.metric_value_sets = message.metricValueSets; } if (message.logEntries) { obj.log_entries = message.logEntries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.log_entries = []; + obj.log_entries = message.logEntries; } - obj.importance = message.importance; + obj.importance = message.importance === 0 ? undefined : message.importance; if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/quota_controller.ts b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/quota_controller.ts index 70ab1640aa..0ac4e43cd1 100644 --- a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/quota_controller.ts +++ b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/quota_controller.ts @@ -564,9 +564,9 @@ export const AllocateQuotaRequest = { }, toAmino(message: AllocateQuotaRequest): AllocateQuotaRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.allocate_operation = message.allocateOperation ? QuotaOperation.toAmino(message.allocateOperation) : undefined; - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: AllocateQuotaRequestAminoMsg): AllocateQuotaRequest { @@ -639,8 +639,8 @@ export const QuotaOperation_LabelsEntry = { }, toAmino(message: QuotaOperation_LabelsEntry): QuotaOperation_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaOperation_LabelsEntryAminoMsg): QuotaOperation_LabelsEntry { @@ -762,15 +762,15 @@ export const QuotaOperation = { }, {}); message.quotaMetrics = object.quota_metrics?.map(e => MetricValueSet.fromAmino(e)) || []; if (object.quota_mode !== undefined && object.quota_mode !== null) { - message.quotaMode = quotaOperation_QuotaModeFromJSON(object.quota_mode); + message.quotaMode = object.quota_mode; } return message; }, toAmino(message: QuotaOperation): QuotaOperationAmino { const obj: any = {}; - obj.operation_id = message.operationId; - obj.method_name = message.methodName; - obj.consumer_id = message.consumerId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; + obj.method_name = message.methodName === "" ? undefined : message.methodName; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -780,9 +780,9 @@ export const QuotaOperation = { if (message.quotaMetrics) { obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.quota_metrics = []; + obj.quota_metrics = message.quotaMetrics; } - obj.quota_mode = message.quotaMode; + obj.quota_mode = message.quotaMode === 0 ? undefined : message.quotaMode; return obj; }, fromAminoMsg(object: QuotaOperationAminoMsg): QuotaOperation { @@ -874,18 +874,18 @@ export const AllocateQuotaResponse = { }, toAmino(message: AllocateQuotaResponse): AllocateQuotaResponseAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; if (message.allocateErrors) { obj.allocate_errors = message.allocateErrors.map(e => e ? QuotaError.toAmino(e) : undefined); } else { - obj.allocate_errors = []; + obj.allocate_errors = message.allocateErrors; } if (message.quotaMetrics) { obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.quota_metrics = []; + obj.quota_metrics = message.quotaMetrics; } - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: AllocateQuotaResponseAminoMsg): AllocateQuotaResponse { @@ -968,7 +968,7 @@ export const QuotaError = { fromAmino(object: QuotaErrorAmino): QuotaError { const message = createBaseQuotaError(); if (object.code !== undefined && object.code !== null) { - message.code = quotaError_CodeFromJSON(object.code); + message.code = object.code; } if (object.subject !== undefined && object.subject !== null) { message.subject = object.subject; @@ -983,9 +983,9 @@ export const QuotaError = { }, toAmino(message: QuotaError): QuotaErrorAmino { const obj: any = {}; - obj.code = message.code; - obj.subject = message.subject; - obj.description = message.description; + obj.code = message.code === 0 ? undefined : message.code; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/service_controller.ts b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/service_controller.ts index 9e5fd0950e..5eda033e76 100644 --- a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/service_controller.ts +++ b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v1/service_controller.ts @@ -542,9 +542,9 @@ export const CheckRequest = { }, toAmino(message: CheckRequest): CheckRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.operation = message.operation ? Operation.toAmino(message.operation) : undefined; - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -651,14 +651,14 @@ export const CheckResponse = { }, toAmino(message: CheckResponse): CheckResponseAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; if (message.checkErrors) { obj.check_errors = message.checkErrors.map(e => e ? CheckError.toAmino(e) : undefined); } else { - obj.check_errors = []; + obj.check_errors = message.checkErrors; } - obj.service_config_id = message.serviceConfigId; - obj.service_rollout_id = message.serviceRolloutId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId === "" ? undefined : message.serviceRolloutId; obj.check_info = message.checkInfo ? CheckResponse_CheckInfo.toAmino(message.checkInfo) : undefined; return obj; }, @@ -736,7 +736,7 @@ export const CheckResponse_CheckInfo = { if (message.unusedArguments) { obj.unused_arguments = message.unusedArguments.map(e => e); } else { - obj.unused_arguments = []; + obj.unused_arguments = message.unusedArguments; } obj.consumer_info = message.consumerInfo ? CheckResponse_ConsumerInfo.toAmino(message.consumerInfo) : undefined; return obj; @@ -818,7 +818,7 @@ export const CheckResponse_ConsumerInfo = { message.projectNumber = BigInt(object.project_number); } if (object.type !== undefined && object.type !== null) { - message.type = checkResponse_ConsumerInfo_ConsumerTypeFromJSON(object.type); + message.type = object.type; } if (object.consumer_number !== undefined && object.consumer_number !== null) { message.consumerNumber = BigInt(object.consumer_number); @@ -827,9 +827,9 @@ export const CheckResponse_ConsumerInfo = { }, 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; + obj.project_number = message.projectNumber !== BigInt(0) ? message.projectNumber.toString() : undefined; + obj.type = message.type === 0 ? undefined : message.type; + obj.consumer_number = message.consumerNumber !== BigInt(0) ? message.consumerNumber.toString() : undefined; return obj; }, fromAminoMsg(object: CheckResponse_ConsumerInfoAminoMsg): CheckResponse_ConsumerInfo { @@ -912,13 +912,13 @@ export const ReportRequest = { }, toAmino(message: ReportRequest): ReportRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; if (message.operations) { obj.operations = message.operations.map(e => e ? Operation.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: ReportRequestAminoMsg): ReportRequest { @@ -1004,10 +1004,10 @@ export const ReportResponse = { if (message.reportErrors) { obj.report_errors = message.reportErrors.map(e => e ? ReportResponse_ReportError.toAmino(e) : undefined); } else { - obj.report_errors = []; + obj.report_errors = message.reportErrors; } - obj.service_config_id = message.serviceConfigId; - obj.service_rollout_id = message.serviceRolloutId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId === "" ? undefined : message.serviceRolloutId; return obj; }, fromAminoMsg(object: ReportResponseAminoMsg): ReportResponse { @@ -1083,7 +1083,7 @@ export const ReportResponse_ReportError = { }, toAmino(message: ReportResponse_ReportError): ReportResponse_ReportErrorAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v2/service_controller.ts b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v2/service_controller.ts index 5c7884215c..7af623a9f6 100644 --- a/__fixtures__/v-next/outputsign/google/api/servicecontrol/v2/service_controller.ts +++ b/__fixtures__/v-next/outputsign/google/api/servicecontrol/v2/service_controller.ts @@ -375,15 +375,15 @@ export const CheckRequest = { }, toAmino(message: CheckRequest): CheckRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.service_config_id = message.serviceConfigId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.service_config_id = message.serviceConfigId === "" ? undefined : 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.resources = message.resources; } - obj.flags = message.flags; + obj.flags = message.flags === "" ? undefined : message.flags; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -490,11 +490,11 @@ export const ResourceInfo = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; + obj.permission = message.permission === "" ? undefined : message.permission; + obj.container = message.container === "" ? undefined : message.container; + obj.location = message.location === "" ? undefined : message.location; return obj; }, fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo { @@ -567,8 +567,8 @@ export const CheckResponse_HeadersEntry = { }, toAmino(message: CheckResponse_HeadersEntry): CheckResponse_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: CheckResponse_HeadersEntryAminoMsg): CheckResponse_HeadersEntry { @@ -745,12 +745,12 @@ export const ReportRequest = { }, toAmino(message: ReportRequest): ReportRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.service_config_id = message.serviceConfigId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; if (message.operations) { obj.operations = message.operations.map(e => e ? AttributeContext.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/servicemanagement/v1/resources.ts b/__fixtures__/v-next/outputsign/google/api/servicemanagement/v1/resources.ts index 1cbf1007a9..b9701ace13 100644 --- a/__fixtures__/v-next/outputsign/google/api/servicemanagement/v1/resources.ts +++ b/__fixtures__/v-next/outputsign/google/api/servicemanagement/v1/resources.ts @@ -888,8 +888,8 @@ export const ManagedService = { }, toAmino(message: ManagedService): ManagedServiceAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.producer_project_id = message.producerProjectId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; return obj; }, fromAminoMsg(object: ManagedServiceAminoMsg): ManagedService { @@ -984,14 +984,14 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } if (message.steps) { obj.steps = message.steps.map(e => e ? OperationMetadata_Step.toAmino(e) : undefined); } else { - obj.steps = []; + obj.steps = message.steps; } - obj.progress_percentage = message.progressPercentage; + obj.progress_percentage = message.progressPercentage === 0 ? undefined : message.progressPercentage; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, @@ -1060,14 +1060,14 @@ export const OperationMetadata_Step = { message.description = object.description; } if (object.status !== undefined && object.status !== null) { - message.status = operationMetadata_StatusFromJSON(object.status); + message.status = object.status; } return message; }, toAmino(message: OperationMetadata_Step): OperationMetadata_StepAmino { const obj: any = {}; - obj.description = message.description; - obj.status = message.status; + obj.description = message.description === "" ? undefined : message.description; + obj.status = message.status === 0 ? undefined : message.status; return obj; }, fromAminoMsg(object: OperationMetadata_StepAminoMsg): OperationMetadata_Step { @@ -1143,7 +1143,7 @@ export const Diagnostic = { message.location = object.location; } if (object.kind !== undefined && object.kind !== null) { - message.kind = diagnostic_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.message !== undefined && object.message !== null) { message.message = object.message; @@ -1152,9 +1152,9 @@ export const Diagnostic = { }, toAmino(message: Diagnostic): DiagnosticAmino { const obj: any = {}; - obj.location = message.location; - obj.kind = message.kind; - obj.message = message.message; + obj.location = message.location === "" ? undefined : message.location; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: DiagnosticAminoMsg): Diagnostic { @@ -1226,11 +1226,11 @@ export const ConfigSource = { }, toAmino(message: ConfigSource): ConfigSourceAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; if (message.files) { obj.files = message.files.map(e => e ? ConfigFile.toAmino(e) : undefined); } else { - obj.files = []; + obj.files = message.files; } return obj; }, @@ -1310,15 +1310,15 @@ export const ConfigFile = { message.fileContents = bytesFromBase64(object.file_contents); } if (object.file_type !== undefined && object.file_type !== null) { - message.fileType = configFile_FileTypeFromJSON(object.file_type); + message.fileType = object.file_type; } return message; }, toAmino(message: ConfigFile): ConfigFileAmino { const obj: any = {}; - obj.file_path = message.filePath; + obj.file_path = message.filePath === "" ? undefined : message.filePath; obj.file_contents = message.fileContents ? base64FromBytes(message.fileContents) : undefined; - obj.file_type = message.fileType; + obj.file_type = message.fileType === 0 ? undefined : message.fileType; return obj; }, fromAminoMsg(object: ConfigFileAminoMsg): ConfigFile { @@ -1381,7 +1381,7 @@ export const ConfigRef = { }, toAmino(message: ConfigRef): ConfigRefAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: ConfigRefAminoMsg): ConfigRef { @@ -1445,7 +1445,7 @@ export const ChangeReport = { if (message.configChanges) { obj.config_changes = message.configChanges.map(e => e ? ConfigChange.toAmino(e) : undefined); } else { - obj.config_changes = []; + obj.config_changes = message.configChanges; } return obj; }, @@ -1564,7 +1564,7 @@ export const Rollout = { message.createdBy = object.created_by; } if (object.status !== undefined && object.status !== null) { - message.status = rollout_RolloutStatusFromJSON(object.status); + message.status = object.status; } if (object.traffic_percent_strategy !== undefined && object.traffic_percent_strategy !== null) { message.trafficPercentStrategy = Rollout_TrafficPercentStrategy.fromAmino(object.traffic_percent_strategy); @@ -1579,13 +1579,13 @@ export const Rollout = { }, toAmino(message: Rollout): RolloutAmino { const obj: any = {}; - obj.rollout_id = message.rolloutId; + obj.rollout_id = message.rolloutId === "" ? undefined : message.rolloutId; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; - obj.created_by = message.createdBy; - obj.status = message.status; + obj.created_by = message.createdBy === "" ? undefined : message.createdBy; + obj.status = message.status === 0 ? undefined : 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; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: RolloutAminoMsg): Rollout { @@ -1658,8 +1658,8 @@ export const Rollout_TrafficPercentStrategy_PercentagesEntry = { }, toAmino(message: Rollout_TrafficPercentStrategy_PercentagesEntry): Rollout_TrafficPercentStrategy_PercentagesEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: Rollout_TrafficPercentStrategy_PercentagesEntryAminoMsg): Rollout_TrafficPercentStrategy_PercentagesEntry { diff --git a/__fixtures__/v-next/outputsign/google/api/servicemanagement/v1/servicemanager.ts b/__fixtures__/v-next/outputsign/google/api/servicemanagement/v1/servicemanager.ts index 887ec34f14..2ef10484b0 100644 --- a/__fixtures__/v-next/outputsign/google/api/servicemanagement/v1/servicemanager.ts +++ b/__fixtures__/v-next/outputsign/google/api/servicemanagement/v1/servicemanager.ts @@ -827,10 +827,10 @@ export const ListServicesRequest = { }, 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; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -905,9 +905,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? ManagedService.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -970,7 +970,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -1098,7 +1098,7 @@ export const DeleteServiceRequest = { }, toAmino(message: DeleteServiceRequest): DeleteServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: DeleteServiceRequestAminoMsg): DeleteServiceRequest { @@ -1161,7 +1161,7 @@ export const UndeleteServiceRequest = { }, toAmino(message: UndeleteServiceRequest): UndeleteServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: UndeleteServiceRequestAminoMsg): UndeleteServiceRequest { @@ -1305,15 +1305,15 @@ export const GetServiceConfigRequest = { message.configId = object.config_id; } if (object.view !== undefined && object.view !== null) { - message.view = getServiceConfigRequest_ConfigViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetServiceConfigRequest): GetServiceConfigRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.config_id = message.configId; - obj.view = message.view; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.config_id = message.configId === "" ? undefined : message.configId; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetServiceConfigRequestAminoMsg): GetServiceConfigRequest { @@ -1398,9 +1398,9 @@ export const ListServiceConfigsRequest = { }, toAmino(message: ListServiceConfigsRequest): ListServiceConfigsRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListServiceConfigsRequestAminoMsg): ListServiceConfigsRequest { @@ -1475,9 +1475,9 @@ export const ListServiceConfigsResponse = { if (message.serviceConfigs) { obj.service_configs = message.serviceConfigs.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.service_configs = []; + obj.service_configs = message.serviceConfigs; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServiceConfigsResponseAminoMsg): ListServiceConfigsResponse { @@ -1553,7 +1553,7 @@ export const CreateServiceConfigRequest = { }, toAmino(message: CreateServiceConfigRequest): CreateServiceConfigRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.service_config = message.serviceConfig ? Service.toAmino(message.serviceConfig) : undefined; return obj; }, @@ -1641,9 +1641,9 @@ export const SubmitConfigSourceRequest = { }, toAmino(message: SubmitConfigSourceRequest): SubmitConfigSourceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.config_source = message.configSource ? ConfigSource.toAmino(message.configSource) : undefined; - obj.validate_only = message.validateOnly; + obj.validate_only = message.validateOnly === false ? undefined : message.validateOnly; return obj; }, fromAminoMsg(object: SubmitConfigSourceRequestAminoMsg): SubmitConfigSourceRequest { @@ -1784,7 +1784,7 @@ export const CreateServiceRolloutRequest = { }, toAmino(message: CreateServiceRolloutRequest): CreateServiceRolloutRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.rollout = message.rollout ? Rollout.toAmino(message.rollout) : undefined; return obj; }, @@ -1881,10 +1881,10 @@ export const ListServiceRolloutsRequest = { }, 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; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServiceRolloutsRequestAminoMsg): ListServiceRolloutsRequest { @@ -1959,9 +1959,9 @@ export const ListServiceRolloutsResponse = { if (message.rollouts) { obj.rollouts = message.rollouts.map(e => e ? Rollout.toAmino(e) : undefined); } else { - obj.rollouts = []; + obj.rollouts = message.rollouts; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServiceRolloutsResponseAminoMsg): ListServiceRolloutsResponse { @@ -2035,8 +2035,8 @@ export const GetServiceRolloutRequest = { }, toAmino(message: GetServiceRolloutRequest): GetServiceRolloutRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.rollout_id = message.rolloutId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.rollout_id = message.rolloutId === "" ? undefined : message.rolloutId; return obj; }, fromAminoMsg(object: GetServiceRolloutRequestAminoMsg): GetServiceRolloutRequest { @@ -2207,17 +2207,17 @@ export const GenerateConfigReportResponse = { }, toAmino(message: GenerateConfigReportResponse): GenerateConfigReportResponseAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.id = message.id; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.id = message.id === "" ? undefined : message.id; if (message.changeReports) { obj.change_reports = message.changeReports.map(e => e ? ChangeReport.toAmino(e) : undefined); } else { - obj.change_reports = []; + obj.change_reports = message.changeReports; } if (message.diagnostics) { obj.diagnostics = message.diagnostics.map(e => e ? Diagnostic.toAmino(e) : undefined); } else { - obj.diagnostics = []; + obj.diagnostics = message.diagnostics; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/serviceusage/v1/resources.ts b/__fixtures__/v-next/outputsign/google/api/serviceusage/v1/resources.ts index b1c3c2e6c7..3791d3798d 100644 --- a/__fixtures__/v-next/outputsign/google/api/serviceusage/v1/resources.ts +++ b/__fixtures__/v-next/outputsign/google/api/serviceusage/v1/resources.ts @@ -333,16 +333,16 @@ export const Service = { message.config = ServiceConfig.fromAmino(object.config); } if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: Service): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.parent = message.parent; + obj.name = message.name === "" ? undefined : message.name; + obj.parent = message.parent === "" ? undefined : message.parent; obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: ServiceAminoMsg): Service { @@ -508,12 +508,12 @@ export const ServiceConfig = { }, toAmino(message: ServiceConfig): ServiceConfigAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; @@ -522,12 +522,12 @@ export const ServiceConfig = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; return obj; @@ -593,7 +593,7 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/serviceusage/v1/serviceusage.ts b/__fixtures__/v-next/outputsign/google/api/serviceusage/v1/serviceusage.ts index 153b64ca8a..97366d4b65 100644 --- a/__fixtures__/v-next/outputsign/google/api/serviceusage/v1/serviceusage.ts +++ b/__fixtures__/v-next/outputsign/google/api/serviceusage/v1/serviceusage.ts @@ -615,7 +615,7 @@ export const EnableServiceRequest = { }, toAmino(message: EnableServiceRequest): EnableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest { @@ -759,15 +759,15 @@ export const DisableServiceRequest = { message.disableDependentServices = object.disable_dependent_services; } if (object.check_if_service_has_usage !== undefined && object.check_if_service_has_usage !== null) { - message.checkIfServiceHasUsage = disableServiceRequest_CheckIfServiceHasUsageFromJSON(object.check_if_service_has_usage); + message.checkIfServiceHasUsage = object.check_if_service_has_usage; } return message; }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.disable_dependent_services = message.disableDependentServices === false ? undefined : message.disableDependentServices; + obj.check_if_service_has_usage = message.checkIfServiceHasUsage === 0 ? undefined : message.checkIfServiceHasUsage; return obj; }, fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest { @@ -895,7 +895,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -991,10 +991,10 @@ export const ListServicesRequest = { }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -1069,9 +1069,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -1143,11 +1143,11 @@ export const BatchEnableServicesRequest = { }, toAmino(message: BatchEnableServicesRequest): BatchEnableServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.serviceIds) { obj.service_ids = message.serviceIds.map(e => e); } else { - obj.service_ids = []; + obj.service_ids = message.serviceIds; } return obj; }, @@ -1221,12 +1221,12 @@ export const BatchEnableServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } if (message.failures) { obj.failures = message.failures.map(e => e ? BatchEnableServicesResponse_EnableFailure.toAmino(e) : undefined); } else { - obj.failures = []; + obj.failures = message.failures; } return obj; }, @@ -1301,8 +1301,8 @@ export const BatchEnableServicesResponse_EnableFailure = { }, toAmino(message: BatchEnableServicesResponse_EnableFailure): BatchEnableServicesResponse_EnableFailureAmino { const obj: any = {}; - obj.service_id = message.serviceId; - obj.error_message = message.errorMessage; + obj.service_id = message.serviceId === "" ? undefined : message.serviceId; + obj.error_message = message.errorMessage === "" ? undefined : message.errorMessage; return obj; }, fromAminoMsg(object: BatchEnableServicesResponse_EnableFailureAminoMsg): BatchEnableServicesResponse_EnableFailure { @@ -1374,11 +1374,11 @@ export const BatchGetServicesRequest = { }, toAmino(message: BatchGetServicesRequest): BatchGetServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.names) { obj.names = message.names.map(e => e); } else { - obj.names = []; + obj.names = message.names; } return obj; }, @@ -1443,7 +1443,7 @@ export const BatchGetServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/serviceusage/v1beta1/resources.ts b/__fixtures__/v-next/outputsign/google/api/serviceusage/v1beta1/resources.ts index ce514471e6..5681166434 100644 --- a/__fixtures__/v-next/outputsign/google/api/serviceusage/v1beta1/resources.ts +++ b/__fixtures__/v-next/outputsign/google/api/serviceusage/v1beta1/resources.ts @@ -1147,16 +1147,16 @@ export const Service = { message.config = ServiceConfig.fromAmino(object.config); } if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: Service): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.parent = message.parent; + obj.name = message.name === "" ? undefined : message.name; + obj.parent = message.parent === "" ? undefined : message.parent; obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: ServiceAminoMsg): Service { @@ -1322,12 +1322,12 @@ export const ServiceConfig = { }, toAmino(message: ServiceConfig): ServiceConfigAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; @@ -1336,12 +1336,12 @@ export const ServiceConfig = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; return obj; @@ -1407,7 +1407,7 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, @@ -1522,20 +1522,20 @@ export const ConsumerQuotaMetric = { }, toAmino(message: ConsumerQuotaMetric): ConsumerQuotaMetricAmino { const obj: any = {}; - obj.name = message.name; - obj.metric = message.metric; - obj.display_name = message.displayName; + obj.name = message.name === "" ? undefined : message.name; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.display_name = message.displayName === "" ? undefined : message.displayName; if (message.consumerQuotaLimits) { obj.consumer_quota_limits = message.consumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e) : undefined); } else { - obj.consumer_quota_limits = []; + obj.consumer_quota_limits = message.consumerQuotaLimits; } if (message.descendantConsumerQuotaLimits) { obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e) : undefined); } else { - obj.descendant_consumer_quota_limits = []; + obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits; } - obj.unit = message.unit; + obj.unit = message.unit === "" ? undefined : message.unit; return obj; }, fromAminoMsg(object: ConsumerQuotaMetricAminoMsg): ConsumerQuotaMetric { @@ -1651,15 +1651,15 @@ export const ConsumerQuotaLimit = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.is_precise = message.isPrecise === false ? undefined : message.isPrecise; + obj.allows_admin_overrides = message.allowsAdminOverrides === false ? undefined : message.allowsAdminOverrides; if (message.quotaBuckets) { obj.quota_buckets = message.quotaBuckets.map(e => e ? QuotaBucket.toAmino(e) : undefined); } else { - obj.quota_buckets = []; + obj.quota_buckets = message.quotaBuckets; } return obj; }, @@ -1733,8 +1733,8 @@ export const QuotaBucket_DimensionsEntry = { }, toAmino(message: QuotaBucket_DimensionsEntry): QuotaBucket_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaBucket_DimensionsEntryAminoMsg): QuotaBucket_DimensionsEntry { @@ -1874,8 +1874,8 @@ export const QuotaBucket = { }, 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.effective_limit = message.effectiveLimit !== BigInt(0) ? message.effectiveLimit.toString() : undefined; + obj.default_limit = message.defaultLimit !== BigInt(0) ? 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; @@ -1957,8 +1957,8 @@ export const QuotaOverride_DimensionsEntry = { }, toAmino(message: QuotaOverride_DimensionsEntry): QuotaOverride_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaOverride_DimensionsEntryAminoMsg): QuotaOverride_DimensionsEntry { @@ -2090,17 +2090,17 @@ export const QuotaOverride = { }, toAmino(message: QuotaOverride): QuotaOverrideAmino { const obj: any = {}; - obj.name = message.name; - obj.override_value = message.overrideValue ? message.overrideValue.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.override_value = message.overrideValue !== BigInt(0) ? 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; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.admin_override_ancestor = message.adminOverrideAncestor === "" ? undefined : message.adminOverrideAncestor; return obj; }, fromAminoMsg(object: QuotaOverrideAminoMsg): QuotaOverride { @@ -2164,7 +2164,7 @@ export const OverrideInlineSource = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -2238,8 +2238,8 @@ export const AdminQuotaPolicy_DimensionsEntry = { }, toAmino(message: AdminQuotaPolicy_DimensionsEntry): AdminQuotaPolicy_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AdminQuotaPolicy_DimensionsEntryAminoMsg): AdminQuotaPolicy_DimensionsEntry { @@ -2371,17 +2371,17 @@ export const AdminQuotaPolicy = { }, toAmino(message: AdminQuotaPolicy): AdminQuotaPolicyAmino { const obj: any = {}; - obj.name = message.name; - obj.policy_value = message.policyValue ? message.policyValue.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.policy_value = message.policyValue !== BigInt(0) ? 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; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.container = message.container === "" ? undefined : message.container; return obj; }, fromAminoMsg(object: AdminQuotaPolicyAminoMsg): AdminQuotaPolicy { @@ -2455,8 +2455,8 @@ export const ServiceIdentity = { }, toAmino(message: ServiceIdentity): ServiceIdentityAmino { const obj: any = {}; - obj.email = message.email; - obj.unique_id = message.uniqueId; + obj.email = message.email === "" ? undefined : message.email; + obj.unique_id = message.uniqueId === "" ? undefined : message.uniqueId; return obj; }, fromAminoMsg(object: ServiceIdentityAminoMsg): ServiceIdentity { diff --git a/__fixtures__/v-next/outputsign/google/api/serviceusage/v1beta1/serviceusage.ts b/__fixtures__/v-next/outputsign/google/api/serviceusage/v1beta1/serviceusage.ts index dc013b040c..0ce59acd24 100644 --- a/__fixtures__/v-next/outputsign/google/api/serviceusage/v1beta1/serviceusage.ts +++ b/__fixtures__/v-next/outputsign/google/api/serviceusage/v1beta1/serviceusage.ts @@ -1,4 +1,4 @@ -import { QuotaView, QuotaViewSDKType, QuotaOverride, QuotaOverrideAmino, QuotaOverrideSDKType, QuotaSafetyCheck, QuotaSafetyCheckSDKType, OverrideInlineSource, OverrideInlineSourceAmino, OverrideInlineSourceSDKType, Service, ServiceAmino, ServiceSDKType, ConsumerQuotaMetric, ConsumerQuotaMetricAmino, ConsumerQuotaMetricSDKType, AdminQuotaPolicy, AdminQuotaPolicyAmino, AdminQuotaPolicySDKType, ServiceIdentity, ServiceIdentityAmino, ServiceIdentitySDKType, quotaViewFromJSON, quotaSafetyCheckFromJSON } from "./resources"; +import { QuotaView, QuotaViewSDKType, QuotaOverride, QuotaOverrideAmino, QuotaOverrideSDKType, QuotaSafetyCheck, QuotaSafetyCheckSDKType, OverrideInlineSource, OverrideInlineSourceAmino, OverrideInlineSourceSDKType, Service, ServiceAmino, ServiceSDKType, ConsumerQuotaMetric, ConsumerQuotaMetricAmino, ConsumerQuotaMetricSDKType, AdminQuotaPolicy, AdminQuotaPolicyAmino, AdminQuotaPolicySDKType, ServiceIdentity, ServiceIdentityAmino, ServiceIdentitySDKType } from "./resources"; import { FieldMask, FieldMaskAmino, FieldMaskSDKType } from "../../../protobuf/field_mask"; import { BinaryReader, BinaryWriter } from "../../../../binary"; import { DeepPartial } from "../../../../helpers"; @@ -1609,7 +1609,7 @@ export const EnableServiceRequest = { }, toAmino(message: EnableServiceRequest): EnableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest { @@ -1672,7 +1672,7 @@ export const DisableServiceRequest = { }, toAmino(message: DisableServiceRequest): DisableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest { @@ -1735,7 +1735,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -1831,10 +1831,10 @@ export const ListServicesRequest = { }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -1909,9 +1909,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -1983,11 +1983,11 @@ export const BatchEnableServicesRequest = { }, toAmino(message: BatchEnableServicesRequest): BatchEnableServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.serviceIds) { obj.service_ids = message.serviceIds.map(e => e); } else { - obj.service_ids = []; + obj.service_ids = message.serviceIds; } return obj; }, @@ -2078,16 +2078,16 @@ export const ListConsumerQuotaMetricsRequest = { message.pageToken = object.page_token; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: ListConsumerQuotaMetricsRequestAminoMsg): ListConsumerQuotaMetricsRequest { @@ -2162,9 +2162,9 @@ export const ListConsumerQuotaMetricsResponse = { if (message.metrics) { obj.metrics = message.metrics.map(e => e ? ConsumerQuotaMetric.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListConsumerQuotaMetricsResponseAminoMsg): ListConsumerQuotaMetricsResponse { @@ -2232,14 +2232,14 @@ export const GetConsumerQuotaMetricRequest = { message.name = object.name; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetConsumerQuotaMetricRequest): GetConsumerQuotaMetricRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.view = message.view; + obj.name = message.name === "" ? undefined : message.name; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetConsumerQuotaMetricRequestAminoMsg): GetConsumerQuotaMetricRequest { @@ -2307,14 +2307,14 @@ export const GetConsumerQuotaLimitRequest = { message.name = object.name; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetConsumerQuotaLimitRequest): GetConsumerQuotaLimitRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.view = message.view; + obj.name = message.name === "" ? undefined : message.name; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetConsumerQuotaLimitRequestAminoMsg): GetConsumerQuotaLimitRequest { @@ -2414,18 +2414,18 @@ export const CreateAdminOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: CreateAdminOverrideRequest): CreateAdminOverrideRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2539,19 +2539,19 @@ export const UpdateAdminOverrideRequest = { if (object.update_mask !== undefined && object.update_mask !== null) { message.updateMask = FieldMask.fromAmino(object.update_mask); } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: UpdateAdminOverrideRequest): UpdateAdminOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2639,17 +2639,17 @@ export const DeleteAdminOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: DeleteAdminOverrideRequest): DeleteAdminOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.force = message.force; + obj.name = message.name === "" ? undefined : message.name; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2735,9 +2735,9 @@ export const ListAdminOverridesRequest = { }, toAmino(message: ListAdminOverridesRequest): ListAdminOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListAdminOverridesRequestAminoMsg): ListAdminOverridesRequest { @@ -2812,9 +2812,9 @@ export const ListAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListAdminOverridesResponseAminoMsg): ListAdminOverridesResponse { @@ -2878,7 +2878,7 @@ export const BatchCreateAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -2979,18 +2979,18 @@ export const ImportAdminOverridesRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: ImportAdminOverridesRequest): ImportAdminOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3055,7 +3055,7 @@ export const ImportAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -3206,18 +3206,18 @@ export const CreateConsumerOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: CreateConsumerOverrideRequest): CreateConsumerOverrideRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3331,19 +3331,19 @@ export const UpdateConsumerOverrideRequest = { if (object.update_mask !== undefined && object.update_mask !== null) { message.updateMask = FieldMask.fromAmino(object.update_mask); } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: UpdateConsumerOverrideRequest): UpdateConsumerOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3431,17 +3431,17 @@ export const DeleteConsumerOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: DeleteConsumerOverrideRequest): DeleteConsumerOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.force = message.force; + obj.name = message.name === "" ? undefined : message.name; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3527,9 +3527,9 @@ export const ListConsumerOverridesRequest = { }, toAmino(message: ListConsumerOverridesRequest): ListConsumerOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListConsumerOverridesRequestAminoMsg): ListConsumerOverridesRequest { @@ -3604,9 +3604,9 @@ export const ListConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListConsumerOverridesResponseAminoMsg): ListConsumerOverridesResponse { @@ -3670,7 +3670,7 @@ export const BatchCreateConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -3771,18 +3771,18 @@ export const ImportConsumerOverridesRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: ImportConsumerOverridesRequest): ImportConsumerOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3847,7 +3847,7 @@ export const ImportConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -3962,7 +3962,7 @@ export const ImportAdminQuotaPoliciesResponse = { if (message.policies) { obj.policies = message.policies.map(e => e ? AdminQuotaPolicy.toAmino(e) : undefined); } else { - obj.policies = []; + obj.policies = message.policies; } return obj; }, @@ -4226,7 +4226,7 @@ export const GenerateServiceIdentityRequest = { }, toAmino(message: GenerateServiceIdentityRequest): GenerateServiceIdentityRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; return obj; }, fromAminoMsg(object: GenerateServiceIdentityRequestAminoMsg): GenerateServiceIdentityRequest { @@ -4296,14 +4296,14 @@ export const GetServiceIdentityResponse = { message.identity = ServiceIdentity.fromAmino(object.identity); } if (object.state !== undefined && object.state !== null) { - message.state = getServiceIdentityResponse_IdentityStateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: GetServiceIdentityResponse): GetServiceIdentityResponseAmino { const obj: any = {}; obj.identity = message.identity ? ServiceIdentity.toAmino(message.identity) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: GetServiceIdentityResponseAminoMsg): GetServiceIdentityResponse { diff --git a/__fixtures__/v-next/outputsign/google/api/source_info.ts b/__fixtures__/v-next/outputsign/google/api/source_info.ts index b82fd7b9e4..fe44a45039 100644 --- a/__fixtures__/v-next/outputsign/google/api/source_info.ts +++ b/__fixtures__/v-next/outputsign/google/api/source_info.ts @@ -69,7 +69,7 @@ export const SourceInfo = { if (message.sourceFiles) { obj.source_files = message.sourceFiles.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.source_files = []; + obj.source_files = message.sourceFiles; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/api/system_parameter.ts b/__fixtures__/v-next/outputsign/google/api/system_parameter.ts index e9682341ad..d8e2a8ee76 100644 --- a/__fixtures__/v-next/outputsign/google/api/system_parameter.ts +++ b/__fixtures__/v-next/outputsign/google/api/system_parameter.ts @@ -263,7 +263,7 @@ export const SystemParameters = { if (message.rules) { obj.rules = message.rules.map(e => e ? SystemParameterRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -336,11 +336,11 @@ export const SystemParameterRule = { }, toAmino(message: SystemParameterRule): SystemParameterRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; if (message.parameters) { obj.parameters = message.parameters.map(e => e ? SystemParameter.toAmino(e) : undefined); } else { - obj.parameters = []; + obj.parameters = message.parameters; } return obj; }, @@ -426,9 +426,9 @@ export const SystemParameter = { }, toAmino(message: SystemParameter): SystemParameterAmino { const obj: any = {}; - obj.name = message.name; - obj.http_header = message.httpHeader; - obj.url_query_parameter = message.urlQueryParameter; + obj.name = message.name === "" ? undefined : message.name; + obj.http_header = message.httpHeader === "" ? undefined : message.httpHeader; + obj.url_query_parameter = message.urlQueryParameter === "" ? undefined : message.urlQueryParameter; return obj; }, fromAminoMsg(object: SystemParameterAminoMsg): SystemParameter { diff --git a/__fixtures__/v-next/outputsign/google/api/usage.ts b/__fixtures__/v-next/outputsign/google/api/usage.ts index afafc53a3e..b7aac24eae 100644 --- a/__fixtures__/v-next/outputsign/google/api/usage.ts +++ b/__fixtures__/v-next/outputsign/google/api/usage.ts @@ -280,14 +280,14 @@ export const Usage = { if (message.requirements) { obj.requirements = message.requirements.map(e => e); } else { - obj.requirements = []; + obj.requirements = message.requirements; } if (message.rules) { obj.rules = message.rules.map(e => e ? UsageRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.producer_notification_channel = message.producerNotificationChannel; + obj.producer_notification_channel = message.producerNotificationChannel === "" ? undefined : message.producerNotificationChannel; return obj; }, fromAminoMsg(object: UsageAminoMsg): Usage { @@ -372,9 +372,9 @@ export const UsageRule = { }, toAmino(message: UsageRule): UsageRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.allow_unregistered_calls = message.allowUnregisteredCalls; - obj.skip_service_control = message.skipServiceControl; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.allow_unregistered_calls = message.allowUnregisteredCalls === false ? undefined : message.allowUnregisteredCalls; + obj.skip_service_control = message.skipServiceControl === false ? undefined : message.skipServiceControl; return obj; }, fromAminoMsg(object: UsageRuleAminoMsg): UsageRule { diff --git a/__fixtures__/v-next/outputsign/google/api/visibility.ts b/__fixtures__/v-next/outputsign/google/api/visibility.ts index 16f0ff9ba8..61f7f65fb0 100644 --- a/__fixtures__/v-next/outputsign/google/api/visibility.ts +++ b/__fixtures__/v-next/outputsign/google/api/visibility.ts @@ -221,7 +221,7 @@ export const Visibility = { if (message.rules) { obj.rules = message.rules.map(e => e ? VisibilityRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -296,8 +296,8 @@ export const VisibilityRule = { }, toAmino(message: VisibilityRule): VisibilityRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.restriction = message.restriction; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.restriction = message.restriction === "" ? undefined : message.restriction; return obj; }, fromAminoMsg(object: VisibilityRuleAminoMsg): VisibilityRule { diff --git a/__fixtures__/v-next/outputsign/google/logging/type/http_request.ts b/__fixtures__/v-next/outputsign/google/logging/type/http_request.ts index 91e0e515d0..f9b2d83b8d 100644 --- a/__fixtures__/v-next/outputsign/google/logging/type/http_request.ts +++ b/__fixtures__/v-next/outputsign/google/logging/type/http_request.ts @@ -396,21 +396,21 @@ export const HttpRequest = { }, 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.request_method = message.requestMethod === "" ? undefined : message.requestMethod; + obj.request_url = message.requestUrl === "" ? undefined : message.requestUrl; + obj.request_size = message.requestSize !== BigInt(0) ? message.requestSize.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.response_size = message.responseSize !== BigInt(0) ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent === "" ? undefined : message.userAgent; + obj.remote_ip = message.remoteIp === "" ? undefined : message.remoteIp; + obj.server_ip = message.serverIp === "" ? undefined : message.serverIp; + obj.referer = message.referer === "" ? undefined : 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; + obj.cache_lookup = message.cacheLookup === false ? undefined : message.cacheLookup; + obj.cache_hit = message.cacheHit === false ? undefined : message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer === false ? undefined : message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes !== BigInt(0) ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest { diff --git a/__fixtures__/v-next/outputsign/google/logging/v2/log_entry.ts b/__fixtures__/v-next/outputsign/google/logging/v2/log_entry.ts index 4d4999b056..62614e18bc 100644 --- a/__fixtures__/v-next/outputsign/google/logging/v2/log_entry.ts +++ b/__fixtures__/v-next/outputsign/google/logging/v2/log_entry.ts @@ -2,7 +2,7 @@ import { MonitoredResource, MonitoredResourceAmino, MonitoredResourceSDKType } f import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../protobuf/any"; import { Struct, StructAmino, StructSDKType } from "../../protobuf/struct"; import { Timestamp, TimestampAmino, TimestampSDKType } from "../../protobuf/timestamp"; -import { LogSeverity, LogSeveritySDKType, logSeverityFromJSON } from "../type/log_severity"; +import { LogSeverity, LogSeveritySDKType } from "../type/log_severity"; import { HttpRequest, HttpRequestAmino, HttpRequestSDKType } from "../type/http_request"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, toTimestamp, fromTimestamp } from "../../../helpers"; @@ -594,8 +594,8 @@ export const LogEntry_LabelsEntry = { }, toAmino(message: LogEntry_LabelsEntry): LogEntry_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry { @@ -822,7 +822,7 @@ export const LogEntry = { message.receiveTimestamp = fromTimestamp(Timestamp.fromAmino(object.receive_timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.insert_id !== undefined && object.insert_id !== null) { message.insertId = object.insert_id; @@ -860,15 +860,15 @@ export const LogEntry = { }, toAmino(message: LogEntry): LogEntryAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : 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.text_payload = message.textPayload === null ? undefined : message.textPayload; obj.json_payload = message.jsonPayload ? Struct.toAmino(message.jsonPayload) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.receive_timestamp = message.receiveTimestamp ? Timestamp.toAmino(toTimestamp(message.receiveTimestamp)) : undefined; - obj.severity = message.severity; - obj.insert_id = message.insertId; + obj.severity = message.severity === 0 ? undefined : message.severity; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; obj.labels = {}; if (message.labels) { @@ -877,9 +877,9 @@ export const LogEntry = { }); } obj.operation = message.operation ? LogEntryOperation.toAmino(message.operation) : undefined; - obj.trace = message.trace; - obj.span_id = message.spanId; - obj.trace_sampled = message.traceSampled; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.span_id = message.spanId === "" ? undefined : message.spanId; + obj.trace_sampled = message.traceSampled === false ? undefined : message.traceSampled; obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toAmino(message.sourceLocation) : undefined; obj.split = message.split ? LogSplit.toAmino(message.split) : undefined; return obj; @@ -977,10 +977,10 @@ export const LogEntryOperation = { }, toAmino(message: LogEntryOperation): LogEntryOperationAmino { const obj: any = {}; - obj.id = message.id; - obj.producer = message.producer; - obj.first = message.first; - obj.last = message.last; + obj.id = message.id === "" ? undefined : message.id; + obj.producer = message.producer === "" ? undefined : message.producer; + obj.first = message.first === false ? undefined : message.first; + obj.last = message.last === false ? undefined : message.last; return obj; }, fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation { @@ -1067,9 +1067,9 @@ export const LogEntrySourceLocation = { }, toAmino(message: LogEntrySourceLocation): LogEntrySourceLocationAmino { const obj: any = {}; - obj.file = message.file; - obj.line = message.line ? message.line.toString() : undefined; - obj.function = message.function; + obj.file = message.file === "" ? undefined : message.file; + obj.line = message.line !== BigInt(0) ? message.line.toString() : undefined; + obj.function = message.function === "" ? undefined : message.function; return obj; }, fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation { @@ -1154,9 +1154,9 @@ export const LogSplit = { }, toAmino(message: LogSplit): LogSplitAmino { const obj: any = {}; - obj.uid = message.uid; - obj.index = message.index; - obj.total_splits = message.totalSplits; + obj.uid = message.uid === "" ? undefined : message.uid; + obj.index = message.index === 0 ? undefined : message.index; + obj.total_splits = message.totalSplits === 0 ? undefined : message.totalSplits; return obj; }, fromAminoMsg(object: LogSplitAminoMsg): LogSplit { diff --git a/__fixtures__/v-next/outputsign/google/logging/v2/logging.ts b/__fixtures__/v-next/outputsign/google/logging/v2/logging.ts index c4ee0fcbcf..ea1c265724 100644 --- a/__fixtures__/v-next/outputsign/google/logging/v2/logging.ts +++ b/__fixtures__/v-next/outputsign/google/logging/v2/logging.ts @@ -995,7 +995,7 @@ export const DeleteLogRequest = { }, toAmino(message: DeleteLogRequest): DeleteLogRequestAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; return obj; }, fromAminoMsg(object: DeleteLogRequestAminoMsg): DeleteLogRequest { @@ -1068,8 +1068,8 @@ export const WriteLogEntriesRequest_LabelsEntry = { }, toAmino(message: WriteLogEntriesRequest_LabelsEntry): WriteLogEntriesRequest_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: WriteLogEntriesRequest_LabelsEntryAminoMsg): WriteLogEntriesRequest_LabelsEntry { @@ -1199,7 +1199,7 @@ export const WriteLogEntriesRequest = { }, toAmino(message: WriteLogEntriesRequest): WriteLogEntriesRequestAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; obj.resource = message.resource ? MonitoredResource.toAmino(message.resource) : undefined; obj.labels = {}; if (message.labels) { @@ -1210,10 +1210,10 @@ export const WriteLogEntriesRequest = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } - obj.partial_success = message.partialSuccess; - obj.dry_run = message.dryRun; + obj.partial_success = message.partialSuccess === false ? undefined : message.partialSuccess; + obj.dry_run = message.dryRun === false ? undefined : message.dryRun; return obj; }, fromAminoMsg(object: WriteLogEntriesRequestAminoMsg): WriteLogEntriesRequest { @@ -1338,7 +1338,7 @@ export const WriteLogEntriesPartialErrors_LogEntryErrorsEntry = { }, toAmino(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntry): WriteLogEntriesPartialErrors_LogEntryErrorsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === 0 ? undefined : message.key; obj.value = message.value ? Status.toAmino(message.value) : undefined; return obj; }, @@ -1527,12 +1527,12 @@ export const ListLogEntriesRequest = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } - obj.filter = message.filter; - obj.order_by = message.orderBy; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.order_by = message.orderBy === "" ? undefined : message.orderBy; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListLogEntriesRequestAminoMsg): ListLogEntriesRequest { @@ -1607,9 +1607,9 @@ export const ListLogEntriesResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogEntriesResponseAminoMsg): ListLogEntriesResponse { @@ -1683,8 +1683,8 @@ export const ListMonitoredResourceDescriptorsRequest = { }, toAmino(message: ListMonitoredResourceDescriptorsRequest): ListMonitoredResourceDescriptorsRequestAmino { const obj: any = {}; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListMonitoredResourceDescriptorsRequestAminoMsg): ListMonitoredResourceDescriptorsRequest { @@ -1759,9 +1759,9 @@ export const ListMonitoredResourceDescriptorsResponse = { if (message.resourceDescriptors) { obj.resource_descriptors = message.resourceDescriptors.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.resource_descriptors = []; + obj.resource_descriptors = message.resourceDescriptors; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListMonitoredResourceDescriptorsResponseAminoMsg): ListMonitoredResourceDescriptorsResponse { @@ -1855,13 +1855,13 @@ export const ListLogsRequest = { }, toAmino(message: ListLogsRequest): ListLogsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, @@ -1937,9 +1937,9 @@ export const ListLogsResponse = { if (message.logNames) { obj.log_names = message.logNames.map(e => e); } else { - obj.log_names = []; + obj.log_names = message.logNames; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogsResponseAminoMsg): ListLogsResponse { @@ -2027,9 +2027,9 @@ export const TailLogEntriesRequest = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } - obj.filter = message.filter; + obj.filter = message.filter === "" ? undefined : message.filter; obj.buffer_window = message.bufferWindow ? Duration.toAmino(message.bufferWindow) : undefined; return obj; }, @@ -2103,12 +2103,12 @@ export const TailLogEntriesResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.suppressionInfo) { obj.suppression_info = message.suppressionInfo.map(e => e ? TailLogEntriesResponse_SuppressionInfo.toAmino(e) : undefined); } else { - obj.suppression_info = []; + obj.suppression_info = message.suppressionInfo; } return obj; }, @@ -2174,7 +2174,7 @@ export const TailLogEntriesResponse_SuppressionInfo = { fromAmino(object: TailLogEntriesResponse_SuppressionInfoAmino): TailLogEntriesResponse_SuppressionInfo { const message = createBaseTailLogEntriesResponse_SuppressionInfo(); if (object.reason !== undefined && object.reason !== null) { - message.reason = tailLogEntriesResponse_SuppressionInfo_ReasonFromJSON(object.reason); + message.reason = object.reason; } if (object.suppressed_count !== undefined && object.suppressed_count !== null) { message.suppressedCount = object.suppressed_count; @@ -2183,8 +2183,8 @@ export const TailLogEntriesResponse_SuppressionInfo = { }, toAmino(message: TailLogEntriesResponse_SuppressionInfo): TailLogEntriesResponse_SuppressionInfoAmino { const obj: any = {}; - obj.reason = message.reason; - obj.suppressed_count = message.suppressedCount; + obj.reason = message.reason === 0 ? undefined : message.reason; + obj.suppressed_count = message.suppressedCount === 0 ? undefined : message.suppressedCount; return obj; }, fromAminoMsg(object: TailLogEntriesResponse_SuppressionInfoAminoMsg): TailLogEntriesResponse_SuppressionInfo { diff --git a/__fixtures__/v-next/outputsign/google/logging/v2/logging_config.ts b/__fixtures__/v-next/outputsign/google/logging/v2/logging_config.ts index 7ee2c224df..4e4d3ae971 100644 --- a/__fixtures__/v-next/outputsign/google/logging/v2/logging_config.ts +++ b/__fixtures__/v-next/outputsign/google/logging/v2/logging_config.ts @@ -3155,7 +3155,7 @@ export const LogBucket = { message.locked = object.locked; } if (object.lifecycle_state !== undefined && object.lifecycle_state !== null) { - message.lifecycleState = lifecycleStateFromJSON(object.lifecycle_state); + message.lifecycleState = object.lifecycle_state; } message.restrictedFields = object.restricted_fields?.map(e => e) || []; if (object.cmek_settings !== undefined && object.cmek_settings !== null) { @@ -3165,17 +3165,17 @@ export const LogBucket = { }, toAmino(message: LogBucket): LogBucketAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.retention_days = message.retentionDays; - obj.locked = message.locked; - obj.lifecycle_state = message.lifecycleState; + obj.retention_days = message.retentionDays === 0 ? undefined : message.retentionDays; + obj.locked = message.locked === false ? undefined : message.locked; + obj.lifecycle_state = message.lifecycleState === 0 ? undefined : message.lifecycleState; if (message.restrictedFields) { obj.restricted_fields = message.restrictedFields.map(e => e); } else { - obj.restricted_fields = []; + obj.restricted_fields = message.restrictedFields; } obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined; return obj; @@ -3284,11 +3284,11 @@ export const LogView = { }, toAmino(message: LogView): LogViewAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.filter = message.filter; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: LogViewAminoMsg): LogView { @@ -3451,7 +3451,7 @@ export const LogSink = { } message.exclusions = object.exclusions?.map(e => LogExclusion.fromAmino(e)) || []; if (object.output_version_format !== undefined && object.output_version_format !== null) { - message.outputVersionFormat = logSink_VersionFormatFromJSON(object.output_version_format); + message.outputVersionFormat = object.output_version_format; } if (object.writer_identity !== undefined && object.writer_identity !== null) { message.writerIdentity = object.writer_identity; @@ -3472,19 +3472,19 @@ export const LogSink = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.destination = message.destination === "" ? undefined : message.destination; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.description = message.description === "" ? undefined : message.description; + obj.disabled = message.disabled === false ? undefined : message.disabled; if (message.exclusions) { obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e) : undefined); } else { - obj.exclusions = []; + obj.exclusions = message.exclusions; } - obj.output_version_format = message.outputVersionFormat; - obj.writer_identity = message.writerIdentity; - obj.include_children = message.includeChildren; + obj.output_version_format = message.outputVersionFormat === 0 ? undefined : message.outputVersionFormat; + obj.writer_identity = message.writerIdentity === "" ? undefined : message.writerIdentity; + obj.include_children = message.includeChildren === false ? undefined : message.includeChildren; obj.bigquery_options = message.bigqueryOptions ? BigQueryOptions.toAmino(message.bigqueryOptions) : undefined; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; @@ -3561,8 +3561,8 @@ export const BigQueryOptions = { }, toAmino(message: BigQueryOptions): BigQueryOptionsAmino { const obj: any = {}; - obj.use_partitioned_tables = message.usePartitionedTables; - obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning; + obj.use_partitioned_tables = message.usePartitionedTables === false ? undefined : message.usePartitionedTables; + obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning === false ? undefined : message.usesTimestampColumnPartitioning; return obj; }, fromAminoMsg(object: BigQueryOptionsAminoMsg): BigQueryOptions { @@ -3647,9 +3647,9 @@ export const ListBucketsRequest = { }, toAmino(message: ListBucketsRequest): ListBucketsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListBucketsRequestAminoMsg): ListBucketsRequest { @@ -3724,9 +3724,9 @@ export const ListBucketsResponse = { if (message.buckets) { obj.buckets = message.buckets.map(e => e ? LogBucket.toAmino(e) : undefined); } else { - obj.buckets = []; + obj.buckets = message.buckets; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListBucketsResponseAminoMsg): ListBucketsResponse { @@ -3813,8 +3813,8 @@ export const CreateBucketRequest = { }, toAmino(message: CreateBucketRequest): CreateBucketRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.bucket_id = message.bucketId; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.bucket_id = message.bucketId === "" ? undefined : message.bucketId; obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined; return obj; }, @@ -3904,7 +3904,7 @@ export const UpdateBucketRequest = { }, toAmino(message: UpdateBucketRequest): UpdateBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -3969,7 +3969,7 @@ export const GetBucketRequest = { }, toAmino(message: GetBucketRequest): GetBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetBucketRequestAminoMsg): GetBucketRequest { @@ -4032,7 +4032,7 @@ export const DeleteBucketRequest = { }, toAmino(message: DeleteBucketRequest): DeleteBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteBucketRequestAminoMsg): DeleteBucketRequest { @@ -4095,7 +4095,7 @@ export const UndeleteBucketRequest = { }, toAmino(message: UndeleteBucketRequest): UndeleteBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: UndeleteBucketRequestAminoMsg): UndeleteBucketRequest { @@ -4180,9 +4180,9 @@ export const ListViewsRequest = { }, toAmino(message: ListViewsRequest): ListViewsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListViewsRequestAminoMsg): ListViewsRequest { @@ -4257,9 +4257,9 @@ export const ListViewsResponse = { if (message.views) { obj.views = message.views.map(e => e ? LogView.toAmino(e) : undefined); } else { - obj.views = []; + obj.views = message.views; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListViewsResponseAminoMsg): ListViewsResponse { @@ -4346,8 +4346,8 @@ export const CreateViewRequest = { }, toAmino(message: CreateViewRequest): CreateViewRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.view_id = message.viewId; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.view_id = message.viewId === "" ? undefined : message.viewId; obj.view = message.view ? LogView.toAmino(message.view) : undefined; return obj; }, @@ -4437,7 +4437,7 @@ export const UpdateViewRequest = { }, toAmino(message: UpdateViewRequest): UpdateViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.view = message.view ? LogView.toAmino(message.view) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -4502,7 +4502,7 @@ export const GetViewRequest = { }, toAmino(message: GetViewRequest): GetViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetViewRequestAminoMsg): GetViewRequest { @@ -4565,7 +4565,7 @@ export const DeleteViewRequest = { }, toAmino(message: DeleteViewRequest): DeleteViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteViewRequestAminoMsg): DeleteViewRequest { @@ -4650,9 +4650,9 @@ export const ListSinksRequest = { }, toAmino(message: ListSinksRequest): ListSinksRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListSinksRequestAminoMsg): ListSinksRequest { @@ -4727,9 +4727,9 @@ export const ListSinksResponse = { if (message.sinks) { obj.sinks = message.sinks.map(e => e ? LogSink.toAmino(e) : undefined); } else { - obj.sinks = []; + obj.sinks = message.sinks; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListSinksResponseAminoMsg): ListSinksResponse { @@ -4792,7 +4792,7 @@ export const GetSinkRequest = { }, toAmino(message: GetSinkRequest): GetSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; return obj; }, fromAminoMsg(object: GetSinkRequestAminoMsg): GetSinkRequest { @@ -4879,9 +4879,9 @@ export const CreateSinkRequest = { }, toAmino(message: CreateSinkRequest): CreateSinkRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined; - obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.unique_writer_identity = message.uniqueWriterIdentity === false ? undefined : message.uniqueWriterIdentity; return obj; }, fromAminoMsg(object: CreateSinkRequestAminoMsg): CreateSinkRequest { @@ -4981,9 +4981,9 @@ export const UpdateSinkRequest = { }, toAmino(message: UpdateSinkRequest): UpdateSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined; - obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.unique_writer_identity = message.uniqueWriterIdentity === false ? undefined : message.uniqueWriterIdentity; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; }, @@ -5047,7 +5047,7 @@ export const DeleteSinkRequest = { }, toAmino(message: DeleteSinkRequest): DeleteSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; return obj; }, fromAminoMsg(object: DeleteSinkRequestAminoMsg): DeleteSinkRequest { @@ -5165,10 +5165,10 @@ export const LogExclusion = { }, toAmino(message: LogExclusion): LogExclusionAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; - obj.filter = message.filter; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.disabled = message.disabled === false ? undefined : message.disabled; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; return obj; @@ -5255,9 +5255,9 @@ export const ListExclusionsRequest = { }, toAmino(message: ListExclusionsRequest): ListExclusionsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListExclusionsRequestAminoMsg): ListExclusionsRequest { @@ -5332,9 +5332,9 @@ export const ListExclusionsResponse = { if (message.exclusions) { obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e) : undefined); } else { - obj.exclusions = []; + obj.exclusions = message.exclusions; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListExclusionsResponseAminoMsg): ListExclusionsResponse { @@ -5397,7 +5397,7 @@ export const GetExclusionRequest = { }, toAmino(message: GetExclusionRequest): GetExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetExclusionRequestAminoMsg): GetExclusionRequest { @@ -5473,7 +5473,7 @@ export const CreateExclusionRequest = { }, toAmino(message: CreateExclusionRequest): CreateExclusionRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined; return obj; }, @@ -5563,7 +5563,7 @@ export const UpdateExclusionRequest = { }, toAmino(message: UpdateExclusionRequest): UpdateExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -5628,7 +5628,7 @@ export const DeleteExclusionRequest = { }, toAmino(message: DeleteExclusionRequest): DeleteExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteExclusionRequestAminoMsg): DeleteExclusionRequest { @@ -5691,7 +5691,7 @@ export const GetCmekSettingsRequest = { }, toAmino(message: GetCmekSettingsRequest): GetCmekSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetCmekSettingsRequestAminoMsg): GetCmekSettingsRequest { @@ -5780,7 +5780,7 @@ export const UpdateCmekSettingsRequest = { }, toAmino(message: UpdateCmekSettingsRequest): UpdateCmekSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -5867,9 +5867,9 @@ export const CmekSettings = { }, toAmino(message: CmekSettings): CmekSettingsAmino { const obj: any = {}; - obj.name = message.name; - obj.kms_key_name = message.kmsKeyName; - obj.service_account_id = message.serviceAccountId; + obj.name = message.name === "" ? undefined : message.name; + obj.kms_key_name = message.kmsKeyName === "" ? undefined : message.kmsKeyName; + obj.service_account_id = message.serviceAccountId === "" ? undefined : message.serviceAccountId; return obj; }, fromAminoMsg(object: CmekSettingsAminoMsg): CmekSettings { @@ -5932,7 +5932,7 @@ export const GetSettingsRequest = { }, toAmino(message: GetSettingsRequest): GetSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetSettingsRequestAminoMsg): GetSettingsRequest { @@ -6021,7 +6021,7 @@ export const UpdateSettingsRequest = { }, toAmino(message: UpdateSettingsRequest): UpdateSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.settings = message.settings ? Settings.toAmino(message.settings) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -6130,11 +6130,11 @@ export const Settings = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.kms_key_name = message.kmsKeyName === "" ? undefined : message.kmsKeyName; + obj.kms_service_account_id = message.kmsServiceAccountId === "" ? undefined : message.kmsServiceAccountId; + obj.storage_location = message.storageLocation === "" ? undefined : message.storageLocation; + obj.disable_default_sink = message.disableDefaultSink === false ? undefined : message.disableDefaultSink; return obj; }, fromAminoMsg(object: SettingsAminoMsg): Settings { @@ -6219,9 +6219,9 @@ export const CopyLogEntriesRequest = { }, toAmino(message: CopyLogEntriesRequest): CopyLogEntriesRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.filter = message.filter; - obj.destination = message.destination; + obj.name = message.name === "" ? undefined : message.name; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.destination = message.destination === "" ? undefined : message.destination; return obj; }, fromAminoMsg(object: CopyLogEntriesRequestAminoMsg): CopyLogEntriesRequest { @@ -6334,7 +6334,7 @@ export const CopyLogEntriesMetadata = { message.endTime = fromTimestamp(Timestamp.fromAmino(object.end_time)); } if (object.state !== undefined && object.state !== null) { - message.state = operationStateFromJSON(object.state); + message.state = object.state; } if (object.cancellation_requested !== undefined && object.cancellation_requested !== null) { message.cancellationRequested = object.cancellation_requested; @@ -6354,11 +6354,11 @@ export const CopyLogEntriesMetadata = { const obj: any = {}; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; - obj.state = message.state; - obj.cancellation_requested = message.cancellationRequested; + obj.state = message.state === 0 ? undefined : message.state; + obj.cancellation_requested = message.cancellationRequested === false ? undefined : message.cancellationRequested; obj.request = message.request ? CopyLogEntriesRequest.toAmino(message.request) : undefined; - obj.progress = message.progress; - obj.writer_identity = message.writerIdentity; + obj.progress = message.progress === 0 ? undefined : message.progress; + obj.writer_identity = message.writerIdentity === "" ? undefined : message.writerIdentity; return obj; }, fromAminoMsg(object: CopyLogEntriesMetadataAminoMsg): CopyLogEntriesMetadata { @@ -6423,7 +6423,7 @@ export const CopyLogEntriesResponse = { }, toAmino(message: CopyLogEntriesResponse): CopyLogEntriesResponseAmino { const obj: any = {}; - obj.log_entries_copied_count = message.logEntriesCopiedCount ? message.logEntriesCopiedCount.toString() : undefined; + obj.log_entries_copied_count = message.logEntriesCopiedCount !== BigInt(0) ? message.logEntriesCopiedCount.toString() : undefined; return obj; }, fromAminoMsg(object: CopyLogEntriesResponseAminoMsg): CopyLogEntriesResponse { diff --git a/__fixtures__/v-next/outputsign/google/logging/v2/logging_metrics.ts b/__fixtures__/v-next/outputsign/google/logging/v2/logging_metrics.ts index dbc084a538..7db1751796 100644 --- a/__fixtures__/v-next/outputsign/google/logging/v2/logging_metrics.ts +++ b/__fixtures__/v-next/outputsign/google/logging/v2/logging_metrics.ts @@ -659,8 +659,8 @@ export const LogMetric_LabelExtractorsEntry = { }, toAmino(message: LogMetric_LabelExtractorsEntry): LogMetric_LabelExtractorsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogMetric_LabelExtractorsEntryAminoMsg): LogMetric_LabelExtractorsEntry { @@ -843,18 +843,18 @@ export const LogMetric = { message.updateTime = fromTimestamp(Timestamp.fromAmino(object.update_time)); } if (object.version !== undefined && object.version !== null) { - message.version = logMetric_ApiVersionFromJSON(object.version); + message.version = object.version; } return message; }, toAmino(message: LogMetric): LogMetricAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; - obj.filter = message.filter; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.disabled = message.disabled === false ? undefined : message.disabled; obj.metric_descriptor = message.metricDescriptor ? MetricDescriptor.toAmino(message.metricDescriptor) : undefined; - obj.value_extractor = message.valueExtractor; + obj.value_extractor = message.valueExtractor === "" ? undefined : message.valueExtractor; obj.label_extractors = {}; if (message.labelExtractors) { Object.entries(message.labelExtractors).forEach(([k, v]) => { @@ -864,7 +864,7 @@ export const LogMetric = { obj.bucket_options = message.bucketOptions ? Distribution_BucketOptions.toAmino(message.bucketOptions) : undefined; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.version = message.version; + obj.version = message.version === 0 ? undefined : message.version; return obj; }, fromAminoMsg(object: LogMetricAminoMsg): LogMetric { @@ -949,9 +949,9 @@ export const ListLogMetricsRequest = { }, toAmino(message: ListLogMetricsRequest): ListLogMetricsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListLogMetricsRequestAminoMsg): ListLogMetricsRequest { @@ -1026,9 +1026,9 @@ export const ListLogMetricsResponse = { if (message.metrics) { obj.metrics = message.metrics.map(e => e ? LogMetric.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogMetricsResponseAminoMsg): ListLogMetricsResponse { @@ -1091,7 +1091,7 @@ export const GetLogMetricRequest = { }, toAmino(message: GetLogMetricRequest): GetLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; return obj; }, fromAminoMsg(object: GetLogMetricRequestAminoMsg): GetLogMetricRequest { @@ -1167,7 +1167,7 @@ export const CreateLogMetricRequest = { }, toAmino(message: CreateLogMetricRequest): CreateLogMetricRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined; return obj; }, @@ -1244,7 +1244,7 @@ export const UpdateLogMetricRequest = { }, toAmino(message: UpdateLogMetricRequest): UpdateLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined; return obj; }, @@ -1308,7 +1308,7 @@ export const DeleteLogMetricRequest = { }, toAmino(message: DeleteLogMetricRequest): DeleteLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; return obj; }, fromAminoMsg(object: DeleteLogMetricRequestAminoMsg): DeleteLogMetricRequest { diff --git a/__fixtures__/v-next/outputsign/google/longrunning/operations.ts b/__fixtures__/v-next/outputsign/google/longrunning/operations.ts index 454557c3a0..9cc4ab8c73 100644 --- a/__fixtures__/v-next/outputsign/google/longrunning/operations.ts +++ b/__fixtures__/v-next/outputsign/google/longrunning/operations.ts @@ -455,9 +455,9 @@ export const Operation = { }, toAmino(message: Operation): OperationAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.metadata = message.metadata ? Any.toAmino(message.metadata) : undefined; - obj.done = message.done; + obj.done = message.done === false ? undefined : message.done; obj.error = message.error ? Status.toAmino(message.error) : undefined; obj.response = message.response ? Any.toAmino(message.response) : undefined; return obj; @@ -522,7 +522,7 @@ export const GetOperationRequest = { }, toAmino(message: GetOperationRequest): GetOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetOperationRequestAminoMsg): GetOperationRequest { @@ -618,10 +618,10 @@ export const ListOperationsRequest = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListOperationsRequestAminoMsg): ListOperationsRequest { @@ -696,9 +696,9 @@ export const ListOperationsResponse = { if (message.operations) { obj.operations = message.operations.map(e => e ? Operation.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListOperationsResponseAminoMsg): ListOperationsResponse { @@ -761,7 +761,7 @@ export const CancelOperationRequest = { }, toAmino(message: CancelOperationRequest): CancelOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: CancelOperationRequestAminoMsg): CancelOperationRequest { @@ -824,7 +824,7 @@ export const DeleteOperationRequest = { }, toAmino(message: DeleteOperationRequest): DeleteOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteOperationRequestAminoMsg): DeleteOperationRequest { @@ -900,7 +900,7 @@ export const WaitOperationRequest = { }, toAmino(message: WaitOperationRequest): WaitOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timeout = message.timeout ? Duration.toAmino(message.timeout) : undefined; return obj; }, @@ -975,8 +975,8 @@ export const OperationInfo = { }, toAmino(message: OperationInfo): OperationInfoAmino { const obj: any = {}; - obj.response_type = message.responseType; - obj.metadata_type = message.metadataType; + obj.response_type = message.responseType === "" ? undefined : message.responseType; + obj.metadata_type = message.metadataType === "" ? undefined : message.metadataType; return obj; }, fromAminoMsg(object: OperationInfoAminoMsg): OperationInfo { diff --git a/__fixtures__/v-next/outputsign/google/protobuf/api.ts b/__fixtures__/v-next/outputsign/google/protobuf/api.ts index d3f5160c3a..6d7c91ca96 100644 --- a/__fixtures__/v-next/outputsign/google/protobuf/api.ts +++ b/__fixtures__/v-next/outputsign/google/protobuf/api.ts @@ -1,4 +1,4 @@ -import { Option, OptionAmino, OptionSDKType, Syntax, SyntaxSDKType, syntaxFromJSON } from "./type"; +import { Option, OptionAmino, OptionSDKType, Syntax, SyntaxSDKType } from "./type"; import { SourceContext, SourceContextAmino, SourceContextSDKType } from "./source_context"; import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial } from "../../helpers"; @@ -559,31 +559,31 @@ export const Api = { } message.mixins = object.mixins?.map(e => Mixin.fromAmino(e)) || []; if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Api): ApiAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.methods) { obj.methods = message.methods.map(e => e ? Method.toAmino(e) : undefined); } else { - obj.methods = []; + obj.methods = message.methods; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.version = message.version; + obj.version = message.version === "" ? undefined : 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.mixins = message.mixins; } - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: ApiAminoMsg): Api { @@ -704,23 +704,23 @@ export const Method = { } message.options = object.options?.map(e => Option.fromAmino(e)) || []; if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.request_type_url = message.requestTypeUrl === "" ? undefined : message.requestTypeUrl; + obj.request_streaming = message.requestStreaming === false ? undefined : message.requestStreaming; + obj.response_type_url = message.responseTypeUrl === "" ? undefined : message.responseTypeUrl; + obj.response_streaming = message.responseStreaming === false ? undefined : message.responseStreaming; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: MethodAminoMsg): Method { @@ -794,8 +794,8 @@ export const Mixin = { }, toAmino(message: Mixin): MixinAmino { const obj: any = {}; - obj.name = message.name; - obj.root = message.root; + obj.name = message.name === "" ? undefined : message.name; + obj.root = message.root === "" ? undefined : message.root; return obj; }, fromAminoMsg(object: MixinAminoMsg): Mixin { diff --git a/__fixtures__/v-next/outputsign/google/protobuf/compiler/plugin.ts b/__fixtures__/v-next/outputsign/google/protobuf/compiler/plugin.ts index db3c8c866e..bb56e69649 100644 --- a/__fixtures__/v-next/outputsign/google/protobuf/compiler/plugin.ts +++ b/__fixtures__/v-next/outputsign/google/protobuf/compiler/plugin.ts @@ -366,10 +366,10 @@ export const Version = { }, toAmino(message: Version): VersionAmino { const obj: any = {}; - obj.major = message.major; - obj.minor = message.minor; - obj.patch = message.patch; - obj.suffix = message.suffix; + obj.major = message.major === 0 ? undefined : message.major; + obj.minor = message.minor === 0 ? undefined : message.minor; + obj.patch = message.patch === 0 ? undefined : message.patch; + obj.suffix = message.suffix === "" ? undefined : message.suffix; return obj; }, fromAminoMsg(object: VersionAminoMsg): Version { @@ -466,13 +466,13 @@ export const CodeGeneratorRequest = { if (message.fileToGenerate) { obj.file_to_generate = message.fileToGenerate.map(e => e); } else { - obj.file_to_generate = []; + obj.file_to_generate = message.fileToGenerate; } - obj.parameter = message.parameter; + obj.parameter = message.parameter === "" ? undefined : message.parameter; if (message.protoFile) { obj.proto_file = message.protoFile.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.proto_file = []; + obj.proto_file = message.protoFile; } obj.compiler_version = message.compilerVersion ? Version.toAmino(message.compilerVersion) : undefined; return obj; @@ -546,11 +546,11 @@ export const CodeGeneratorResponse = { }, toAmino(message: CodeGeneratorResponse): CodeGeneratorResponseAmino { const obj: any = {}; - obj.error = message.error; + obj.error = message.error === "" ? undefined : message.error; if (message.file) { obj.file = message.file.map(e => e ? CodeGeneratorResponse_File.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -636,9 +636,9 @@ export const CodeGeneratorResponse_File = { }, toAmino(message: CodeGeneratorResponse_File): CodeGeneratorResponse_FileAmino { const obj: any = {}; - obj.name = message.name; - obj.insertion_point = message.insertionPoint; - obj.content = message.content; + obj.name = message.name === "" ? undefined : message.name; + obj.insertion_point = message.insertionPoint === "" ? undefined : message.insertionPoint; + obj.content = message.content === "" ? undefined : message.content; return obj; }, fromAminoMsg(object: CodeGeneratorResponse_FileAminoMsg): CodeGeneratorResponse_File { diff --git a/__fixtures__/v-next/outputsign/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputsign/google/protobuf/descriptor.ts index f69845c54b..5975d23774 100644 --- a/__fixtures__/v-next/outputsign/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputsign/google/protobuf/descriptor.ts @@ -2242,7 +2242,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -2435,46 +2435,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2622,47 +2622,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -2750,8 +2750,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -2826,8 +2826,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -2891,7 +2891,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -3029,10 +3029,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -3056,15 +3056,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -3141,7 +3141,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3245,22 +3245,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3335,8 +3335,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -3423,8 +3423,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -3510,11 +3510,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -3636,12 +3636,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -3873,7 +3873,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -3922,30 +3922,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4051,14 +4051,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4164,13 +4164,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -4186,16 +4186,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4260,7 +4260,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4344,12 +4344,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4422,11 +4422,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4499,11 +4499,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4580,19 +4580,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4727,14 +4727,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -4808,8 +4808,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -4873,7 +4873,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -4996,19 +4996,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -5073,7 +5073,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -5180,11 +5180,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/v-next/outputsign/google/protobuf/field_mask.ts b/__fixtures__/v-next/outputsign/google/protobuf/field_mask.ts index 9013273157..81b0bd1024 100644 --- a/__fixtures__/v-next/outputsign/google/protobuf/field_mask.ts +++ b/__fixtures__/v-next/outputsign/google/protobuf/field_mask.ts @@ -668,7 +668,7 @@ export const FieldMask = { if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/protobuf/source_context.ts b/__fixtures__/v-next/outputsign/google/protobuf/source_context.ts index b46e12efec..b5de1d7e69 100644 --- a/__fixtures__/v-next/outputsign/google/protobuf/source_context.ts +++ b/__fixtures__/v-next/outputsign/google/protobuf/source_context.ts @@ -82,7 +82,7 @@ export const SourceContext = { }, toAmino(message: SourceContext): SourceContextAmino { const obj: any = {}; - obj.file_name = message.fileName; + obj.file_name = message.fileName === "" ? undefined : message.fileName; return obj; }, fromAminoMsg(object: SourceContextAminoMsg): SourceContext { diff --git a/__fixtures__/v-next/outputsign/google/protobuf/struct.ts b/__fixtures__/v-next/outputsign/google/protobuf/struct.ts index 5a9c92c445..96ded1b1dd 100644 --- a/__fixtures__/v-next/outputsign/google/protobuf/struct.ts +++ b/__fixtures__/v-next/outputsign/google/protobuf/struct.ts @@ -267,7 +267,7 @@ export const Struct_FieldsEntry = { }, toAmino(message: Struct_FieldsEntry): Struct_FieldsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? Value.toAmino(message.value) : undefined; return obj; }, @@ -449,7 +449,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.number_value !== undefined && object.number_value !== null) { message.numberValue = object.number_value; @@ -470,10 +470,10 @@ export const Value = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.number_value = message.numberValue === null ? undefined : message.numberValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; obj.struct_value = message.structValue ? Struct.toAmino(message.structValue) : undefined; obj.list_value = message.listValue ? ListValue.toAmino(message.listValue) : undefined; return obj; @@ -539,7 +539,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/protobuf/type.ts b/__fixtures__/v-next/outputsign/google/protobuf/type.ts index 8a73b36005..f14b5dc170 100644 --- a/__fixtures__/v-next/outputsign/google/protobuf/type.ts +++ b/__fixtures__/v-next/outputsign/google/protobuf/type.ts @@ -586,30 +586,30 @@ export const Type = { message.sourceContext = SourceContext.fromAmino(object.source_context); } if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Type): TypeAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.fields) { obj.fields = message.fields.map(e => e ? Field.toAmino(e) : undefined); } else { - obj.fields = []; + obj.fields = message.fields; } if (message.oneofs) { obj.oneofs = message.oneofs.map(e => e); } else { - obj.oneofs = []; + obj.oneofs = message.oneofs; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: TypeAminoMsg): Type { @@ -738,10 +738,10 @@ export const Field = { fromAmino(object: FieldAmino): Field { const message = createBaseField(); if (object.kind !== undefined && object.kind !== null) { - message.kind = field_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.cardinality !== undefined && object.cardinality !== null) { - message.cardinality = field_CardinalityFromJSON(object.cardinality); + message.cardinality = object.cardinality; } if (object.number !== undefined && object.number !== null) { message.number = object.number; @@ -769,20 +769,20 @@ export const Field = { }, 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; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.cardinality = message.cardinality === 0 ? undefined : message.cardinality; + obj.number = message.number === 0 ? undefined : message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.type_url = message.typeUrl === "" ? undefined : message.typeUrl; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.packed = message.packed === false ? undefined : message.packed; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.json_name = message.jsonName; - obj.default_value = message.defaultValue; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; return obj; }, fromAminoMsg(object: FieldAminoMsg): Field { @@ -881,25 +881,25 @@ export const Enum = { message.sourceContext = SourceContext.fromAmino(object.source_context); } if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Enum): EnumAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.enumvalue) { obj.enumvalue = message.enumvalue.map(e => e ? EnumValue.toAmino(e) : undefined); } else { - obj.enumvalue = []; + obj.enumvalue = message.enumvalue; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: EnumAminoMsg): Enum { @@ -982,12 +982,12 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -1064,7 +1064,7 @@ export const Option = { }, toAmino(message: Option): OptionAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.value = message.value ? Any.toAmino(message.value) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/google/protobuf/wrappers.ts b/__fixtures__/v-next/outputsign/google/protobuf/wrappers.ts index 01989ad297..54378694b9 100644 --- a/__fixtures__/v-next/outputsign/google/protobuf/wrappers.ts +++ b/__fixtures__/v-next/outputsign/google/protobuf/wrappers.ts @@ -351,7 +351,7 @@ export const DoubleValue = { }, toAmino(message: DoubleValue): DoubleValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: DoubleValueAminoMsg): DoubleValue { @@ -414,7 +414,7 @@ export const FloatValue = { }, toAmino(message: FloatValue): FloatValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: FloatValueAminoMsg): FloatValue { @@ -479,7 +479,7 @@ export const Int64Value = { }, toAmino(message: Int64Value): Int64ValueAmino { const obj: any = {}; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: Int64ValueAminoMsg): Int64Value { @@ -544,7 +544,7 @@ export const UInt64Value = { }, toAmino(message: UInt64Value): UInt64ValueAmino { const obj: any = {}; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: UInt64ValueAminoMsg): UInt64Value { @@ -607,7 +607,7 @@ export const Int32Value = { }, toAmino(message: Int32Value): Int32ValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: Int32ValueAminoMsg): Int32Value { @@ -670,7 +670,7 @@ export const UInt32Value = { }, toAmino(message: UInt32Value): UInt32ValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: UInt32ValueAminoMsg): UInt32Value { @@ -733,7 +733,7 @@ export const BoolValue = { }, toAmino(message: BoolValue): BoolValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === false ? undefined : message.value; return obj; }, fromAminoMsg(object: BoolValueAminoMsg): BoolValue { @@ -796,7 +796,7 @@ export const StringValue = { }, toAmino(message: StringValue): StringValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: StringValueAminoMsg): StringValue { diff --git a/__fixtures__/v-next/outputsign/google/rpc/context/attribute_context.ts b/__fixtures__/v-next/outputsign/google/rpc/context/attribute_context.ts index fda192bdbe..049f4b86ad 100644 --- a/__fixtures__/v-next/outputsign/google/rpc/context/attribute_context.ts +++ b/__fixtures__/v-next/outputsign/google/rpc/context/attribute_context.ts @@ -1148,7 +1148,7 @@ export const AttributeContext = { if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, @@ -1222,8 +1222,8 @@ export const AttributeContext_Peer_LabelsEntry = { }, toAmino(message: AttributeContext_Peer_LabelsEntry): AttributeContext_Peer_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Peer_LabelsEntryAminoMsg): AttributeContext_Peer_LabelsEntry { @@ -1344,16 +1344,16 @@ export const AttributeContext_Peer = { }, toAmino(message: AttributeContext_Peer): AttributeContext_PeerAmino { const obj: any = {}; - obj.ip = message.ip; - obj.port = message.port ? message.port.toString() : undefined; + obj.ip = message.ip === "" ? undefined : message.ip; + obj.port = message.port !== BigInt(0) ? 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; + obj.principal = message.principal === "" ? undefined : message.principal; + obj.region_code = message.regionCode === "" ? undefined : message.regionCode; return obj; }, fromAminoMsg(object: AttributeContext_PeerAminoMsg): AttributeContext_Peer { @@ -1449,10 +1449,10 @@ export const AttributeContext_Api = { }, 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; + obj.service = message.service === "" ? undefined : message.service; + obj.operation = message.operation === "" ? undefined : message.operation; + obj.protocol = message.protocol === "" ? undefined : message.protocol; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: AttributeContext_ApiAminoMsg): AttributeContext_Api { @@ -1557,18 +1557,18 @@ export const AttributeContext_Auth = { }, toAmino(message: AttributeContext_Auth): AttributeContext_AuthAmino { const obj: any = {}; - obj.principal = message.principal; + obj.principal = message.principal === "" ? undefined : message.principal; if (message.audiences) { obj.audiences = message.audiences.map(e => e); } else { - obj.audiences = []; + obj.audiences = message.audiences; } - obj.presenter = message.presenter; + obj.presenter = message.presenter === "" ? undefined : 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 = []; + obj.access_levels = message.accessLevels; } return obj; }, @@ -1642,8 +1642,8 @@ export const AttributeContext_Request_HeadersEntry = { }, toAmino(message: AttributeContext_Request_HeadersEntry): AttributeContext_Request_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Request_HeadersEntryAminoMsg): AttributeContext_Request_HeadersEntry { @@ -1843,22 +1843,22 @@ export const AttributeContext_Request = { }, toAmino(message: AttributeContext_Request): AttributeContext_RequestAmino { const obj: any = {}; - obj.id = message.id; - obj.method = message.method; + obj.id = message.id === "" ? undefined : message.id; + obj.method = message.method === "" ? undefined : 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.path = message.path === "" ? undefined : message.path; + obj.host = message.host === "" ? undefined : message.host; + obj.scheme = message.scheme === "" ? undefined : message.scheme; + obj.query = message.query === "" ? undefined : message.query; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.size = message.size ? message.size.toString() : undefined; - obj.protocol = message.protocol; - obj.reason = message.reason; + obj.size = message.size !== BigInt(0) ? message.size.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; + obj.reason = message.reason === "" ? undefined : message.reason; obj.auth = message.auth ? AttributeContext_Auth.toAmino(message.auth) : undefined; return obj; }, @@ -1932,8 +1932,8 @@ export const AttributeContext_Response_HeadersEntry = { }, toAmino(message: AttributeContext_Response_HeadersEntry): AttributeContext_Response_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Response_HeadersEntryAminoMsg): AttributeContext_Response_HeadersEntry { @@ -2058,8 +2058,8 @@ export const AttributeContext_Response = { }, 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.code = message.code !== BigInt(0) ? message.code.toString() : undefined; + obj.size = message.size !== BigInt(0) ? message.size.toString() : undefined; obj.headers = {}; if (message.headers) { Object.entries(message.headers).forEach(([k, v]) => { @@ -2140,8 +2140,8 @@ export const AttributeContext_Resource_LabelsEntry = { }, toAmino(message: AttributeContext_Resource_LabelsEntry): AttributeContext_Resource_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Resource_LabelsEntryAminoMsg): AttributeContext_Resource_LabelsEntry { @@ -2208,8 +2208,8 @@ export const AttributeContext_Resource_AnnotationsEntry = { }, toAmino(message: AttributeContext_Resource_AnnotationsEntry): AttributeContext_Resource_AnnotationsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Resource_AnnotationsEntryAminoMsg): AttributeContext_Resource_AnnotationsEntry { @@ -2423,28 +2423,28 @@ export const AttributeContext_Resource = { }, toAmino(message: AttributeContext_Resource): AttributeContext_ResourceAmino { const obj: any = {}; - obj.service = message.service; - obj.name = message.name; - obj.type = message.type; + obj.service = message.service === "" ? undefined : message.service; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { obj.labels[k] = v; }); } - obj.uid = message.uid; + obj.uid = message.uid === "" ? undefined : message.uid; obj.annotations = {}; if (message.annotations) { Object.entries(message.annotations).forEach(([k, v]) => { obj.annotations[k] = v; }); } - obj.display_name = message.displayName; + obj.display_name = message.displayName === "" ? undefined : message.displayName; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; obj.delete_time = message.deleteTime ? Timestamp.toAmino(toTimestamp(message.deleteTime)) : undefined; - obj.etag = message.etag; - obj.location = message.location; + obj.etag = message.etag === "" ? undefined : message.etag; + obj.location = message.location === "" ? undefined : message.location; return obj; }, fromAminoMsg(object: AttributeContext_ResourceAminoMsg): AttributeContext_Resource { diff --git a/__fixtures__/v-next/outputsign/google/rpc/error_details.ts b/__fixtures__/v-next/outputsign/google/rpc/error_details.ts index 333ee77b26..34f587a075 100644 --- a/__fixtures__/v-next/outputsign/google/rpc/error_details.ts +++ b/__fixtures__/v-next/outputsign/google/rpc/error_details.ts @@ -899,9 +899,9 @@ export const DebugInfo = { if (message.stackEntries) { obj.stack_entries = message.stackEntries.map(e => e); } else { - obj.stack_entries = []; + obj.stack_entries = message.stackEntries; } - obj.detail = message.detail; + obj.detail = message.detail === "" ? undefined : message.detail; return obj; }, fromAminoMsg(object: DebugInfoAminoMsg): DebugInfo { @@ -965,7 +965,7 @@ export const QuotaFailure = { if (message.violations) { obj.violations = message.violations.map(e => e ? QuotaFailure_Violation.toAmino(e) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -1040,8 +1040,8 @@ export const QuotaFailure_Violation = { }, toAmino(message: QuotaFailure_Violation): QuotaFailure_ViolationAmino { const obj: any = {}; - obj.subject = message.subject; - obj.description = message.description; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: QuotaFailure_ViolationAminoMsg): QuotaFailure_Violation { @@ -1114,8 +1114,8 @@ export const ErrorInfo_MetadataEntry = { }, toAmino(message: ErrorInfo_MetadataEntry): ErrorInfo_MetadataEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: ErrorInfo_MetadataEntryAminoMsg): ErrorInfo_MetadataEntry { @@ -1212,8 +1212,8 @@ export const ErrorInfo = { }, toAmino(message: ErrorInfo): ErrorInfoAmino { const obj: any = {}; - obj.reason = message.reason; - obj.domain = message.domain; + obj.reason = message.reason === "" ? undefined : message.reason; + obj.domain = message.domain === "" ? undefined : message.domain; obj.metadata = {}; if (message.metadata) { Object.entries(message.metadata).forEach(([k, v]) => { @@ -1283,7 +1283,7 @@ export const PreconditionFailure = { if (message.violations) { obj.violations = message.violations.map(e => e ? PreconditionFailure_Violation.toAmino(e) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -1369,9 +1369,9 @@ export const PreconditionFailure_Violation = { }, toAmino(message: PreconditionFailure_Violation): PreconditionFailure_ViolationAmino { const obj: any = {}; - obj.type = message.type; - obj.subject = message.subject; - obj.description = message.description; + obj.type = message.type === "" ? undefined : message.type; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: PreconditionFailure_ViolationAminoMsg): PreconditionFailure_Violation { @@ -1435,7 +1435,7 @@ export const BadRequest = { if (message.fieldViolations) { obj.field_violations = message.fieldViolations.map(e => e ? BadRequest_FieldViolation.toAmino(e) : undefined); } else { - obj.field_violations = []; + obj.field_violations = message.fieldViolations; } return obj; }, @@ -1510,8 +1510,8 @@ export const BadRequest_FieldViolation = { }, toAmino(message: BadRequest_FieldViolation): BadRequest_FieldViolationAmino { const obj: any = {}; - obj.field = message.field; - obj.description = message.description; + obj.field = message.field === "" ? undefined : message.field; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: BadRequest_FieldViolationAminoMsg): BadRequest_FieldViolation { @@ -1585,8 +1585,8 @@ export const RequestInfo = { }, toAmino(message: RequestInfo): RequestInfoAmino { const obj: any = {}; - obj.request_id = message.requestId; - obj.serving_data = message.servingData; + obj.request_id = message.requestId === "" ? undefined : message.requestId; + obj.serving_data = message.servingData === "" ? undefined : message.servingData; return obj; }, fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo { @@ -1682,10 +1682,10 @@ export const ResourceInfo = { }, 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; + obj.resource_type = message.resourceType === "" ? undefined : message.resourceType; + obj.resource_name = message.resourceName === "" ? undefined : message.resourceName; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo { @@ -1749,7 +1749,7 @@ export const Help = { if (message.links) { obj.links = message.links.map(e => e ? Help_Link.toAmino(e) : undefined); } else { - obj.links = []; + obj.links = message.links; } return obj; }, @@ -1824,8 +1824,8 @@ export const Help_Link = { }, toAmino(message: Help_Link): Help_LinkAmino { const obj: any = {}; - obj.description = message.description; - obj.url = message.url; + obj.description = message.description === "" ? undefined : message.description; + obj.url = message.url === "" ? undefined : message.url; return obj; }, fromAminoMsg(object: Help_LinkAminoMsg): Help_Link { @@ -1899,8 +1899,8 @@ export const LocalizedMessage = { }, toAmino(message: LocalizedMessage): LocalizedMessageAmino { const obj: any = {}; - obj.locale = message.locale; - obj.message = message.message; + obj.locale = message.locale === "" ? undefined : message.locale; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: LocalizedMessageAminoMsg): LocalizedMessage { diff --git a/__fixtures__/v-next/outputsign/google/rpc/status.ts b/__fixtures__/v-next/outputsign/google/rpc/status.ts index e92d6596a9..7950a0ad7d 100644 --- a/__fixtures__/v-next/outputsign/google/rpc/status.ts +++ b/__fixtures__/v-next/outputsign/google/rpc/status.ts @@ -136,12 +136,12 @@ export const Status = { }, toAmino(message: Status): StatusAmino { const obj: any = {}; - obj.code = message.code; - obj.message = message.message; + obj.code = message.code === 0 ? undefined : message.code; + obj.message = message.message === "" ? undefined : message.message; if (message.details) { obj.details = message.details.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.details = []; + obj.details = message.details; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/helpers.ts b/__fixtures__/v-next/outputsign/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/v-next/outputsign/helpers.ts +++ b/__fixtures__/v-next/outputsign/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/genesis.ts b/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/genesis.ts index a88b54ea68..25e9d86d2d 100644 --- a/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/genesis.ts @@ -94,11 +94,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.port_id = message.portId; + obj.port_id = message.portId === "" ? undefined : message.portId; if (message.denomTraces) { obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e) : undefined); } else { - obj.denom_traces = []; + obj.denom_traces = message.denomTraces; } obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/query.ts b/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/query.ts index 1ad53dd2ae..c63c9b3d99 100644 --- a/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/query.ts +++ b/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/query.ts @@ -212,7 +212,7 @@ export const QueryDenomTraceRequest = { }, toAmino(message: QueryDenomTraceRequest): QueryDenomTraceRequestAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === "" ? undefined : message.hash; return obj; }, fromAminoMsg(object: QueryDenomTraceRequestAminoMsg): QueryDenomTraceRequest { @@ -437,7 +437,7 @@ export const QueryDenomTracesResponse = { if (message.denomTraces) { obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e) : undefined); } else { - obj.denom_traces = []; + obj.denom_traces = message.denomTraces; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/transfer.ts b/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/transfer.ts index e17d159caf..aa68a510b7 100644 --- a/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/transfer.ts +++ b/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/transfer.ts @@ -152,8 +152,8 @@ export const DenomTrace = { }, toAmino(message: DenomTrace): DenomTraceAmino { const obj: any = {}; - obj.path = message.path; - obj.base_denom = message.baseDenom; + obj.path = message.path === "" ? undefined : message.path; + obj.base_denom = message.baseDenom === "" ? undefined : message.baseDenom; return obj; }, fromAminoMsg(object: DenomTraceAminoMsg): DenomTrace { @@ -233,8 +233,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.send_enabled = message.sendEnabled; - obj.receive_enabled = message.receiveEnabled; + obj.send_enabled = message.sendEnabled === false ? undefined : message.sendEnabled; + obj.receive_enabled = message.receiveEnabled === false ? undefined : message.receiveEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/tx.ts b/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/tx.ts index 7eb83a8dd9..5b25137327 100644 --- a/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/tx.ts +++ b/__fixtures__/v-next/outputsign/ibc/applications/transfer/v1/tx.ts @@ -209,13 +209,13 @@ export const MsgTransfer = { }, toAmino(message: MsgTransfer): MsgTransferAmino { const obj: any = {}; - obj.source_port = message.sourcePort; - obj.source_channel = message.sourceChannel; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; obj.token = message.token ? Coin.toAmino(message.token) : undefined; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromAminoMsg(object: MsgTransferAminoMsg): MsgTransfer { diff --git a/__fixtures__/v-next/outputsign/ibc/applications/transfer/v2/packet.ts b/__fixtures__/v-next/outputsign/ibc/applications/transfer/v2/packet.ts index 0983c99175..f1d0762c97 100644 --- a/__fixtures__/v-next/outputsign/ibc/applications/transfer/v2/packet.ts +++ b/__fixtures__/v-next/outputsign/ibc/applications/transfer/v2/packet.ts @@ -127,10 +127,10 @@ export const FungibleTokenPacketData = { }, toAmino(message: FungibleTokenPacketData): FungibleTokenPacketDataAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: FungibleTokenPacketDataAminoMsg): FungibleTokenPacketData { diff --git a/__fixtures__/v-next/outputsign/ibc/core/channel/v1/channel.ts b/__fixtures__/v-next/outputsign/ibc/core/channel/v1/channel.ts index 059653883c..f8ec911247 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/channel/v1/channel.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/channel/v1/channel.ts @@ -502,10 +502,10 @@ export const Channel = { fromAmino(object: ChannelAmino): Channel { const message = createBaseChannel(); if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -518,15 +518,15 @@ export const Channel = { }, toAmino(message: Channel): ChannelAmino { const obj: any = {}; - obj.state = message.state; - obj.ordering = message.ordering; + obj.state = message.state === 0 ? undefined : message.state; + obj.ordering = message.ordering === 0 ? undefined : 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.connection_hops = message.connectionHops; } - obj.version = message.version; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: ChannelAminoMsg): Channel { @@ -639,10 +639,10 @@ export const IdentifiedChannel = { fromAmino(object: IdentifiedChannelAmino): IdentifiedChannel { const message = createBaseIdentifiedChannel(); if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -661,17 +661,17 @@ export const IdentifiedChannel = { }, toAmino(message: IdentifiedChannel): IdentifiedChannelAmino { const obj: any = {}; - obj.state = message.state; - obj.ordering = message.ordering; + obj.state = message.state === 0 ? undefined : message.state; + obj.ordering = message.ordering === 0 ? undefined : 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.connection_hops = message.connectionHops; } - obj.version = message.version; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.version = message.version === "" ? undefined : message.version; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: IdentifiedChannelAminoMsg): IdentifiedChannel { @@ -751,8 +751,8 @@ export const Counterparty = { }, toAmino(message: Counterparty): CounterpartyAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: CounterpartyAminoMsg): Counterparty { @@ -904,14 +904,14 @@ export const Packet = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; + obj.destination_port = message.destinationPort === "" ? undefined : message.destinationPort; + obj.destination_channel = message.destinationChannel === "" ? undefined : message.destinationChannel; obj.data = message.data ? base64FromBytes(message.data) : undefined; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromAminoMsg(object: PacketAminoMsg): Packet { @@ -1015,9 +1015,9 @@ export const PacketState = { }, 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.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1099,7 +1099,7 @@ export const Acknowledgement = { toAmino(message: Acknowledgement): AcknowledgementAmino { const obj: any = {}; obj.result = message.result ? base64FromBytes(message.result) : undefined; - obj.error = message.error; + obj.error = message.error === null ? undefined : message.error; return obj; }, fromAminoMsg(object: AcknowledgementAminoMsg): Acknowledgement { diff --git a/__fixtures__/v-next/outputsign/ibc/core/channel/v1/genesis.ts b/__fixtures__/v-next/outputsign/ibc/core/channel/v1/genesis.ts index 53bba7e4e4..abb4d1ffe3 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/channel/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/channel/v1/genesis.ts @@ -192,39 +192,39 @@ export const GenesisState = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } if (message.acknowledgements) { obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.acknowledgements = []; + obj.acknowledgements = message.acknowledgements; } if (message.commitments) { obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.commitments = []; + obj.commitments = message.commitments; } if (message.receipts) { obj.receipts = message.receipts.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.receipts = []; + obj.receipts = message.receipts; } if (message.sendSequences) { obj.send_sequences = message.sendSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.send_sequences = []; + obj.send_sequences = message.sendSequences; } if (message.recvSequences) { obj.recv_sequences = message.recvSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.recv_sequences = []; + obj.recv_sequences = message.recvSequences; } if (message.ackSequences) { obj.ack_sequences = message.ackSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.ack_sequences = []; + obj.ack_sequences = message.ackSequences; } - obj.next_channel_sequence = message.nextChannelSequence ? message.nextChannelSequence.toString() : undefined; + obj.next_channel_sequence = message.nextChannelSequence !== BigInt(0) ? message.nextChannelSequence.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -317,9 +317,9 @@ export const PacketSequence = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: PacketSequenceAminoMsg): PacketSequence { diff --git a/__fixtures__/v-next/outputsign/ibc/core/channel/v1/query.ts b/__fixtures__/v-next/outputsign/ibc/core/channel/v1/query.ts index 08facd76f0..0b88c38a40 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/channel/v1/query.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/channel/v1/query.ts @@ -1082,8 +1082,8 @@ export const QueryChannelRequest = { }, toAmino(message: QueryChannelRequest): QueryChannelRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryChannelRequestAminoMsg): QueryChannelRequest { @@ -1347,7 +1347,7 @@ export const QueryChannelsResponse = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -1432,7 +1432,7 @@ export const QueryConnectionChannelsRequest = { }, toAmino(message: QueryConnectionChannelsRequest): QueryConnectionChannelsRequestAmino { const obj: any = {}; - obj.connection = message.connection; + obj.connection = message.connection === "" ? undefined : message.connection; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1529,7 +1529,7 @@ export const QueryConnectionChannelsResponse = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -1612,8 +1612,8 @@ export const QueryChannelClientStateRequest = { }, toAmino(message: QueryChannelClientStateRequest): QueryChannelClientStateRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryChannelClientStateRequestAminoMsg): QueryChannelClientStateRequest { @@ -1816,10 +1816,10 @@ export const QueryChannelConsensusStateRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryChannelConsensusStateRequestAminoMsg): QueryChannelConsensusStateRequest { @@ -1926,7 +1926,7 @@ export const QueryChannelConsensusStateResponse = { toAmino(message: QueryChannelConsensusStateResponse): QueryChannelConsensusStateResponseAmino { const obj: any = {}; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; @@ -2021,9 +2021,9 @@ export const QueryPacketCommitmentRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketCommitmentRequestAminoMsg): QueryPacketCommitmentRequest { @@ -2211,8 +2211,8 @@ export const QueryPacketCommitmentsRequest = { }, toAmino(message: QueryPacketCommitmentsRequest): QueryPacketCommitmentsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2309,7 +2309,7 @@ export const QueryPacketCommitmentsResponse = { if (message.commitments) { obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.commitments = []; + obj.commitments = message.commitments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -2405,9 +2405,9 @@ export const QueryPacketReceiptRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketReceiptRequestAminoMsg): QueryPacketReceiptRequest { @@ -2500,7 +2500,7 @@ export const QueryPacketReceiptResponse = { }, toAmino(message: QueryPacketReceiptResponse): QueryPacketReceiptResponseAmino { const obj: any = {}; - obj.received = message.received; + obj.received = message.received === false ? undefined : message.received; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; @@ -2595,9 +2595,9 @@ export const QueryPacketAcknowledgementRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketAcknowledgementRequestAminoMsg): QueryPacketAcknowledgementRequest { @@ -2803,13 +2803,13 @@ export const QueryPacketAcknowledgementsRequest = { }, toAmino(message: QueryPacketAcknowledgementsRequest): QueryPacketAcknowledgementsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : 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 = []; + obj.packet_commitment_sequences = message.packetCommitmentSequences; } return obj; }, @@ -2906,7 +2906,7 @@ export const QueryPacketAcknowledgementsResponse = { if (message.acknowledgements) { obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.acknowledgements = []; + obj.acknowledgements = message.acknowledgements; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -3007,12 +3007,12 @@ export const QueryUnreceivedPacketsRequest = { }, toAmino(message: QueryUnreceivedPacketsRequest): QueryUnreceivedPacketsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; if (message.packetCommitmentSequences) { obj.packet_commitment_sequences = message.packetCommitmentSequences.map(e => e.toString()); } else { - obj.packet_commitment_sequences = []; + obj.packet_commitment_sequences = message.packetCommitmentSequences; } return obj; }, @@ -3105,7 +3105,7 @@ export const QueryUnreceivedPacketsResponse = { if (message.sequences) { obj.sequences = message.sequences.map(e => e.toString()); } else { - obj.sequences = []; + obj.sequences = message.sequences; } obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; @@ -3205,12 +3205,12 @@ export const QueryUnreceivedAcksRequest = { }, toAmino(message: QueryUnreceivedAcksRequest): QueryUnreceivedAcksRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; if (message.packetAckSequences) { obj.packet_ack_sequences = message.packetAckSequences.map(e => e.toString()); } else { - obj.packet_ack_sequences = []; + obj.packet_ack_sequences = message.packetAckSequences; } return obj; }, @@ -3303,7 +3303,7 @@ export const QueryUnreceivedAcksResponse = { if (message.sequences) { obj.sequences = message.sequences.map(e => e.toString()); } else { - obj.sequences = []; + obj.sequences = message.sequences; } obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; @@ -3385,8 +3385,8 @@ export const QueryNextSequenceReceiveRequest = { }, toAmino(message: QueryNextSequenceReceiveRequest): QueryNextSequenceReceiveRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryNextSequenceReceiveRequestAminoMsg): QueryNextSequenceReceiveRequest { @@ -3481,7 +3481,7 @@ export const QueryNextSequenceReceiveResponse = { }, toAmino(message: QueryNextSequenceReceiveResponse): QueryNextSequenceReceiveResponseAmino { const obj: any = {}; - obj.next_sequence_receive = message.nextSequenceReceive ? message.nextSequenceReceive.toString() : undefined; + obj.next_sequence_receive = message.nextSequenceReceive !== BigInt(0) ? message.nextSequenceReceive.toString() : undefined; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; diff --git a/__fixtures__/v-next/outputsign/ibc/core/channel/v1/tx.ts b/__fixtures__/v-next/outputsign/ibc/core/channel/v1/tx.ts index f65ff15546..c3a832e68f 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/channel/v1/tx.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/channel/v1/tx.ts @@ -611,9 +611,9 @@ export const MsgChannelOpenInit = { }, toAmino(message: MsgChannelOpenInit): MsgChannelOpenInitAmino { const obj: any = {}; - obj.port_id = message.portId; + obj.port_id = message.portId === "" ? undefined : message.portId; obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenInitAminoMsg): MsgChannelOpenInit { @@ -808,13 +808,13 @@ export const MsgChannelOpenTry = { }, toAmino(message: MsgChannelOpenTry): MsgChannelOpenTryAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.previous_channel_id = message.previousChannelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.previous_channel_id = message.previousChannelId === "" ? undefined : message.previousChannelId; obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; - obj.counterparty_version = message.counterpartyVersion; + obj.counterparty_version = message.counterpartyVersion === "" ? undefined : message.counterpartyVersion; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenTryAminoMsg): MsgChannelOpenTry { @@ -1007,13 +1007,13 @@ export const MsgChannelOpenAck = { }, 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.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.counterparty_channel_id = message.counterpartyChannelId === "" ? undefined : message.counterpartyChannelId; + obj.counterparty_version = message.counterpartyVersion === "" ? undefined : message.counterpartyVersion; obj.proof_try = message.proofTry ? base64FromBytes(message.proofTry) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenAckAminoMsg): MsgChannelOpenAck { @@ -1184,11 +1184,11 @@ export const MsgChannelOpenConfirm = { }, toAmino(message: MsgChannelOpenConfirm): MsgChannelOpenConfirmAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.proof_ack = message.proofAck ? base64FromBytes(message.proofAck) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenConfirmAminoMsg): MsgChannelOpenConfirm { @@ -1335,9 +1335,9 @@ export const MsgChannelCloseInit = { }, toAmino(message: MsgChannelCloseInit): MsgChannelCloseInitAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; - obj.signer = message.signer; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelCloseInitAminoMsg): MsgChannelCloseInit { @@ -1508,11 +1508,11 @@ export const MsgChannelCloseConfirm = { }, toAmino(message: MsgChannelCloseConfirm): MsgChannelCloseConfirmAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelCloseConfirmAminoMsg): MsgChannelCloseConfirm { @@ -1677,7 +1677,7 @@ export const MsgRecvPacket = { obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; obj.proof_commitment = message.proofCommitment ? base64FromBytes(message.proofCommitment) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgRecvPacketAminoMsg): MsgRecvPacket { @@ -1855,8 +1855,8 @@ export const MsgTimeout = { obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; obj.proof_unreceived = message.proofUnreceived ? base64FromBytes(message.proofUnreceived) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; - obj.signer = message.signer; + obj.next_sequence_recv = message.nextSequenceRecv !== BigInt(0) ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgTimeoutAminoMsg): MsgTimeout { @@ -2046,8 +2046,8 @@ export const MsgTimeoutOnClose = { obj.proof_unreceived = message.proofUnreceived ? base64FromBytes(message.proofUnreceived) : undefined; obj.proof_close = message.proofClose ? base64FromBytes(message.proofClose) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; - obj.signer = message.signer; + obj.next_sequence_recv = message.nextSequenceRecv !== BigInt(0) ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgTimeoutOnCloseAminoMsg): MsgTimeoutOnClose { @@ -2224,7 +2224,7 @@ export const MsgAcknowledgement = { obj.acknowledgement = message.acknowledgement ? base64FromBytes(message.acknowledgement) : undefined; obj.proof_acked = message.proofAcked ? base64FromBytes(message.proofAcked) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgAcknowledgementAminoMsg): MsgAcknowledgement { diff --git a/__fixtures__/v-next/outputsign/ibc/core/client/v1/client.ts b/__fixtures__/v-next/outputsign/ibc/core/client/v1/client.ts index 2b73b40b0d..67fb71c5fe 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/client/v1/client.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/client/v1/client.ts @@ -362,7 +362,7 @@ export const IdentifiedClientState = { }, toAmino(message: IdentifiedClientState): IdentifiedClientStateAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; return obj; }, @@ -526,11 +526,11 @@ export const ClientConsensusStates = { }, toAmino(message: ClientConsensusStates): ClientConsensusStatesAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.consensusStates) { obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e) : undefined); } else { - obj.consensus_states = []; + obj.consensus_states = message.consensusStates; } return obj; }, @@ -633,10 +633,10 @@ export const ClientUpdateProposal = { }, 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; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.subject_client_id = message.subjectClientId === "" ? undefined : message.subjectClientId; + obj.substitute_client_id = message.substituteClientId === "" ? undefined : message.substituteClientId; return obj; }, fromAminoMsg(object: ClientUpdateProposalAminoMsg): ClientUpdateProposal { @@ -742,8 +742,8 @@ export const UpgradeProposal = { }, toAmino(message: UpgradeProposal): UpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; return obj; @@ -825,8 +825,8 @@ export const Height = { }, 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; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: HeightAminoMsg): Height { @@ -896,7 +896,7 @@ export const Params = { if (message.allowedClients) { obj.allowed_clients = message.allowedClients.map(e => e); } else { - obj.allowed_clients = []; + obj.allowed_clients = message.allowedClients; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/ibc/core/client/v1/genesis.ts b/__fixtures__/v-next/outputsign/ibc/core/client/v1/genesis.ts index f663a3e8ff..0cdbb035ba 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/client/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/client/v1/genesis.ts @@ -215,21 +215,21 @@ export const GenesisState = { if (message.clients) { obj.clients = message.clients.map(e => e ? IdentifiedClientState.toAmino(e) : undefined); } else { - obj.clients = []; + obj.clients = message.clients; } if (message.clientsConsensus) { obj.clients_consensus = message.clientsConsensus.map(e => e ? ClientConsensusStates.toAmino(e) : undefined); } else { - obj.clients_consensus = []; + obj.clients_consensus = message.clientsConsensus; } if (message.clientsMetadata) { obj.clients_metadata = message.clientsMetadata.map(e => e ? IdentifiedGenesisMetadata.toAmino(e) : undefined); } else { - obj.clients_metadata = []; + obj.clients_metadata = message.clientsMetadata; } obj.params = message.params ? Params.toAmino(message.params) : undefined; - obj.create_localhost = message.createLocalhost; - obj.next_client_sequence = message.nextClientSequence ? message.nextClientSequence.toString() : undefined; + obj.create_localhost = message.createLocalhost === false ? undefined : message.createLocalhost; + obj.next_client_sequence = message.nextClientSequence !== BigInt(0) ? message.nextClientSequence.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -388,11 +388,11 @@ export const IdentifiedGenesisMetadata = { }, toAmino(message: IdentifiedGenesisMetadata): IdentifiedGenesisMetadataAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.clientMetadata) { obj.client_metadata = message.clientMetadata.map(e => e ? GenesisMetadata.toAmino(e) : undefined); } else { - obj.client_metadata = []; + obj.client_metadata = message.clientMetadata; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/ibc/core/client/v1/query.ts b/__fixtures__/v-next/outputsign/ibc/core/client/v1/query.ts index d554bf9610..9bfb9c80c2 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/client/v1/query.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/client/v1/query.ts @@ -580,7 +580,7 @@ export const QueryClientStateRequest = { }, toAmino(message: QueryClientStateRequest): QueryClientStateRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientStateRequestAminoMsg): QueryClientStateRequest { @@ -831,7 +831,7 @@ export const QueryClientStatesResponse = { if (message.clientStates) { obj.client_states = message.clientStates.map(e => e ? IdentifiedClientState.toAmino(e) : undefined); } else { - obj.client_states = []; + obj.client_states = message.clientStates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -939,10 +939,10 @@ export const QueryConsensusStateRequest = { }, 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; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; + obj.latest_height = message.latestHeight === false ? undefined : message.latestHeight; return obj; }, fromAminoMsg(object: QueryConsensusStateRequestAminoMsg): QueryConsensusStateRequest { @@ -1121,7 +1121,7 @@ export const QueryConsensusStatesRequest = { }, toAmino(message: QueryConsensusStatesRequest): QueryConsensusStatesRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1205,7 +1205,7 @@ export const QueryConsensusStatesResponse = { if (message.consensusStates) { obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e) : undefined); } else { - obj.consensus_states = []; + obj.consensus_states = message.consensusStates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1276,7 +1276,7 @@ export const QueryClientStatusRequest = { }, toAmino(message: QueryClientStatusRequest): QueryClientStatusRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientStatusRequestAminoMsg): QueryClientStatusRequest { @@ -1345,7 +1345,7 @@ export const QueryClientStatusResponse = { }, toAmino(message: QueryClientStatusResponse): QueryClientStatusResponseAmino { const obj: any = {}; - obj.status = message.status; + obj.status = message.status === "" ? undefined : message.status; return obj; }, fromAminoMsg(object: QueryClientStatusResponseAminoMsg): QueryClientStatusResponse { diff --git a/__fixtures__/v-next/outputsign/ibc/core/client/v1/tx.ts b/__fixtures__/v-next/outputsign/ibc/core/client/v1/tx.ts index 5d49da0716..c872d076ba 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/client/v1/tx.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/client/v1/tx.ts @@ -321,7 +321,7 @@ export const MsgCreateClient = { 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; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgCreateClientAminoMsg): MsgCreateClient { @@ -470,9 +470,9 @@ export const MsgUpdateClient = { }, toAmino(message: MsgUpdateClient): MsgUpdateClientAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.header = message.header ? Any.toAmino(message.header) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgUpdateClientAminoMsg): MsgUpdateClient { @@ -656,12 +656,12 @@ export const MsgUpgradeClient = { }, toAmino(message: MsgUpgradeClient): MsgUpgradeClientAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : 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 ? base64FromBytes(message.proofUpgradeClient) : undefined; obj.proof_upgrade_consensus_state = message.proofUpgradeConsensusState ? base64FromBytes(message.proofUpgradeConsensusState) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgUpgradeClientAminoMsg): MsgUpgradeClient { @@ -810,9 +810,9 @@ export const MsgSubmitMisbehaviour = { }, toAmino(message: MsgSubmitMisbehaviour): MsgSubmitMisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.misbehaviour = message.misbehaviour ? Any.toAmino(message.misbehaviour) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgSubmitMisbehaviourAminoMsg): MsgSubmitMisbehaviour { diff --git a/__fixtures__/v-next/outputsign/ibc/core/commitment/v1/commitment.ts b/__fixtures__/v-next/outputsign/ibc/core/commitment/v1/commitment.ts index 7bb365b08e..0fc9bfb2e2 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/commitment/v1/commitment.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/commitment/v1/commitment.ts @@ -316,7 +316,7 @@ export const MerklePath = { if (message.keyPath) { obj.key_path = message.keyPath.map(e => e); } else { - obj.key_path = []; + obj.key_path = message.keyPath; } return obj; }, @@ -387,7 +387,7 @@ export const MerkleProof = { if (message.proofs) { obj.proofs = message.proofs.map(e => e ? CommitmentProof.toAmino(e) : undefined); } else { - obj.proofs = []; + obj.proofs = message.proofs; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/ibc/core/connection/v1/connection.ts b/__fixtures__/v-next/outputsign/ibc/core/connection/v1/connection.ts index 073570dc60..16484b13a6 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/connection/v1/connection.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/connection/v1/connection.ts @@ -427,7 +427,7 @@ export const ConnectionEnd = { } message.versions = object.versions?.map(e => Version.fromAmino(e)) || []; if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -439,15 +439,15 @@ export const ConnectionEnd = { }, toAmino(message: ConnectionEnd): ConnectionEndAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.versions) { obj.versions = message.versions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.versions = []; + obj.versions = message.versions; } - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; return obj; }, fromAminoMsg(object: ConnectionEndAminoMsg): ConnectionEnd { @@ -561,7 +561,7 @@ export const IdentifiedConnection = { } message.versions = object.versions?.map(e => Version.fromAmino(e)) || []; if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -573,16 +573,16 @@ export const IdentifiedConnection = { }, toAmino(message: IdentifiedConnection): IdentifiedConnectionAmino { const obj: any = {}; - obj.id = message.id; - obj.client_id = message.clientId; + obj.id = message.id === "" ? undefined : message.id; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.versions) { obj.versions = message.versions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.versions = []; + obj.versions = message.versions; } - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; return obj; }, fromAminoMsg(object: IdentifiedConnectionAminoMsg): IdentifiedConnection { @@ -675,8 +675,8 @@ export const Counterparty = { }, toAmino(message: Counterparty): CounterpartyAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.connection_id = message.connectionId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.prefix = message.prefix ? MerklePrefix.toAmino(message.prefix) : undefined; return obj; }, @@ -747,7 +747,7 @@ export const ClientPaths = { if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, @@ -826,11 +826,11 @@ export const ConnectionPaths = { }, toAmino(message: ConnectionPaths): ConnectionPathsAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, @@ -909,11 +909,11 @@ export const Version = { }, toAmino(message: Version): VersionAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; if (message.features) { obj.features = message.features.map(e => e); } else { - obj.features = []; + obj.features = message.features; } return obj; }, @@ -985,7 +985,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.max_expected_time_per_block = message.maxExpectedTimePerBlock ? message.maxExpectedTimePerBlock.toString() : undefined; + obj.max_expected_time_per_block = message.maxExpectedTimePerBlock !== BigInt(0) ? message.maxExpectedTimePerBlock.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/ibc/core/connection/v1/genesis.ts b/__fixtures__/v-next/outputsign/ibc/core/connection/v1/genesis.ts index c9935c8c4e..42a954642e 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/connection/v1/genesis.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/connection/v1/genesis.ts @@ -113,14 +113,14 @@ export const GenesisState = { if (message.connections) { obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e) : undefined); } else { - obj.connections = []; + obj.connections = message.connections; } if (message.clientConnectionPaths) { obj.client_connection_paths = message.clientConnectionPaths.map(e => e ? ConnectionPaths.toAmino(e) : undefined); } else { - obj.client_connection_paths = []; + obj.client_connection_paths = message.clientConnectionPaths; } - obj.next_connection_sequence = message.nextConnectionSequence ? message.nextConnectionSequence.toString() : undefined; + obj.next_connection_sequence = message.nextConnectionSequence !== BigInt(0) ? message.nextConnectionSequence.toString() : undefined; obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/ibc/core/connection/v1/query.ts b/__fixtures__/v-next/outputsign/ibc/core/connection/v1/query.ts index bb5a77e207..0f55ed6ebd 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/connection/v1/query.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/connection/v1/query.ts @@ -421,7 +421,7 @@ export const QueryConnectionRequest = { }, toAmino(message: QueryConnectionRequest): QueryConnectionRequestAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromAminoMsg(object: QueryConnectionRequestAminoMsg): QueryConnectionRequest { @@ -685,7 +685,7 @@ export const QueryConnectionsResponse = { if (message.connections) { obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e) : undefined); } else { - obj.connections = []; + obj.connections = message.connections; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -757,7 +757,7 @@ export const QueryClientConnectionsRequest = { }, toAmino(message: QueryClientConnectionsRequest): QueryClientConnectionsRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientConnectionsRequestAminoMsg): QueryClientConnectionsRequest { @@ -851,7 +851,7 @@ export const QueryClientConnectionsResponse = { if (message.connectionPaths) { obj.connection_paths = message.connectionPaths.map(e => e); } else { - obj.connection_paths = []; + obj.connection_paths = message.connectionPaths; } obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; @@ -923,7 +923,7 @@ export const QueryConnectionClientStateRequest = { }, toAmino(message: QueryConnectionClientStateRequest): QueryConnectionClientStateRequestAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromAminoMsg(object: QueryConnectionClientStateRequestAminoMsg): QueryConnectionClientStateRequest { @@ -1115,9 +1115,9 @@ export const QueryConnectionConsensusStateRequest = { }, 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; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryConnectionConsensusStateRequestAminoMsg): QueryConnectionConsensusStateRequest { @@ -1224,7 +1224,7 @@ export const QueryConnectionConsensusStateResponse = { toAmino(message: QueryConnectionConsensusStateResponse): QueryConnectionConsensusStateResponseAmino { const obj: any = {}; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; diff --git a/__fixtures__/v-next/outputsign/ibc/core/connection/v1/tx.ts b/__fixtures__/v-next/outputsign/ibc/core/connection/v1/tx.ts index f955dcedac..62eb881bf8 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/connection/v1/tx.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/connection/v1/tx.ts @@ -403,11 +403,11 @@ export const MsgConnectionOpenInit = { }, toAmino(message: MsgConnectionOpenInit): MsgConnectionOpenInitAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : 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; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenInitAminoMsg): MsgConnectionOpenInit { @@ -661,22 +661,22 @@ export const MsgConnectionOpenTry = { }, toAmino(message: MsgConnectionOpenTry): MsgConnectionOpenTryAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.previous_connection_id = message.previousConnectionId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.previous_connection_id = message.previousConnectionId === "" ? undefined : 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; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; if (message.counterpartyVersions) { obj.counterparty_versions = message.counterpartyVersions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.counterparty_versions = []; + obj.counterparty_versions = message.counterpartyVersions; } obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_client = message.proofClient ? base64FromBytes(message.proofClient) : undefined; obj.proof_consensus = message.proofConsensus ? base64FromBytes(message.proofConsensus) : undefined; obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenTryAminoMsg): MsgConnectionOpenTry { @@ -908,8 +908,8 @@ export const MsgConnectionOpenAck = { }, toAmino(message: MsgConnectionOpenAck): MsgConnectionOpenAckAmino { const obj: any = {}; - obj.connection_id = message.connectionId; - obj.counterparty_connection_id = message.counterpartyConnectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.counterparty_connection_id = message.counterpartyConnectionId === "" ? undefined : 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) : {}; @@ -917,7 +917,7 @@ export const MsgConnectionOpenAck = { obj.proof_client = message.proofClient ? base64FromBytes(message.proofClient) : undefined; obj.proof_consensus = message.proofConsensus ? base64FromBytes(message.proofConsensus) : undefined; obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenAckAminoMsg): MsgConnectionOpenAck { @@ -1077,10 +1077,10 @@ export const MsgConnectionOpenConfirm = { }, toAmino(message: MsgConnectionOpenConfirm): MsgConnectionOpenConfirmAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.proof_ack = message.proofAck ? base64FromBytes(message.proofAck) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenConfirmAminoMsg): MsgConnectionOpenConfirm { diff --git a/__fixtures__/v-next/outputsign/ibc/core/port/v1/query.ts b/__fixtures__/v-next/outputsign/ibc/core/port/v1/query.ts index 9436fafb69..99431b6457 100644 --- a/__fixtures__/v-next/outputsign/ibc/core/port/v1/query.ts +++ b/__fixtures__/v-next/outputsign/ibc/core/port/v1/query.ts @@ -1,4 +1,4 @@ -import { Order, OrderSDKType, Counterparty, CounterpartyAmino, CounterpartySDKType, orderFromJSON } from "../../channel/v1/channel"; +import { Order, OrderSDKType, Counterparty, CounterpartyAmino, CounterpartySDKType } from "../../channel/v1/channel"; import { BinaryReader, BinaryWriter } from "../../../../binary"; import { DeepPartial } from "../../../../helpers"; export const protobufPackage = "ibc.core.port.v1"; @@ -149,7 +149,7 @@ export const QueryAppVersionRequest = { message.connectionId = object.connection_id; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -161,11 +161,11 @@ export const QueryAppVersionRequest = { }, toAmino(message: QueryAppVersionRequest): QueryAppVersionRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.connection_id = message.connectionId; - obj.ordering = message.ordering; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.ordering = message.ordering === 0 ? undefined : message.ordering; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.proposed_version = message.proposedVersion; + obj.proposed_version = message.proposedVersion === "" ? undefined : message.proposedVersion; return obj; }, fromAminoMsg(object: QueryAppVersionRequestAminoMsg): QueryAppVersionRequest { @@ -245,8 +245,8 @@ export const QueryAppVersionResponse = { }, toAmino(message: QueryAppVersionResponse): QueryAppVersionResponseAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.version = message.version; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: QueryAppVersionResponseAminoMsg): QueryAppVersionResponse { diff --git a/__fixtures__/v-next/outputsign/ibc/lightclients/localhost/v1/localhost.ts b/__fixtures__/v-next/outputsign/ibc/lightclients/localhost/v1/localhost.ts index 26c293de7b..3f637cb136 100644 --- a/__fixtures__/v-next/outputsign/ibc/lightclients/localhost/v1/localhost.ts +++ b/__fixtures__/v-next/outputsign/ibc/lightclients/localhost/v1/localhost.ts @@ -95,7 +95,7 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; }, diff --git a/__fixtures__/v-next/outputsign/ibc/lightclients/solomachine/v1/solomachine.ts b/__fixtures__/v-next/outputsign/ibc/lightclients/solomachine/v1/solomachine.ts index f5ea47491f..405113c9db 100644 --- a/__fixtures__/v-next/outputsign/ibc/lightclients/solomachine/v1/solomachine.ts +++ b/__fixtures__/v-next/outputsign/ibc/lightclients/solomachine/v1/solomachine.ts @@ -730,10 +730,10 @@ export const ClientState = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.frozen_sequence = message.frozenSequence !== BigInt(0) ? message.frozenSequence.toString() : undefined; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; - obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal === false ? undefined : message.allowUpdateAfterProposal; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -829,8 +829,8 @@ export const ConsensusState = { 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; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { @@ -949,11 +949,11 @@ export const Header = { }, toAmino(message: Header): HeaderAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderAminoMsg): Header { @@ -1061,8 +1061,8 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.sequence = message.sequence !== BigInt(0) ? 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; @@ -1156,7 +1156,7 @@ export const SignatureAndData = { message.signature = bytesFromBase64(object.signature); } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1169,9 +1169,9 @@ export const SignatureAndData = { toAmino(message: SignatureAndData): SignatureAndDataAmino { const obj: any = {}; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; - obj.data_type = message.dataType; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { @@ -1254,7 +1254,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { @@ -1362,7 +1362,7 @@ export const SignBytes = { message.diversifier = object.diversifier; } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1371,10 +1371,10 @@ export const SignBytes = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1458,7 +1458,7 @@ export const HeaderData = { toAmino(message: HeaderData): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { @@ -2104,7 +2104,7 @@ export const NextSequenceRecvData = { toAmino(message: NextSequenceRecvData): NextSequenceRecvDataAmino { const obj: any = {}; obj.path = message.path ? base64FromBytes(message.path) : undefined; - obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + obj.next_seq_recv = message.nextSeqRecv !== BigInt(0) ? message.nextSeqRecv.toString() : undefined; return obj; }, fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData { diff --git a/__fixtures__/v-next/outputsign/ibc/lightclients/solomachine/v2/solomachine.ts b/__fixtures__/v-next/outputsign/ibc/lightclients/solomachine/v2/solomachine.ts index 4feceef551..c59c46562f 100644 --- a/__fixtures__/v-next/outputsign/ibc/lightclients/solomachine/v2/solomachine.ts +++ b/__fixtures__/v-next/outputsign/ibc/lightclients/solomachine/v2/solomachine.ts @@ -728,10 +728,10 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.is_frozen = message.isFrozen; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.is_frozen = message.isFrozen === false ? undefined : message.isFrozen; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; - obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal === false ? undefined : message.allowUpdateAfterProposal; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -827,8 +827,8 @@ export const ConsensusState = { 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; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { @@ -947,11 +947,11 @@ export const Header = { }, toAmino(message: Header): HeaderAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderAminoMsg): Header { @@ -1059,8 +1059,8 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.sequence = message.sequence !== BigInt(0) ? 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; @@ -1154,7 +1154,7 @@ export const SignatureAndData = { message.signature = bytesFromBase64(object.signature); } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1167,9 +1167,9 @@ export const SignatureAndData = { toAmino(message: SignatureAndData): SignatureAndDataAmino { const obj: any = {}; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; - obj.data_type = message.dataType; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { @@ -1252,7 +1252,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { @@ -1360,7 +1360,7 @@ export const SignBytes = { message.diversifier = object.diversifier; } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1369,10 +1369,10 @@ export const SignBytes = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1456,7 +1456,7 @@ export const HeaderData = { toAmino(message: HeaderData): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { @@ -2102,7 +2102,7 @@ export const NextSequenceRecvData = { toAmino(message: NextSequenceRecvData): NextSequenceRecvDataAmino { const obj: any = {}; obj.path = message.path ? base64FromBytes(message.path) : undefined; - obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + obj.next_seq_recv = message.nextSeqRecv !== BigInt(0) ? message.nextSeqRecv.toString() : undefined; return obj; }, fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData { diff --git a/__fixtures__/v-next/outputsign/ibc/lightclients/tendermint/v1/tendermint.ts b/__fixtures__/v-next/outputsign/ibc/lightclients/tendermint/v1/tendermint.ts index b7a07ef1e5..1c5e1bc05f 100644 --- a/__fixtures__/v-next/outputsign/ibc/lightclients/tendermint/v1/tendermint.ts +++ b/__fixtures__/v-next/outputsign/ibc/lightclients/tendermint/v1/tendermint.ts @@ -452,7 +452,7 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : 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; @@ -462,15 +462,15 @@ export const ClientState = { if (message.proofSpecs) { obj.proof_specs = message.proofSpecs.map(e => e ? ProofSpec.toAmino(e) : undefined); } else { - obj.proof_specs = []; + obj.proof_specs = message.proofSpecs; } if (message.upgradePath) { obj.upgrade_path = message.upgradePath.map(e => e); } else { - obj.upgrade_path = []; + obj.upgrade_path = message.upgradePath; } - obj.allow_update_after_expiry = message.allowUpdateAfterExpiry; - obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour; + obj.allow_update_after_expiry = message.allowUpdateAfterExpiry === false ? undefined : message.allowUpdateAfterExpiry; + obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour === false ? undefined : message.allowUpdateAfterMisbehaviour; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -660,7 +660,7 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.header_1 = message.header1 ? Header.toAmino(message.header1) : undefined; obj.header_2 = message.header2 ? Header.toAmino(message.header2) : undefined; return obj; @@ -859,8 +859,8 @@ export const Fraction = { }, toAmino(message: Fraction): FractionAmino { const obj: any = {}; - obj.numerator = message.numerator ? message.numerator.toString() : undefined; - obj.denominator = message.denominator ? message.denominator.toString() : undefined; + obj.numerator = message.numerator !== BigInt(0) ? message.numerator.toString() : undefined; + obj.denominator = message.denominator !== BigInt(0) ? message.denominator.toString() : undefined; return obj; }, fromAminoMsg(object: FractionAminoMsg): Fraction { diff --git a/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/claim.ts b/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/claim.ts index 8edfb815df..8ab10b084c 100644 --- a/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/claim.ts +++ b/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/claim.ts @@ -155,16 +155,16 @@ export const ClaimRecord = { }, toAmino(message: ClaimRecord): ClaimRecordAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.initialClaimableAmount) { obj.initial_claimable_amount = message.initialClaimableAmount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_claimable_amount = []; + obj.initial_claimable_amount = message.initialClaimableAmount; } if (message.actionCompleted) { obj.action_completed = message.actionCompleted.map(e => e); } else { - obj.action_completed = []; + obj.action_completed = message.actionCompleted; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/genesis.ts index c3c1346dfd..76800dbd94 100644 --- a/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/genesis.ts @@ -109,7 +109,7 @@ export const GenesisState = { if (message.claimRecords) { obj.claim_records = message.claimRecords.map(e => e ? ClaimRecord.toAmino(e) : undefined); } else { - obj.claim_records = []; + obj.claim_records = message.claimRecords; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/params.ts b/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/params.ts index a84146c6c6..e93e26b37f 100644 --- a/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/params.ts +++ b/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/params.ts @@ -118,7 +118,7 @@ export const Params = { obj.airdrop_start_time = message.airdropStartTime ? Timestamp.toAmino(toTimestamp(message.airdropStartTime)) : undefined; 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; + obj.claim_denom = message.claimDenom === "" ? undefined : message.claimDenom; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/query.ts b/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/query.ts index 09fc887ef3..8be21c224d 100644 --- a/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/osmosis/claim/v1beta1/query.ts @@ -1,4 +1,4 @@ -import { Action, ActionSDKType, ClaimRecord, ClaimRecordAmino, ClaimRecordSDKType, actionFromJSON } from "./claim"; +import { Action, ActionSDKType, ClaimRecord, ClaimRecordAmino, ClaimRecordSDKType } from "./claim"; import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { Params, ParamsAmino, ParamsSDKType } from "./params"; import { BinaryReader, BinaryWriter } from "../../../binary"; @@ -282,7 +282,7 @@ export const QueryModuleAccountBalanceResponse = { if (message.moduleAccountBalance) { obj.moduleAccountBalance = message.moduleAccountBalance.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.moduleAccountBalance = []; + obj.moduleAccountBalance = message.moduleAccountBalance; } return obj; }, @@ -479,7 +479,7 @@ export const QueryClaimRecordRequest = { }, toAmino(message: QueryClaimRecordRequest): QueryClaimRecordRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryClaimRecordRequestAminoMsg): QueryClaimRecordRequest { @@ -624,14 +624,14 @@ export const QueryClaimableForActionRequest = { message.address = object.address; } if (object.action !== undefined && object.action !== null) { - message.action = actionFromJSON(object.action); + message.action = object.action; } return message; }, toAmino(message: QueryClaimableForActionRequest): QueryClaimableForActionRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.action = message.action; + obj.address = message.address === "" ? undefined : message.address; + obj.action = message.action === 0 ? undefined : message.action; return obj; }, fromAminoMsg(object: QueryClaimableForActionRequestAminoMsg): QueryClaimableForActionRequest { @@ -701,7 +701,7 @@ export const QueryClaimableForActionResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -771,7 +771,7 @@ export const QueryTotalClaimableRequest = { }, toAmino(message: QueryTotalClaimableRequest): QueryTotalClaimableRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryTotalClaimableRequestAminoMsg): QueryTotalClaimableRequest { @@ -841,7 +841,7 @@ export const QueryTotalClaimableResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/epochs/genesis.ts b/__fixtures__/v-next/outputsign/osmosis/epochs/genesis.ts index ae76c5067f..7ba395a91a 100644 --- a/__fixtures__/v-next/outputsign/osmosis/epochs/genesis.ts +++ b/__fixtures__/v-next/outputsign/osmosis/epochs/genesis.ts @@ -276,13 +276,13 @@ export const EpochInfo = { }, toAmino(message: EpochInfo): EpochInfoAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; obj.current_epoch_start_time = message.currentEpochStartTime ? Timestamp.toAmino(toTimestamp(message.currentEpochStartTime)) : undefined; - obj.epoch_counting_started = message.epochCountingStarted; - obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + obj.epoch_counting_started = message.epochCountingStarted === false ? undefined : message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight !== BigInt(0) ? message.currentEpochStartHeight.toString() : undefined; return obj; }, fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo { @@ -352,7 +352,7 @@ export const GenesisState = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/epochs/query.ts b/__fixtures__/v-next/outputsign/osmosis/epochs/query.ts index ccc919c128..7ce53fb8c5 100644 --- a/__fixtures__/v-next/outputsign/osmosis/epochs/query.ts +++ b/__fixtures__/v-next/outputsign/osmosis/epochs/query.ts @@ -165,7 +165,7 @@ export const QueryEpochsInfoResponse = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, @@ -235,7 +235,7 @@ export const QueryCurrentEpochRequest = { }, toAmino(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; return obj; }, fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest { @@ -306,7 +306,7 @@ export const QueryCurrentEpochResponse = { }, toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { const obj: any = {}; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse { diff --git a/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/balancer/balancerPool.ts b/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/balancer/balancerPool.ts index 1d6dc82695..beb5dc31db 100644 --- a/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/balancer/balancerPool.ts +++ b/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/balancer/balancerPool.ts @@ -346,12 +346,12 @@ export const SmoothWeightChangeParams = { if (message.initialPoolWeights) { obj.initial_pool_weights = message.initialPoolWeights.map(e => e ? PoolAsset.toAmino(e) : undefined); } else { - obj.initial_pool_weights = []; + obj.initial_pool_weights = message.initialPoolWeights; } if (message.targetPoolWeights) { obj.target_pool_weights = message.targetPoolWeights.map(e => e ? PoolAsset.toAmino(e) : undefined); } else { - obj.target_pool_weights = []; + obj.target_pool_weights = message.targetPoolWeights; } return obj; }, @@ -445,8 +445,8 @@ export const PoolParams = { }, toAmino(message: PoolParams): PoolParamsAmino { const obj: any = {}; - obj.swap_fee = message.swapFee; - obj.exit_fee = message.exitFee; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; + obj.exit_fee = message.exitFee === "" ? undefined : message.exitFee; obj.smooth_weight_change_params = message.smoothWeightChangeParams ? SmoothWeightChangeParams.toAmino(message.smoothWeightChangeParams) : undefined; return obj; }, @@ -530,7 +530,7 @@ export const PoolAsset = { toAmino(message: PoolAsset): PoolAssetAmino { const obj: any = {}; obj.token = message.token ? Coin.toAmino(message.token) : undefined; - obj.weight = message.weight; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: PoolAssetAminoMsg): PoolAsset { @@ -669,17 +669,17 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.address = message.address; - obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : 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.pool_assets = message.poolAssets; } - obj.total_weight = message.totalWeight; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { diff --git a/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/balancer/tx/tx.ts b/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/balancer/tx/tx.ts index 9fb78e3e29..7591531bcb 100644 --- a/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/balancer/tx/tx.ts +++ b/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/balancer/tx/tx.ts @@ -128,14 +128,14 @@ export const MsgCreateBalancerPool = { }, toAmino(message: MsgCreateBalancerPool): MsgCreateBalancerPoolAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : 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.pool_assets = message.poolAssets; } - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; return obj; }, fromAminoMsg(object: MsgCreateBalancerPoolAminoMsg): MsgCreateBalancerPool { @@ -206,7 +206,7 @@ export const MsgCreateBalancerPoolResponse = { }, toAmino(message: MsgCreateBalancerPoolResponse): MsgCreateBalancerPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateBalancerPoolResponseAminoMsg): MsgCreateBalancerPoolResponse { diff --git a/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts b/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts index a0f5ba64d5..6d29a57f26 100644 --- a/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts +++ b/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts @@ -165,8 +165,8 @@ export const PoolParams = { }, toAmino(message: PoolParams): PoolParamsAmino { const obj: any = {}; - obj.swap_fee = message.swapFee; - obj.exit_fee = message.exitFee; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; + obj.exit_fee = message.exitFee === "" ? undefined : message.exitFee; return obj; }, fromAminoMsg(object: PoolParamsAminoMsg): PoolParams { @@ -323,22 +323,22 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.address = message.address; - obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : 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 = []; + obj.pool_liquidity = message.poolLiquidity; } if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } - obj.scaling_factor_controller = message.scalingFactorController; + obj.scaling_factor_controller = message.scalingFactorController === "" ? undefined : message.scalingFactorController; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { diff --git a/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/stableswap/tx.ts b/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/stableswap/tx.ts index a4f0533a38..b683c67e6d 100644 --- a/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/stableswap/tx.ts +++ b/__fixtures__/v-next/outputsign/osmosis/gamm/pool-models/stableswap/tx.ts @@ -210,20 +210,20 @@ export const MsgCreateStableswapPool = { }, toAmino(message: MsgCreateStableswapPool): MsgCreateStableswapPoolAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : 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 = []; + obj.initial_pool_liquidity = message.initialPoolLiquidity; } if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } - obj.future_pool_governor = message.futurePoolGovernor; - obj.scaling_factor_controller = message.scalingFactorController; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; + obj.scaling_factor_controller = message.scalingFactorController === "" ? undefined : message.scalingFactorController; return obj; }, fromAminoMsg(object: MsgCreateStableswapPoolAminoMsg): MsgCreateStableswapPool { @@ -294,7 +294,7 @@ export const MsgCreateStableswapPoolResponse = { }, toAmino(message: MsgCreateStableswapPoolResponse): MsgCreateStableswapPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateStableswapPoolResponseAminoMsg): MsgCreateStableswapPoolResponse { @@ -394,12 +394,12 @@ export const MsgStableSwapAdjustScalingFactors = { }, toAmino(message: MsgStableSwapAdjustScalingFactors): MsgStableSwapAdjustScalingFactorsAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/gamm/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/osmosis/gamm/v1beta1/genesis.ts index 8d55e29c9c..abeda636a3 100644 --- a/__fixtures__/v-next/outputsign/osmosis/gamm/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/osmosis/gamm/v1beta1/genesis.ts @@ -96,7 +96,7 @@ export const Params = { if (message.poolCreationFee) { obj.pool_creation_fee = message.poolCreationFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.pool_creation_fee = []; + obj.pool_creation_fee = message.poolCreationFee; } return obj; }, @@ -193,9 +193,9 @@ export const GenesisState = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } - obj.next_pool_number = message.nextPoolNumber ? message.nextPoolNumber.toString() : undefined; + obj.next_pool_number = message.nextPoolNumber !== BigInt(0) ? message.nextPoolNumber.toString() : undefined; obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/gamm/v1beta1/query.ts b/__fixtures__/v-next/outputsign/osmosis/gamm/v1beta1/query.ts index d29decb864..002bf277ba 100644 --- a/__fixtures__/v-next/outputsign/osmosis/gamm/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/osmosis/gamm/v1beta1/query.ts @@ -678,7 +678,7 @@ export const QueryPoolRequest = { }, toAmino(message: QueryPoolRequest): QueryPoolRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolRequestAminoMsg): QueryPoolRequest { @@ -903,7 +903,7 @@ export const QueryPoolsResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1032,7 +1032,7 @@ export const QueryNumPoolsResponse = { }, toAmino(message: QueryNumPoolsResponse): QueryNumPoolsResponseAmino { const obj: any = {}; - obj.num_pools = message.numPools ? message.numPools.toString() : undefined; + obj.num_pools = message.numPools !== BigInt(0) ? message.numPools.toString() : undefined; return obj; }, fromAminoMsg(object: QueryNumPoolsResponseAminoMsg): QueryNumPoolsResponse { @@ -1103,7 +1103,7 @@ export const QueryPoolTypeRequest = { }, toAmino(message: QueryPoolTypeRequest): QueryPoolTypeRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolTypeRequestAminoMsg): QueryPoolTypeRequest { @@ -1172,7 +1172,7 @@ export const QueryPoolTypeResponse = { }, toAmino(message: QueryPoolTypeResponse): QueryPoolTypeResponseAmino { const obj: any = {}; - obj.pool_type = message.poolType; + obj.pool_type = message.poolType === "" ? undefined : message.poolType; return obj; }, fromAminoMsg(object: QueryPoolTypeResponseAminoMsg): QueryPoolTypeResponse { @@ -1252,11 +1252,11 @@ export const QueryCalcJoinPoolSharesRequest = { }, toAmino(message: QueryCalcJoinPoolSharesRequest): QueryCalcJoinPoolSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.tokensIn) { obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_in = []; + obj.tokens_in = message.tokensIn; } return obj; }, @@ -1335,11 +1335,11 @@ export const QueryCalcJoinPoolSharesResponse = { }, toAmino(message: QueryCalcJoinPoolSharesResponse): QueryCalcJoinPoolSharesResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } return obj; }, @@ -1422,8 +1422,8 @@ export const QueryCalcExitPoolCoinsFromSharesRequest = { }, toAmino(message: QueryCalcExitPoolCoinsFromSharesRequest): QueryCalcExitPoolCoinsFromSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.share_in_amount = message.shareInAmount; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; return obj; }, fromAminoMsg(object: QueryCalcExitPoolCoinsFromSharesRequestAminoMsg): QueryCalcExitPoolCoinsFromSharesRequest { @@ -1493,7 +1493,7 @@ export const QueryCalcExitPoolCoinsFromSharesResponse = { if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } return obj; }, @@ -1565,7 +1565,7 @@ export const QueryPoolParamsRequest = { }, toAmino(message: QueryPoolParamsRequest): QueryPoolParamsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolParamsRequestAminoMsg): QueryPoolParamsRequest { @@ -1707,7 +1707,7 @@ export const QueryTotalPoolLiquidityRequest = { }, toAmino(message: QueryTotalPoolLiquidityRequest): QueryTotalPoolLiquidityRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTotalPoolLiquidityRequestAminoMsg): QueryTotalPoolLiquidityRequest { @@ -1777,7 +1777,7 @@ export const QueryTotalPoolLiquidityResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, @@ -1849,7 +1849,7 @@ export const QueryTotalSharesRequest = { }, toAmino(message: QueryTotalSharesRequest): QueryTotalSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTotalSharesRequestAminoMsg): QueryTotalSharesRequest { @@ -2000,11 +2000,11 @@ export const QueryCalcJoinPoolNoSwapSharesRequest = { }, toAmino(message: QueryCalcJoinPoolNoSwapSharesRequest): QueryCalcJoinPoolNoSwapSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.tokensIn) { obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_in = []; + obj.tokens_in = message.tokensIn; } return obj; }, @@ -2086,9 +2086,9 @@ export const QueryCalcJoinPoolNoSwapSharesResponse = { if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } - obj.shares_out = message.sharesOut; + obj.shares_out = message.sharesOut === "" ? undefined : message.sharesOut; return obj; }, fromAminoMsg(object: QueryCalcJoinPoolNoSwapSharesResponseAminoMsg): QueryCalcJoinPoolNoSwapSharesResponse { @@ -2181,9 +2181,9 @@ export const QuerySpotPriceRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest { @@ -2277,9 +2277,9 @@ export const QueryPoolsWithFilterRequest = { if (message.minLiquidity) { obj.min_liquidity = message.minLiquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_liquidity = []; + obj.min_liquidity = message.minLiquidity; } - obj.pool_type = message.poolType; + obj.pool_type = message.poolType === "" ? undefined : message.poolType; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2363,7 +2363,7 @@ export const QueryPoolsWithFilterResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2434,7 +2434,7 @@ export const QuerySpotPriceResponse = { }, toAmino(message: QuerySpotPriceResponse): QuerySpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse { @@ -2536,13 +2536,13 @@ export const QuerySwapExactAmountInRequest = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn === "" ? undefined : message.tokenIn; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } return obj; }, @@ -2612,7 +2612,7 @@ export const QuerySwapExactAmountInResponse = { }, toAmino(message: QuerySwapExactAmountInResponse): QuerySwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: QuerySwapExactAmountInResponseAminoMsg): QuerySwapExactAmountInResponse { @@ -2714,14 +2714,14 @@ export const QuerySwapExactAmountOutRequest = { }, toAmino(message: QuerySwapExactAmountOutRequest): QuerySwapExactAmountOutRequestAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_out = message.tokenOut; + obj.token_out = message.tokenOut === "" ? undefined : message.tokenOut; return obj; }, fromAminoMsg(object: QuerySwapExactAmountOutRequestAminoMsg): QuerySwapExactAmountOutRequest { @@ -2790,7 +2790,7 @@ export const QuerySwapExactAmountOutResponse = { }, toAmino(message: QuerySwapExactAmountOutResponse): QuerySwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: QuerySwapExactAmountOutResponseAminoMsg): QuerySwapExactAmountOutResponse { @@ -2916,7 +2916,7 @@ export const QueryTotalLiquidityResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/gamm/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/osmosis/gamm/v1beta1/tx.ts index 41194bb771..49af98ba37 100644 --- a/__fixtures__/v-next/outputsign/osmosis/gamm/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/osmosis/gamm/v1beta1/tx.ts @@ -514,13 +514,13 @@ export const MsgJoinPool = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenInMaxs) { obj.token_in_maxs = message.tokenInMaxs.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_in_maxs = []; + obj.token_in_maxs = message.tokenInMaxs; } return obj; }, @@ -599,11 +599,11 @@ export const MsgJoinPoolResponse = { }, toAmino(message: MsgJoinPoolResponse): MsgJoinPoolResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenIn) { obj.token_in = message.tokenIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_in = []; + obj.token_in = message.tokenIn; } return obj; }, @@ -706,13 +706,13 @@ export const MsgExitPool = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; if (message.tokenOutMins) { obj.token_out_mins = message.tokenOutMins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_out_mins = []; + obj.token_out_mins = message.tokenOutMins; } return obj; }, @@ -783,7 +783,7 @@ export const MsgExitPoolResponse = { if (message.tokenOut) { obj.token_out = message.tokenOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_out = []; + obj.token_out = message.tokenOut; } return obj; }, @@ -866,8 +866,8 @@ export const SwapAmountInRoute = { }, toAmino(message: SwapAmountInRoute): SwapAmountInRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_out_denom = message.tokenOutDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; return obj; }, fromAminoMsg(object: SwapAmountInRouteAminoMsg): SwapAmountInRoute { @@ -969,14 +969,14 @@ export const MsgSwapExactAmountIn = { }, toAmino(message: MsgSwapExactAmountIn): MsgSwapExactAmountInAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; - obj.token_out_min_amount = message.tokenOutMinAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInAminoMsg): MsgSwapExactAmountIn { @@ -1045,7 +1045,7 @@ export const MsgSwapExactAmountInResponse = { }, toAmino(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInResponseAminoMsg): MsgSwapExactAmountInResponse { @@ -1127,8 +1127,8 @@ export const SwapAmountOutRoute = { }, toAmino(message: SwapAmountOutRoute): SwapAmountOutRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_in_denom = message.tokenInDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; return obj; }, fromAminoMsg(object: SwapAmountOutRouteAminoMsg): SwapAmountOutRoute { @@ -1230,13 +1230,13 @@ export const MsgSwapExactAmountOut = { }, toAmino(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_in_max_amount = message.tokenInMaxAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; return obj; }, @@ -1306,7 +1306,7 @@ export const MsgSwapExactAmountOutResponse = { }, toAmino(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountOutResponseAminoMsg): MsgSwapExactAmountOutResponse { @@ -1412,10 +1412,10 @@ export const MsgJoinSwapExternAmountIn = { }, toAmino(message: MsgJoinSwapExternAmountIn): MsgJoinSwapExternAmountInAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; - obj.share_out_min_amount = message.shareOutMinAmount; + obj.share_out_min_amount = message.shareOutMinAmount === "" ? undefined : message.shareOutMinAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapExternAmountInAminoMsg): MsgJoinSwapExternAmountIn { @@ -1484,7 +1484,7 @@ export const MsgJoinSwapExternAmountInResponse = { }, toAmino(message: MsgJoinSwapExternAmountInResponse): MsgJoinSwapExternAmountInResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapExternAmountInResponseAminoMsg): MsgJoinSwapExternAmountInResponse { @@ -1599,11 +1599,11 @@ export const MsgJoinSwapShareAmountOut = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapShareAmountOutAminoMsg): MsgJoinSwapShareAmountOut { @@ -1672,7 +1672,7 @@ export const MsgJoinSwapShareAmountOutResponse = { }, toAmino(message: MsgJoinSwapShareAmountOutResponse): MsgJoinSwapShareAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapShareAmountOutResponseAminoMsg): MsgJoinSwapShareAmountOutResponse { @@ -1787,11 +1787,11 @@ export const MsgExitSwapShareAmountIn = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromAminoMsg(object: MsgExitSwapShareAmountInAminoMsg): MsgExitSwapShareAmountIn { @@ -1860,7 +1860,7 @@ export const MsgExitSwapShareAmountInResponse = { }, toAmino(message: MsgExitSwapShareAmountInResponse): MsgExitSwapShareAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: MsgExitSwapShareAmountInResponseAminoMsg): MsgExitSwapShareAmountInResponse { @@ -1966,10 +1966,10 @@ export const MsgExitSwapExternAmountOut = { }, toAmino(message: MsgExitSwapExternAmountOut): MsgExitSwapExternAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; - obj.share_in_max_amount = message.shareInMaxAmount; + obj.share_in_max_amount = message.shareInMaxAmount === "" ? undefined : message.shareInMaxAmount; return obj; }, fromAminoMsg(object: MsgExitSwapExternAmountOutAminoMsg): MsgExitSwapExternAmountOut { @@ -2038,7 +2038,7 @@ export const MsgExitSwapExternAmountOutResponse = { }, toAmino(message: MsgExitSwapExternAmountOutResponse): MsgExitSwapExternAmountOutResponseAmino { const obj: any = {}; - obj.share_in_amount = message.shareInAmount; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; return obj; }, fromAminoMsg(object: MsgExitSwapExternAmountOutResponseAminoMsg): MsgExitSwapExternAmountOutResponse { diff --git a/__fixtures__/v-next/outputsign/osmosis/gamm/v2/query.ts b/__fixtures__/v-next/outputsign/osmosis/gamm/v2/query.ts index 0ea251e6ee..97f145cd4d 100644 --- a/__fixtures__/v-next/outputsign/osmosis/gamm/v2/query.ts +++ b/__fixtures__/v-next/outputsign/osmosis/gamm/v2/query.ts @@ -135,9 +135,9 @@ export const QuerySpotPriceRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest { @@ -206,7 +206,7 @@ export const QuerySpotPriceResponse = { }, toAmino(message: QuerySpotPriceResponse): QuerySpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse { diff --git a/__fixtures__/v-next/outputsign/osmosis/ibc-rate-limit/v1beta1/params.ts b/__fixtures__/v-next/outputsign/osmosis/ibc-rate-limit/v1beta1/params.ts index 648efff247..b7d55e8f00 100644 --- a/__fixtures__/v-next/outputsign/osmosis/ibc-rate-limit/v1beta1/params.ts +++ b/__fixtures__/v-next/outputsign/osmosis/ibc-rate-limit/v1beta1/params.ts @@ -65,7 +65,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/osmosis/incentives/gauge.ts b/__fixtures__/v-next/outputsign/osmosis/incentives/gauge.ts index 2315a63b7c..735dbc37b5 100644 --- a/__fixtures__/v-next/outputsign/osmosis/incentives/gauge.ts +++ b/__fixtures__/v-next/outputsign/osmosis/incentives/gauge.ts @@ -254,21 +254,21 @@ export const Gauge = { }, toAmino(message: Gauge): GaugeAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.is_perpetual = message.isPerpetual; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.is_perpetual = message.isPerpetual === false ? undefined : 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.coins = message.coins; } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; - obj.filled_epochs = message.filledEpochs ? message.filledEpochs.toString() : undefined; + obj.num_epochs_paid_over = message.numEpochsPaidOver !== BigInt(0) ? message.numEpochsPaidOver.toString() : undefined; + obj.filled_epochs = message.filledEpochs !== BigInt(0) ? message.filledEpochs.toString() : undefined; if (message.distributedCoins) { obj.distributed_coins = message.distributedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.distributed_coins = []; + obj.distributed_coins = message.distributedCoins; } return obj; }, @@ -339,7 +339,7 @@ export const LockableDurationsInfo = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/incentives/genesis.ts b/__fixtures__/v-next/outputsign/osmosis/incentives/genesis.ts index 5bfe0aadff..5f5e303ec1 100644 --- a/__fixtures__/v-next/outputsign/osmosis/incentives/genesis.ts +++ b/__fixtures__/v-next/outputsign/osmosis/incentives/genesis.ts @@ -143,14 +143,14 @@ export const GenesisState = { if (message.gauges) { obj.gauges = message.gauges.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.gauges = []; + obj.gauges = message.gauges; } if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } - obj.last_gauge_id = message.lastGaugeId ? message.lastGaugeId.toString() : undefined; + obj.last_gauge_id = message.lastGaugeId !== BigInt(0) ? message.lastGaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputsign/osmosis/incentives/params.ts b/__fixtures__/v-next/outputsign/osmosis/incentives/params.ts index 6ecfb55814..e1cae8b39a 100644 --- a/__fixtures__/v-next/outputsign/osmosis/incentives/params.ts +++ b/__fixtures__/v-next/outputsign/osmosis/incentives/params.ts @@ -73,7 +73,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.distr_epoch_identifier = message.distrEpochIdentifier; + obj.distr_epoch_identifier = message.distrEpochIdentifier === "" ? undefined : message.distrEpochIdentifier; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/osmosis/incentives/query.ts b/__fixtures__/v-next/outputsign/osmosis/incentives/query.ts index cf803c9aa3..4c80e71ac6 100644 --- a/__fixtures__/v-next/outputsign/osmosis/incentives/query.ts +++ b/__fixtures__/v-next/outputsign/osmosis/incentives/query.ts @@ -489,7 +489,7 @@ export const ModuleToDistributeCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -561,7 +561,7 @@ export const GaugeByIDRequest = { }, toAmino(message: GaugeByIDRequest): GaugeByIDRequestAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; return obj; }, fromAminoMsg(object: GaugeByIDRequestAminoMsg): GaugeByIDRequest { @@ -786,7 +786,7 @@ export const GaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -942,7 +942,7 @@ export const ActiveGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1026,7 +1026,7 @@ export const ActiveGaugesPerDenomRequest = { }, toAmino(message: ActiveGaugesPerDenomRequest): ActiveGaugesPerDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1110,7 +1110,7 @@ export const ActiveGaugesPerDenomResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1266,7 +1266,7 @@ export const UpcomingGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1350,7 +1350,7 @@ export const UpcomingGaugesPerDenomRequest = { }, toAmino(message: UpcomingGaugesPerDenomRequest): UpcomingGaugesPerDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1434,7 +1434,7 @@ export const UpcomingGaugesPerDenomResponse = { if (message.upcomingGauges) { obj.upcoming_gauges = message.upcomingGauges.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.upcoming_gauges = []; + obj.upcoming_gauges = message.upcomingGauges; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1536,13 +1536,13 @@ export const RewardsEstRequest = { }, toAmino(message: RewardsEstRequest): RewardsEstRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; if (message.lockIds) { obj.lock_ids = message.lockIds.map(e => e.toString()); } else { - obj.lock_ids = []; + obj.lock_ids = message.lockIds; } - obj.end_epoch = message.endEpoch ? message.endEpoch.toString() : undefined; + obj.end_epoch = message.endEpoch !== BigInt(0) ? message.endEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: RewardsEstRequestAminoMsg): RewardsEstRequest { @@ -1612,7 +1612,7 @@ export const RewardsEstResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1739,7 +1739,7 @@ export const QueryLockableDurationsResponse = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/incentives/tx.ts b/__fixtures__/v-next/outputsign/osmosis/incentives/tx.ts index fa257cfafb..1113410315 100644 --- a/__fixtures__/v-next/outputsign/osmosis/incentives/tx.ts +++ b/__fixtures__/v-next/outputsign/osmosis/incentives/tx.ts @@ -230,16 +230,16 @@ export const MsgCreateGauge = { }, toAmino(message: MsgCreateGauge): MsgCreateGaugeAmino { const obj: any = {}; - obj.is_perpetual = message.isPerpetual; - obj.owner = message.owner; + obj.is_perpetual = message.isPerpetual === false ? undefined : message.isPerpetual; + obj.owner = message.owner === "" ? undefined : 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.coins = message.coins; } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; + obj.num_epochs_paid_over = message.numEpochsPaidOver !== BigInt(0) ? message.numEpochsPaidOver.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateGaugeAminoMsg): MsgCreateGauge { @@ -386,12 +386,12 @@ export const MsgAddToGauge = { }, toAmino(message: MsgAddToGauge): MsgAddToGaugeAmino { const obj: any = {}; - obj.owner = message.owner; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; if (message.rewards) { obj.rewards = message.rewards.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/lockup/genesis.ts b/__fixtures__/v-next/outputsign/osmosis/lockup/genesis.ts index ec001b4bc6..a032e069cf 100644 --- a/__fixtures__/v-next/outputsign/osmosis/lockup/genesis.ts +++ b/__fixtures__/v-next/outputsign/osmosis/lockup/genesis.ts @@ -92,16 +92,16 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.last_lock_id = message.lastLockId ? message.lastLockId.toString() : undefined; + obj.last_lock_id = message.lastLockId !== BigInt(0) ? message.lastLockId.toString() : undefined; if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputsign/osmosis/lockup/lock.ts index 9b0c592d9b..afeca4035c 100644 --- a/__fixtures__/v-next/outputsign/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputsign/osmosis/lockup/lock.ts @@ -359,14 +359,14 @@ export const PeriodLock = { }, toAmino(message: PeriodLock): PeriodLockAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; - obj.owner = message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -456,7 +456,7 @@ export const QueryCondition = { fromAmino(object: QueryConditionAmino): QueryCondition { const message = createBaseQueryCondition(); if (object.lock_query_type !== undefined && object.lock_query_type !== null) { - message.lockQueryType = lockQueryTypeFromJSON(object.lock_query_type); + message.lockQueryType = object.lock_query_type; } if (object.denom !== undefined && object.denom !== null) { message.denom = object.denom; @@ -471,8 +471,8 @@ export const QueryCondition = { }, toAmino(message: QueryCondition): QueryConditionAmino { const obj: any = {}; - obj.lock_query_type = message.lockQueryType; - obj.denom = message.denom; + obj.lock_query_type = message.lockQueryType === 0 ? undefined : message.lockQueryType; + obj.denom = message.denom === "" ? undefined : message.denom; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; @@ -580,8 +580,8 @@ export const SyntheticLock = { }, toAmino(message: SyntheticLock): SyntheticLockAmino { const obj: any = {}; - obj.underlying_lock_id = message.underlyingLockId ? message.underlyingLockId.toString() : undefined; - obj.synth_denom = message.synthDenom; + obj.underlying_lock_id = message.underlyingLockId !== BigInt(0) ? message.underlyingLockId.toString() : undefined; + obj.synth_denom = message.synthDenom === "" ? undefined : message.synthDenom; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/osmosis/lockup/params.ts b/__fixtures__/v-next/outputsign/osmosis/lockup/params.ts index f37aad017e..536360b7dc 100644 --- a/__fixtures__/v-next/outputsign/osmosis/lockup/params.ts +++ b/__fixtures__/v-next/outputsign/osmosis/lockup/params.ts @@ -63,7 +63,7 @@ export const Params = { if (message.forceUnlockAllowedAddresses) { obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses.map(e => e); } else { - obj.force_unlock_allowed_addresses = []; + obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/lockup/query.ts b/__fixtures__/v-next/outputsign/osmosis/lockup/query.ts index a3f8fd92b8..f746011781 100644 --- a/__fixtures__/v-next/outputsign/osmosis/lockup/query.ts +++ b/__fixtures__/v-next/outputsign/osmosis/lockup/query.ts @@ -700,7 +700,7 @@ export const ModuleBalanceResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -827,7 +827,7 @@ export const ModuleLockedAmountResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -897,7 +897,7 @@ export const AccountUnlockableCoinsRequest = { }, toAmino(message: AccountUnlockableCoinsRequest): AccountUnlockableCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountUnlockableCoinsRequestAminoMsg): AccountUnlockableCoinsRequest { @@ -967,7 +967,7 @@ export const AccountUnlockableCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1037,7 +1037,7 @@ export const AccountUnlockingCoinsRequest = { }, toAmino(message: AccountUnlockingCoinsRequest): AccountUnlockingCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountUnlockingCoinsRequestAminoMsg): AccountUnlockingCoinsRequest { @@ -1107,7 +1107,7 @@ export const AccountUnlockingCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1177,7 +1177,7 @@ export const AccountLockedCoinsRequest = { }, toAmino(message: AccountLockedCoinsRequest): AccountLockedCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountLockedCoinsRequestAminoMsg): AccountLockedCoinsRequest { @@ -1247,7 +1247,7 @@ export const AccountLockedCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1328,7 +1328,7 @@ export const AccountLockedPastTimeRequest = { }, toAmino(message: AccountLockedPastTimeRequest): AccountLockedPastTimeRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1399,7 +1399,7 @@ export const AccountLockedPastTimeResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1480,7 +1480,7 @@ export const AccountLockedPastTimeNotUnlockingOnlyRequest = { }, toAmino(message: AccountLockedPastTimeNotUnlockingOnlyRequest): AccountLockedPastTimeNotUnlockingOnlyRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1551,7 +1551,7 @@ export const AccountLockedPastTimeNotUnlockingOnlyResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1632,7 +1632,7 @@ export const AccountUnlockedBeforeTimeRequest = { }, toAmino(message: AccountUnlockedBeforeTimeRequest): AccountUnlockedBeforeTimeRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1703,7 +1703,7 @@ export const AccountUnlockedBeforeTimeResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1795,9 +1795,9 @@ export const AccountLockedPastTimeDenomRequest = { }, toAmino(message: AccountLockedPastTimeDenomRequest): AccountLockedPastTimeDenomRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AccountLockedPastTimeDenomRequestAminoMsg): AccountLockedPastTimeDenomRequest { @@ -1867,7 +1867,7 @@ export const AccountLockedPastTimeDenomResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1950,7 +1950,7 @@ export const LockedDenomRequest = { }, toAmino(message: LockedDenomRequest): LockedDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -2020,7 +2020,7 @@ export const LockedDenomResponse = { }, toAmino(message: LockedDenomResponse): LockedDenomResponseAmino { const obj: any = {}; - obj.amount = message.amount; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: LockedDenomResponseAminoMsg): LockedDenomResponse { @@ -2091,7 +2091,7 @@ export const LockedRequest = { }, toAmino(message: LockedRequest): LockedRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: LockedRequestAminoMsg): LockedRequest { @@ -2233,7 +2233,7 @@ export const SyntheticLockupsByLockupIDRequest = { }, toAmino(message: SyntheticLockupsByLockupIDRequest): SyntheticLockupsByLockupIDRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: SyntheticLockupsByLockupIDRequestAminoMsg): SyntheticLockupsByLockupIDRequest { @@ -2303,7 +2303,7 @@ export const SyntheticLockupsByLockupIDResponse = { if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, @@ -2386,7 +2386,7 @@ export const AccountLockedLongerDurationRequest = { }, toAmino(message: AccountLockedLongerDurationRequest): AccountLockedLongerDurationRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -2457,7 +2457,7 @@ export const AccountLockedLongerDurationResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2540,7 +2540,7 @@ export const AccountLockedDurationRequest = { }, toAmino(message: AccountLockedDurationRequest): AccountLockedDurationRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -2611,7 +2611,7 @@ export const AccountLockedDurationResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2694,7 +2694,7 @@ export const AccountLockedLongerDurationNotUnlockingOnlyRequest = { }, toAmino(message: AccountLockedLongerDurationNotUnlockingOnlyRequest): AccountLockedLongerDurationNotUnlockingOnlyRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -2765,7 +2765,7 @@ export const AccountLockedLongerDurationNotUnlockingOnlyResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2859,9 +2859,9 @@ export const AccountLockedLongerDurationDenomRequest = { }, toAmino(message: AccountLockedLongerDurationDenomRequest): AccountLockedLongerDurationDenomRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AccountLockedLongerDurationDenomRequestAminoMsg): AccountLockedLongerDurationDenomRequest { @@ -2931,7 +2931,7 @@ export const AccountLockedLongerDurationDenomResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputsign/osmosis/lockup/tx.ts index f96ca327cf..0a462f85e5 100644 --- a/__fixtures__/v-next/outputsign/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputsign/osmosis/lockup/tx.ts @@ -300,12 +300,12 @@ export const MsgLockTokens = { }, toAmino(message: MsgLockTokens): MsgLockTokensAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : 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 = []; + obj.coins = message.coins; } return obj; }, @@ -377,7 +377,7 @@ export const MsgLockTokensResponse = { }, toAmino(message: MsgLockTokensResponse): MsgLockTokensResponseAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockTokensResponseAminoMsg): MsgLockTokensResponse { @@ -446,7 +446,7 @@ export const MsgBeginUnlockingAll = { }, toAmino(message: MsgBeginUnlockingAll): MsgBeginUnlockingAllAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: MsgBeginUnlockingAllAminoMsg): MsgBeginUnlockingAll { @@ -516,7 +516,7 @@ export const MsgBeginUnlockingAllResponse = { if (message.unlocks) { obj.unlocks = message.unlocks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.unlocks = []; + obj.unlocks = message.unlocks; } return obj; }, @@ -608,12 +608,12 @@ export const MsgBeginUnlocking = { }, toAmino(message: MsgBeginUnlocking): MsgBeginUnlockingAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -683,7 +683,7 @@ export const MsgBeginUnlockingResponse = { }, toAmino(message: MsgBeginUnlockingResponse): MsgBeginUnlockingResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgBeginUnlockingResponseAminoMsg): MsgBeginUnlockingResponse { @@ -778,8 +778,8 @@ export const MsgExtendLockup = { }, toAmino(message: MsgExtendLockup): MsgExtendLockupAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -849,7 +849,7 @@ export const MsgExtendLockupResponse = { }, toAmino(message: MsgExtendLockupResponse): MsgExtendLockupResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgExtendLockupResponseAminoMsg): MsgExtendLockupResponse { @@ -940,12 +940,12 @@ export const MsgForceUnlock = { }, toAmino(message: MsgForceUnlock): MsgForceUnlockAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1015,7 +1015,7 @@ export const MsgForceUnlockResponse = { }, toAmino(message: MsgForceUnlockResponse): MsgForceUnlockResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgForceUnlockResponseAminoMsg): MsgForceUnlockResponse { diff --git a/__fixtures__/v-next/outputsign/osmosis/mint/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/osmosis/mint/v1beta1/genesis.ts index bc3d4b144c..2d032e30ca 100644 --- a/__fixtures__/v-next/outputsign/osmosis/mint/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/osmosis/mint/v1beta1/genesis.ts @@ -114,7 +114,7 @@ export const GenesisState = { 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; + obj.reduction_started_epoch = message.reductionStartedEpoch !== BigInt(0) ? message.reductionStartedEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputsign/osmosis/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputsign/osmosis/mint/v1beta1/mint.ts index 0266bab464..a05afe53a5 100644 --- a/__fixtures__/v-next/outputsign/osmosis/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputsign/osmosis/mint/v1beta1/mint.ts @@ -269,7 +269,7 @@ export const Minter = { }, toAmino(message: Minter): MinterAmino { const obj: any = {}; - obj.epoch_provisions = message.epochProvisions; + obj.epoch_provisions = message.epochProvisions === "" ? undefined : message.epochProvisions; return obj; }, fromAminoMsg(object: MinterAminoMsg): Minter { @@ -349,8 +349,8 @@ export const WeightedAddress = { }, toAmino(message: WeightedAddress): WeightedAddressAmino { const obj: any = {}; - obj.address = message.address; - obj.weight = message.weight; + obj.address = message.address === "" ? undefined : message.address; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedAddressAminoMsg): WeightedAddress { @@ -452,10 +452,10 @@ export const DistributionProportions = { }, 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; + obj.staking = message.staking === "" ? undefined : message.staking; + obj.pool_incentives = message.poolIncentives === "" ? undefined : message.poolIncentives; + obj.developer_rewards = message.developerRewards === "" ? undefined : message.developerRewards; + obj.community_pool = message.communityPool === "" ? undefined : message.communityPool; return obj; }, fromAminoMsg(object: DistributionProportionsAminoMsg): DistributionProportions { @@ -605,18 +605,18 @@ export const Params = { }, 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.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; + obj.genesis_epoch_provisions = message.genesisEpochProvisions === "" ? undefined : message.genesisEpochProvisions; + obj.epoch_identifier = message.epochIdentifier === "" ? undefined : message.epochIdentifier; + obj.reduction_period_in_epochs = message.reductionPeriodInEpochs !== BigInt(0) ? message.reductionPeriodInEpochs.toString() : undefined; + obj.reduction_factor = message.reductionFactor === "" ? undefined : 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.weighted_developer_rewards_receivers = message.weightedDeveloperRewardsReceivers; } - obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; + obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch !== BigInt(0) ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/genesis.ts index c0357c0de9..3e7a43ca93 100644 --- a/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/genesis.ts @@ -119,7 +119,7 @@ export const GenesisState = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } obj.distr_info = message.distrInfo ? DistrInfo.toAmino(message.distrInfo) : undefined; obj.pool_to_gauges = message.poolToGauges ? PoolToGauges.toAmino(message.poolToGauges) : undefined; diff --git a/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/gov.ts b/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/gov.ts index 309b800f5d..75bc7026d2 100644 --- a/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/gov.ts @@ -166,12 +166,12 @@ export const ReplacePoolIncentivesProposal = { }, toAmino(message: ReplacePoolIncentivesProposal): ReplacePoolIncentivesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, @@ -261,12 +261,12 @@ export const UpdatePoolIncentivesProposal = { }, toAmino(message: UpdatePoolIncentivesProposal): UpdatePoolIncentivesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/incentives.ts b/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/incentives.ts index b9734a249c..dbf38cff40 100644 --- a/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/incentives.ts +++ b/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/incentives.ts @@ -172,7 +172,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.minted_denom = message.mintedDenom; + obj.minted_denom = message.mintedDenom === "" ? undefined : message.mintedDenom; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -242,7 +242,7 @@ export const LockableDurationsInfo = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, @@ -321,11 +321,11 @@ export const DistrInfo = { }, toAmino(message: DistrInfo): DistrInfoAmino { const obj: any = {}; - obj.total_weight = message.totalWeight; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, @@ -408,8 +408,8 @@ export const DistrRecord = { }, toAmino(message: DistrRecord): DistrRecordAmino { const obj: any = {}; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; - obj.weight = message.weight; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: DistrRecordAminoMsg): DistrRecord { @@ -506,8 +506,8 @@ export const PoolToGauge = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -578,7 +578,7 @@ export const PoolToGauges = { if (message.poolToGauge) { obj.pool_to_gauge = message.poolToGauge.map(e => e ? PoolToGauge.toAmino(e) : undefined); } else { - obj.pool_to_gauge = []; + obj.pool_to_gauge = message.poolToGauge; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/query.ts b/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/query.ts index 6ab9350a83..161e83c797 100644 --- a/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/osmosis/pool-incentives/v1beta1/query.ts @@ -270,7 +270,7 @@ export const QueryGaugeIdsRequest = { }, toAmino(message: QueryGaugeIdsRequest): QueryGaugeIdsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGaugeIdsRequestAminoMsg): QueryGaugeIdsRequest { @@ -340,7 +340,7 @@ export const QueryGaugeIdsResponse = { if (message.gaugeIdsWithDuration) { obj.gauge_ids_with_duration = message.gaugeIdsWithDuration.map(e => e ? QueryGaugeIdsResponse_GaugeIdWithDuration.toAmino(e) : undefined); } else { - obj.gauge_ids_with_duration = []; + obj.gauge_ids_with_duration = message.gaugeIdsWithDuration; } return obj; }, @@ -436,9 +436,9 @@ export const QueryGaugeIdsResponse_GaugeIdWithDuration = { }, toAmino(message: QueryGaugeIdsResponse_GaugeIdWithDuration): QueryGaugeIdsResponse_GaugeIdWithDurationAmino { const obj: any = {}; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.gauge_incentive_percentage = message.gaugeIncentivePercentage; + obj.gauge_incentive_percentage = message.gaugeIncentivePercentage === "" ? undefined : message.gaugeIncentivePercentage; return obj; }, fromAminoMsg(object: QueryGaugeIdsResponse_GaugeIdWithDurationAminoMsg): QueryGaugeIdsResponse_GaugeIdWithDuration { @@ -818,7 +818,7 @@ export const QueryLockableDurationsResponse = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, @@ -972,9 +972,9 @@ export const IncentivizedPool = { }, toAmino(message: IncentivizedPool): IncentivizedPoolAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.lockable_duration = message.lockableDuration ? Duration.toAmino(message.lockableDuration) : undefined; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: IncentivizedPoolAminoMsg): IncentivizedPool { @@ -1044,7 +1044,7 @@ export const QueryIncentivizedPoolsResponse = { if (message.incentivizedPools) { obj.incentivized_pools = message.incentivizedPools.map(e => e ? IncentivizedPool.toAmino(e) : undefined); } else { - obj.incentivized_pools = []; + obj.incentivized_pools = message.incentivizedPools; } return obj; }, @@ -1171,7 +1171,7 @@ export const QueryExternalIncentiveGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/sumtree/v1beta1/tree.ts b/__fixtures__/v-next/outputsign/osmosis/sumtree/v1beta1/tree.ts index 5cedbe8aa1..fd538ff0a2 100644 --- a/__fixtures__/v-next/outputsign/osmosis/sumtree/v1beta1/tree.ts +++ b/__fixtures__/v-next/outputsign/osmosis/sumtree/v1beta1/tree.ts @@ -100,7 +100,7 @@ export const Node = { if (message.children) { obj.children = message.children.map(e => e ? Child.toAmino(e) : undefined); } else { - obj.children = []; + obj.children = message.children; } return obj; }, @@ -182,7 +182,7 @@ export const Child = { toAmino(message: Child): ChildAmino { const obj: any = {}; obj.index = message.index ? base64FromBytes(message.index) : undefined; - obj.accumulation = message.accumulation; + obj.accumulation = message.accumulation === "" ? undefined : message.accumulation; return obj; }, fromAminoMsg(object: ChildAminoMsg): Child { diff --git a/__fixtures__/v-next/outputsign/osmosis/superfluid/genesis.ts b/__fixtures__/v-next/outputsign/osmosis/superfluid/genesis.ts index 38d4919046..aa46eeb28d 100644 --- a/__fixtures__/v-next/outputsign/osmosis/superfluid/genesis.ts +++ b/__fixtures__/v-next/outputsign/osmosis/superfluid/genesis.ts @@ -145,22 +145,22 @@ export const GenesisState = { if (message.superfluidAssets) { obj.superfluid_assets = message.superfluidAssets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.superfluid_assets = []; + obj.superfluid_assets = message.superfluidAssets; } if (message.osmoEquivalentMultipliers) { obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers.map(e => e ? OsmoEquivalentMultiplierRecord.toAmino(e) : undefined); } else { - obj.osmo_equivalent_multipliers = []; + obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers; } if (message.intermediaryAccounts) { obj.intermediary_accounts = message.intermediaryAccounts.map(e => e ? SuperfluidIntermediaryAccount.toAmino(e) : undefined); } else { - obj.intermediary_accounts = []; + obj.intermediary_accounts = message.intermediaryAccounts; } if (message.intemediaryAccountConnections) { obj.intemediary_account_connections = message.intemediaryAccountConnections.map(e => e ? LockIdIntermediaryAccountConnection.toAmino(e) : undefined); } else { - obj.intemediary_account_connections = []; + obj.intemediary_account_connections = message.intemediaryAccountConnections; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/superfluid/params.ts b/__fixtures__/v-next/outputsign/osmosis/superfluid/params.ts index 621219d24e..178c86827e 100644 --- a/__fixtures__/v-next/outputsign/osmosis/superfluid/params.ts +++ b/__fixtures__/v-next/outputsign/osmosis/superfluid/params.ts @@ -78,7 +78,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.minimum_risk_factor = message.minimumRiskFactor; + obj.minimum_risk_factor = message.minimumRiskFactor === "" ? undefined : message.minimumRiskFactor; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputsign/osmosis/superfluid/query.ts b/__fixtures__/v-next/outputsign/osmosis/superfluid/query.ts index 561ceeee7a..6e3f25d7c5 100644 --- a/__fixtures__/v-next/outputsign/osmosis/superfluid/query.ts +++ b/__fixtures__/v-next/outputsign/osmosis/superfluid/query.ts @@ -1,6 +1,6 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../cosmos/base/query/v1beta1/pagination"; import { Params, ParamsAmino, ParamsSDKType } from "./params"; -import { SuperfluidAssetType, SuperfluidAssetTypeSDKType, SuperfluidAsset, SuperfluidAssetAmino, SuperfluidAssetSDKType, OsmoEquivalentMultiplierRecord, OsmoEquivalentMultiplierRecordAmino, OsmoEquivalentMultiplierRecordSDKType, SuperfluidDelegationRecord, SuperfluidDelegationRecordAmino, SuperfluidDelegationRecordSDKType, superfluidAssetTypeFromJSON } from "./superfluid"; +import { SuperfluidAssetType, SuperfluidAssetTypeSDKType, SuperfluidAsset, SuperfluidAssetAmino, SuperfluidAssetSDKType, OsmoEquivalentMultiplierRecord, OsmoEquivalentMultiplierRecordAmino, OsmoEquivalentMultiplierRecordSDKType, SuperfluidDelegationRecord, SuperfluidDelegationRecordAmino, SuperfluidDelegationRecordSDKType } from "./superfluid"; import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; import { SyntheticLock, SyntheticLockAmino, SyntheticLockSDKType } from "../lockup/lock"; import { DelegationResponse, DelegationResponseAmino, DelegationResponseSDKType } from "../../cosmos/staking/v1beta1/staking"; @@ -754,7 +754,7 @@ export const AssetTypeRequest = { }, toAmino(message: AssetTypeRequest): AssetTypeRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AssetTypeRequestAminoMsg): AssetTypeRequest { @@ -817,13 +817,13 @@ export const AssetTypeResponse = { fromAmino(object: AssetTypeResponseAmino): AssetTypeResponse { const message = createBaseAssetTypeResponse(); if (object.asset_type !== undefined && object.asset_type !== null) { - message.assetType = superfluidAssetTypeFromJSON(object.asset_type); + message.assetType = object.asset_type; } return message; }, toAmino(message: AssetTypeResponse): AssetTypeResponseAmino { const obj: any = {}; - obj.asset_type = message.assetType; + obj.asset_type = message.assetType === 0 ? undefined : message.assetType; return obj; }, fromAminoMsg(object: AssetTypeResponseAminoMsg): AssetTypeResponse { @@ -949,7 +949,7 @@ export const AllAssetsResponse = { if (message.assets) { obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -1019,7 +1019,7 @@ export const AssetMultiplierRequest = { }, toAmino(message: AssetMultiplierRequest): AssetMultiplierRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AssetMultiplierRequestAminoMsg): AssetMultiplierRequest { @@ -1194,10 +1194,10 @@ export const SuperfluidIntermediaryAccountInfo = { }, 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; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: SuperfluidIntermediaryAccountInfoAminoMsg): SuperfluidIntermediaryAccountInfo { @@ -1351,7 +1351,7 @@ export const AllIntermediaryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? SuperfluidIntermediaryAccountInfo.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1424,7 +1424,7 @@ export const ConnectedIntermediaryAccountRequest = { }, toAmino(message: ConnectedIntermediaryAccountRequest): ConnectedIntermediaryAccountRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: ConnectedIntermediaryAccountRequestAminoMsg): ConnectedIntermediaryAccountRequest { @@ -1564,7 +1564,7 @@ export const QueryTotalDelegationByValidatorForDenomRequest = { }, toAmino(message: QueryTotalDelegationByValidatorForDenomRequest): QueryTotalDelegationByValidatorForDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryTotalDelegationByValidatorForDenomRequestAminoMsg): QueryTotalDelegationByValidatorForDenomRequest { @@ -1634,7 +1634,7 @@ export const QueryTotalDelegationByValidatorForDenomResponse = { if (message.assets) { obj.assets = message.assets.map(e => e ? Delegations.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -1726,9 +1726,9 @@ export const Delegations = { }, toAmino(message: Delegations): DelegationsAmino { const obj: any = {}; - obj.val_addr = message.valAddr; - obj.amount_sfsd = message.amountSfsd; - obj.osmo_equivalent = message.osmoEquivalent; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.amount_sfsd = message.amountSfsd === "" ? undefined : message.amountSfsd; + obj.osmo_equivalent = message.osmoEquivalent === "" ? undefined : message.osmoEquivalent; return obj; }, fromAminoMsg(object: DelegationsAminoMsg): Delegations { @@ -1853,7 +1853,7 @@ export const TotalSuperfluidDelegationsResponse = { }, toAmino(message: TotalSuperfluidDelegationsResponse): TotalSuperfluidDelegationsResponseAmino { const obj: any = {}; - obj.total_delegations = message.totalDelegations; + obj.total_delegations = message.totalDelegations === "" ? undefined : message.totalDelegations; return obj; }, fromAminoMsg(object: TotalSuperfluidDelegationsResponseAminoMsg): TotalSuperfluidDelegationsResponse { @@ -1944,9 +1944,9 @@ export const SuperfluidDelegationAmountRequest = { }, toAmino(message: SuperfluidDelegationAmountRequest): SuperfluidDelegationAmountRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidDelegationAmountRequestAminoMsg): SuperfluidDelegationAmountRequest { @@ -2016,7 +2016,7 @@ export const SuperfluidDelegationAmountResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -2086,7 +2086,7 @@ export const SuperfluidDelegationsByDelegatorRequest = { }, toAmino(message: SuperfluidDelegationsByDelegatorRequest): SuperfluidDelegationsByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: SuperfluidDelegationsByDelegatorRequestAminoMsg): SuperfluidDelegationsByDelegatorRequest { @@ -2178,12 +2178,12 @@ export const SuperfluidDelegationsByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined; return obj; @@ -2265,8 +2265,8 @@ export const SuperfluidUndelegationsByDelegatorRequest = { }, toAmino(message: SuperfluidUndelegationsByDelegatorRequest): SuperfluidUndelegationsByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.denom = message.denom; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidUndelegationsByDelegatorRequestAminoMsg): SuperfluidUndelegationsByDelegatorRequest { @@ -2354,17 +2354,17 @@ export const SuperfluidUndelegationsByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.totalUndelegatedCoins) { obj.total_undelegated_coins = message.totalUndelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_undelegated_coins = []; + obj.total_undelegated_coins = message.totalUndelegatedCoins; } if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, @@ -2445,8 +2445,8 @@ export const SuperfluidDelegationsByValidatorDenomRequest = { }, toAmino(message: SuperfluidDelegationsByValidatorDenomRequest): SuperfluidDelegationsByValidatorDenomRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidDelegationsByValidatorDenomRequestAminoMsg): SuperfluidDelegationsByValidatorDenomRequest { @@ -2516,7 +2516,7 @@ export const SuperfluidDelegationsByValidatorDenomResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } return obj; }, @@ -2597,8 +2597,8 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomRequest = { }, toAmino(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest): EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAminoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomRequest { @@ -2668,7 +2668,7 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomResponse = { if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } return obj; }, @@ -2738,7 +2738,7 @@ export const QueryTotalDelegationByDelegatorRequest = { }, toAmino(message: QueryTotalDelegationByDelegatorRequest): QueryTotalDelegationByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryTotalDelegationByDelegatorRequestAminoMsg): QueryTotalDelegationByDelegatorRequest { @@ -2839,17 +2839,17 @@ export const QueryTotalDelegationByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.delegationResponse) { obj.delegation_response = message.delegationResponse.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_response = []; + obj.delegation_response = message.delegationResponse; } if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined; return obj; @@ -2986,7 +2986,7 @@ export const QueryUnpoolWhitelistResponse = { if (message.poolIds) { obj.pool_ids = message.poolIds.map(e => e.toString()); } else { - obj.pool_ids = []; + obj.pool_ids = message.poolIds; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/superfluid/superfluid.ts b/__fixtures__/v-next/outputsign/osmosis/superfluid/superfluid.ts index 096c7a471c..974719b55a 100644 --- a/__fixtures__/v-next/outputsign/osmosis/superfluid/superfluid.ts +++ b/__fixtures__/v-next/outputsign/osmosis/superfluid/superfluid.ts @@ -303,14 +303,14 @@ export const SuperfluidAsset = { message.denom = object.denom; } if (object.asset_type !== undefined && object.asset_type !== null) { - message.assetType = superfluidAssetTypeFromJSON(object.asset_type); + message.assetType = object.asset_type; } return message; }, toAmino(message: SuperfluidAsset): SuperfluidAssetAmino { const obj: any = {}; - obj.denom = message.denom; - obj.asset_type = message.assetType; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.asset_type = message.assetType === 0 ? undefined : message.assetType; return obj; }, fromAminoMsg(object: SuperfluidAssetAminoMsg): SuperfluidAsset { @@ -403,9 +403,9 @@ export const SuperfluidIntermediaryAccount = { }, 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; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: SuperfluidIntermediaryAccountAminoMsg): SuperfluidIntermediaryAccount { @@ -498,9 +498,9 @@ export const OsmoEquivalentMultiplierRecord = { }, toAmino(message: OsmoEquivalentMultiplierRecord): OsmoEquivalentMultiplierRecordAmino { const obj: any = {}; - obj.epoch_number = message.epochNumber ? message.epochNumber.toString() : undefined; - obj.denom = message.denom; - obj.multiplier = message.multiplier; + obj.epoch_number = message.epochNumber !== BigInt(0) ? message.epochNumber.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.multiplier = message.multiplier === "" ? undefined : message.multiplier; return obj; }, fromAminoMsg(object: OsmoEquivalentMultiplierRecordAminoMsg): OsmoEquivalentMultiplierRecord { @@ -606,8 +606,8 @@ export const SuperfluidDelegationRecord = { }, toAmino(message: SuperfluidDelegationRecord): SuperfluidDelegationRecordAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : 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; @@ -691,8 +691,8 @@ export const LockIdIntermediaryAccountConnection = { }, toAmino(message: LockIdIntermediaryAccountConnection): LockIdIntermediaryAccountConnectionAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; - obj.intermediary_account = message.intermediaryAccount; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; + obj.intermediary_account = message.intermediaryAccount === "" ? undefined : message.intermediaryAccount; return obj; }, fromAminoMsg(object: LockIdIntermediaryAccountConnectionAminoMsg): LockIdIntermediaryAccountConnection { @@ -771,7 +771,7 @@ export const UnpoolWhitelistedPools = { if (message.ids) { obj.ids = message.ids.map(e => e.toString()); } else { - obj.ids = []; + obj.ids = message.ids; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputsign/osmosis/superfluid/tx.ts index ed16a14f31..f9828750d2 100644 --- a/__fixtures__/v-next/outputsign/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputsign/osmosis/superfluid/tx.ts @@ -288,9 +288,9 @@ export const MsgSuperfluidDelegate = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; return obj; }, fromAminoMsg(object: MsgSuperfluidDelegateAminoMsg): MsgSuperfluidDelegate { @@ -428,8 +428,8 @@ export const MsgSuperfluidUndelegate = { }, toAmino(message: MsgSuperfluidUndelegate): MsgSuperfluidUndelegateAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSuperfluidUndelegateAminoMsg): MsgSuperfluidUndelegate { @@ -567,8 +567,8 @@ export const MsgSuperfluidUnbondLock = { }, toAmino(message: MsgSuperfluidUnbondLock): MsgSuperfluidUnbondLockAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSuperfluidUnbondLockAminoMsg): MsgSuperfluidUnbondLock { @@ -713,13 +713,13 @@ export const MsgLockAndSuperfluidDelegate = { }, toAmino(message: MsgLockAndSuperfluidDelegate): MsgLockAndSuperfluidDelegateAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } - obj.val_addr = message.valAddr; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateAminoMsg): MsgLockAndSuperfluidDelegate { @@ -790,7 +790,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, toAmino(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateResponseAminoMsg): MsgLockAndSuperfluidDelegateResponse { @@ -872,8 +872,8 @@ export const MsgUnPoolWhitelistedPool = { }, toAmino(message: MsgUnPoolWhitelistedPool): MsgUnPoolWhitelistedPoolAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgUnPoolWhitelistedPoolAminoMsg): MsgUnPoolWhitelistedPool { @@ -952,7 +952,7 @@ export const MsgUnPoolWhitelistedPoolResponse = { if (message.exitedLockIds) { obj.exited_lock_ids = message.exitedLockIds.map(e => e.toString()); } else { - obj.exited_lock_ids = []; + obj.exited_lock_ids = message.exitedLockIds; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/superfluid/v1beta1/gov.ts b/__fixtures__/v-next/outputsign/osmosis/superfluid/v1beta1/gov.ts index 441fec78dd..69da138b40 100644 --- a/__fixtures__/v-next/outputsign/osmosis/superfluid/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputsign/osmosis/superfluid/v1beta1/gov.ts @@ -174,12 +174,12 @@ export const SetSuperfluidAssetsProposal = { }, toAmino(message: SetSuperfluidAssetsProposal): SetSuperfluidAssetsProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.assets) { obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -269,12 +269,12 @@ export const RemoveSuperfluidAssetsProposal = { }, toAmino(message: RemoveSuperfluidAssetsProposal): RemoveSuperfluidAssetsProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.superfluidAssetDenoms) { obj.superfluid_asset_denoms = message.superfluidAssetDenoms.map(e => e); } else { - obj.superfluid_asset_denoms = []; + obj.superfluid_asset_denoms = message.superfluidAssetDenoms; } return obj; }, @@ -384,14 +384,14 @@ export const UpdateUnpoolWhiteListProposal = { }, toAmino(message: UpdateUnpoolWhiteListProposal): UpdateUnpoolWhiteListProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.ids) { obj.ids = message.ids.map(e => e.toString()); } else { - obj.ids = []; + obj.ids = message.ids; } - obj.is_overwrite = message.isOverwrite; + obj.is_overwrite = message.isOverwrite === false ? undefined : message.isOverwrite; return obj; }, fromAminoMsg(object: UpdateUnpoolWhiteListProposalAminoMsg): UpdateUnpoolWhiteListProposal { diff --git a/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/authorityMetadata.ts b/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/authorityMetadata.ts index c7b44a2369..11ba9cf656 100644 --- a/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/authorityMetadata.ts +++ b/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/authorityMetadata.ts @@ -79,7 +79,7 @@ export const DenomAuthorityMetadata = { }, toAmino(message: DenomAuthorityMetadata): DenomAuthorityMetadataAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; return obj; }, fromAminoMsg(object: DenomAuthorityMetadataAminoMsg): DenomAuthorityMetadata { diff --git a/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/genesis.ts index 102a746cd4..dba5ba56f9 100644 --- a/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/genesis.ts @@ -122,7 +122,7 @@ export const GenesisState = { if (message.factoryDenoms) { obj.factory_denoms = message.factoryDenoms.map(e => e ? GenesisDenom.toAmino(e) : undefined); } else { - obj.factory_denoms = []; + obj.factory_denoms = message.factoryDenoms; } return obj; }, @@ -205,7 +205,7 @@ export const GenesisDenom = { }, toAmino(message: GenesisDenom): GenesisDenomAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.authority_metadata = message.authorityMetadata ? DenomAuthorityMetadata.toAmino(message.authorityMetadata) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/params.ts b/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/params.ts index 6a59d99d71..43c9f3e89d 100644 --- a/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/params.ts +++ b/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/params.ts @@ -67,7 +67,7 @@ export const Params = { if (message.denomCreationFee) { obj.denom_creation_fee = message.denomCreationFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.denom_creation_fee = []; + obj.denom_creation_fee = message.denomCreationFee; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/query.ts b/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/query.ts index b2fbead8b3..6bc2883b45 100644 --- a/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/query.ts @@ -326,7 +326,7 @@ export const QueryDenomAuthorityMetadataRequest = { }, toAmino(message: QueryDenomAuthorityMetadataRequest): QueryDenomAuthorityMetadataRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomAuthorityMetadataRequestAminoMsg): QueryDenomAuthorityMetadataRequest { @@ -466,7 +466,7 @@ export const QueryDenomsFromCreatorRequest = { }, toAmino(message: QueryDenomsFromCreatorRequest): QueryDenomsFromCreatorRequestAmino { const obj: any = {}; - obj.creator = message.creator; + obj.creator = message.creator === "" ? undefined : message.creator; return obj; }, fromAminoMsg(object: QueryDenomsFromCreatorRequestAminoMsg): QueryDenomsFromCreatorRequest { @@ -536,7 +536,7 @@ export const QueryDenomsFromCreatorResponse = { if (message.denoms) { obj.denoms = message.denoms.map(e => e); } else { - obj.denoms = []; + obj.denoms = message.denoms; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/tx.ts b/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/tx.ts index 2895ae61ff..ddc4a3a555 100644 --- a/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputsign/osmosis/tokenfactory/v1beta1/tx.ts @@ -341,8 +341,8 @@ export const MsgCreateDenom = { }, toAmino(message: MsgCreateDenom): MsgCreateDenomAmino { const obj: any = {}; - obj.sender = message.sender; - obj.subdenom = message.subdenom; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.subdenom = message.subdenom === "" ? undefined : message.subdenom; return obj; }, fromAminoMsg(object: MsgCreateDenomAminoMsg): MsgCreateDenom { @@ -411,7 +411,7 @@ export const MsgCreateDenomResponse = { }, toAmino(message: MsgCreateDenomResponse): MsgCreateDenomResponseAmino { const obj: any = {}; - obj.new_token_denom = message.newTokenDenom; + obj.new_token_denom = message.newTokenDenom === "" ? undefined : message.newTokenDenom; return obj; }, fromAminoMsg(object: MsgCreateDenomResponseAminoMsg): MsgCreateDenomResponse { @@ -493,7 +493,7 @@ export const MsgMint = { }, toAmino(message: MsgMint): MsgMintAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -632,7 +632,7 @@ export const MsgBurn = { }, toAmino(message: MsgBurn): MsgBurnAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -780,9 +780,9 @@ export const MsgChangeAdmin = { }, toAmino(message: MsgChangeAdmin): MsgChangeAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.denom = message.denom; - obj.new_admin = message.newAdmin; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgChangeAdminAminoMsg): MsgChangeAdmin { @@ -920,7 +920,7 @@ export const MsgSetDenomMetadata = { }, toAmino(message: MsgSetDenomMetadata): MsgSetDenomMetadataAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/twap/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/osmosis/twap/v1beta1/genesis.ts index a6a1b670c5..7f914fbd98 100644 --- a/__fixtures__/v-next/outputsign/osmosis/twap/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/osmosis/twap/v1beta1/genesis.ts @@ -110,7 +110,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.prune_epoch_identifier = message.pruneEpochIdentifier; + obj.prune_epoch_identifier = message.pruneEpochIdentifier === "" ? undefined : message.pruneEpochIdentifier; obj.record_history_keep_period = message.recordHistoryKeepPeriod ? Duration.toAmino(message.recordHistoryKeepPeriod) : undefined; return obj; }, @@ -194,7 +194,7 @@ export const GenesisState = { if (message.twaps) { obj.twaps = message.twaps.map(e => e ? TwapRecord.toAmino(e) : undefined); } else { - obj.twaps = []; + obj.twaps = message.twaps; } obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/osmosis/twap/v1beta1/query.ts b/__fixtures__/v-next/outputsign/osmosis/twap/v1beta1/query.ts index 89e4426603..58438f8ef7 100644 --- a/__fixtures__/v-next/outputsign/osmosis/twap/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/osmosis/twap/v1beta1/query.ts @@ -211,9 +211,9 @@ export const ArithmeticTwapRequest = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset === "" ? undefined : message.baseAsset; + obj.quote_asset = message.quoteAsset === "" ? undefined : message.quoteAsset; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; return obj; @@ -284,7 +284,7 @@ export const ArithmeticTwapResponse = { }, toAmino(message: ArithmeticTwapResponse): ArithmeticTwapResponseAmino { const obj: any = {}; - obj.arithmetic_twap = message.arithmeticTwap; + obj.arithmetic_twap = message.arithmeticTwap === "" ? undefined : message.arithmeticTwap; return obj; }, fromAminoMsg(object: ArithmeticTwapResponseAminoMsg): ArithmeticTwapResponse { @@ -388,9 +388,9 @@ export const ArithmeticTwapToNowRequest = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset === "" ? undefined : message.baseAsset; + obj.quote_asset = message.quoteAsset === "" ? undefined : message.quoteAsset; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, @@ -460,7 +460,7 @@ export const ArithmeticTwapToNowResponse = { }, toAmino(message: ArithmeticTwapToNowResponse): ArithmeticTwapToNowResponseAmino { const obj: any = {}; - obj.arithmetic_twap = message.arithmeticTwap; + obj.arithmetic_twap = message.arithmeticTwap === "" ? undefined : message.arithmeticTwap; return obj; }, fromAminoMsg(object: ArithmeticTwapToNowResponseAminoMsg): ArithmeticTwapToNowResponse { diff --git a/__fixtures__/v-next/outputsign/osmosis/twap/v1beta1/twap_record.ts b/__fixtures__/v-next/outputsign/osmosis/twap/v1beta1/twap_record.ts index a320e5ff99..f56f652c26 100644 --- a/__fixtures__/v-next/outputsign/osmosis/twap/v1beta1/twap_record.ts +++ b/__fixtures__/v-next/outputsign/osmosis/twap/v1beta1/twap_record.ts @@ -60,7 +60,7 @@ export interface TwapRecordAmino { /** Lexicographically larger denom of the pair */ asset1_denom?: string; /** height this record corresponds to, for debugging purposes */ - height?: string; + height: string; /** * This field should only exist until we have a global registry in the state * machine, mapping prior block heights within {TIME RANGE} to times. @@ -253,15 +253,15 @@ export const TwapRecord = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.asset0_denom = message.asset0Denom === "" ? undefined : message.asset0Denom; + obj.asset1_denom = message.asset1Denom === "" ? undefined : message.asset1Denom; + obj.height = message.height ? message.height.toString() : "0"; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - 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.p0_last_spot_price = message.p0LastSpotPrice === "" ? undefined : message.p0LastSpotPrice; + obj.p1_last_spot_price = message.p1LastSpotPrice === "" ? undefined : message.p1LastSpotPrice; + obj.p0_arithmetic_twap_accumulator = message.p0ArithmeticTwapAccumulator === "" ? undefined : message.p0ArithmeticTwapAccumulator; + obj.p1_arithmetic_twap_accumulator = message.p1ArithmeticTwapAccumulator === "" ? undefined : message.p1ArithmeticTwapAccumulator; obj.last_error_time = message.lastErrorTime ? Timestamp.toAmino(toTimestamp(message.lastErrorTime)) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/feetoken.ts b/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/feetoken.ts index 07d9ec3a89..b24814f1fd 100644 --- a/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/feetoken.ts +++ b/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/feetoken.ts @@ -96,8 +96,8 @@ export const FeeToken = { }, toAmino(message: FeeToken): FeeTokenAmino { const obj: any = {}; - obj.denom = message.denom; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; return obj; }, fromAminoMsg(object: FeeTokenAminoMsg): FeeToken { diff --git a/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/genesis.ts b/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/genesis.ts index 836dbde3fd..baab1167fe 100644 --- a/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/genesis.ts @@ -78,11 +78,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.basedenom = message.basedenom; + obj.basedenom = message.basedenom === "" ? undefined : message.basedenom; if (message.feetokens) { obj.feetokens = message.feetokens.map(e => e ? FeeToken.toAmino(e) : undefined); } else { - obj.feetokens = []; + obj.feetokens = message.feetokens; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/gov.ts b/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/gov.ts index e6dd79006c..4f7593cefd 100644 --- a/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/gov.ts @@ -114,8 +114,8 @@ export const UpdateFeeTokenProposal = { }, toAmino(message: UpdateFeeTokenProposal): UpdateFeeTokenProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.feetoken = message.feetoken ? FeeToken.toAmino(message.feetoken) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/query.ts b/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/query.ts index d4247f09af..bc10b430ad 100644 --- a/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/query.ts +++ b/__fixtures__/v-next/outputsign/osmosis/txfees/v1beta1/query.ts @@ -255,7 +255,7 @@ export const QueryFeeTokensResponse = { if (message.feeTokens) { obj.fee_tokens = message.feeTokens.map(e => e ? FeeToken.toAmino(e) : undefined); } else { - obj.fee_tokens = []; + obj.fee_tokens = message.feeTokens; } return obj; }, @@ -325,7 +325,7 @@ export const QueryDenomSpotPriceRequest = { }, toAmino(message: QueryDenomSpotPriceRequest): QueryDenomSpotPriceRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomSpotPriceRequestAminoMsg): QueryDenomSpotPriceRequest { @@ -407,8 +407,8 @@ export const QueryDenomSpotPriceResponse = { }, toAmino(message: QueryDenomSpotPriceResponse): QueryDenomSpotPriceResponseAmino { const obj: any = {}; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; - obj.spot_price = message.spotPrice; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QueryDenomSpotPriceResponseAminoMsg): QueryDenomSpotPriceResponse { @@ -477,7 +477,7 @@ export const QueryDenomPoolIdRequest = { }, toAmino(message: QueryDenomPoolIdRequest): QueryDenomPoolIdRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomPoolIdRequestAminoMsg): QueryDenomPoolIdRequest { @@ -548,7 +548,7 @@ export const QueryDenomPoolIdResponse = { }, toAmino(message: QueryDenomPoolIdResponse): QueryDenomPoolIdResponseAmino { const obj: any = {}; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; return obj; }, fromAminoMsg(object: QueryDenomPoolIdResponseAminoMsg): QueryDenomPoolIdResponse { @@ -673,7 +673,7 @@ export const QueryBaseDenomResponse = { }, toAmino(message: QueryBaseDenomResponse): QueryBaseDenomResponseAmino { const obj: any = {}; - obj.base_denom = message.baseDenom; + obj.base_denom = message.baseDenom === "" ? undefined : message.baseDenom; return obj; }, fromAminoMsg(object: QueryBaseDenomResponseAminoMsg): QueryBaseDenomResponse { diff --git a/__fixtures__/v-next/outputsign/tendermint/abci/types.ts b/__fixtures__/v-next/outputsign/tendermint/abci/types.ts index 85a618a76f..91b8a1b8e2 100644 --- a/__fixtures__/v-next/outputsign/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputsign/tendermint/abci/types.ts @@ -1691,7 +1691,7 @@ export const RequestEcho = { }, toAmino(message: RequestEcho): RequestEchoAmino { const obj: any = {}; - obj.message = message.message; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: RequestEchoAminoMsg): RequestEcho { @@ -1830,9 +1830,9 @@ export const RequestInfo = { }, 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; + obj.version = message.version === "" ? undefined : message.version; + obj.block_version = message.blockVersion !== BigInt(0) ? message.blockVersion.toString() : undefined; + obj.p2p_version = message.p2pVersion !== BigInt(0) ? message.p2pVersion.toString() : undefined; return obj; }, fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo { @@ -1906,8 +1906,8 @@ export const RequestSetOption = { }, toAmino(message: RequestSetOption): RequestSetOptionAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: RequestSetOptionAminoMsg): RequestSetOption { @@ -2028,15 +2028,15 @@ export const RequestInitChain = { toAmino(message: RequestInitChain): RequestInitChainAmino { const obj: any = {}; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : 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.validators = message.validators; } obj.app_state_bytes = message.appStateBytes ? base64FromBytes(message.appStateBytes) : undefined; - obj.initial_height = message.initialHeight ? message.initialHeight.toString() : undefined; + obj.initial_height = message.initialHeight !== BigInt(0) ? message.initialHeight.toString() : undefined; return obj; }, fromAminoMsg(object: RequestInitChainAminoMsg): RequestInitChain { @@ -2135,9 +2135,9 @@ export const RequestQuery = { toAmino(message: RequestQuery): RequestQueryAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.path = message.path; - obj.height = message.height ? message.height.toString() : undefined; - obj.prove = message.prove; + obj.path = message.path === "" ? undefined : message.path; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.prove = message.prove === false ? undefined : message.prove; return obj; }, fromAminoMsg(object: RequestQueryAminoMsg): RequestQuery { @@ -2241,7 +2241,7 @@ export const RequestBeginBlock = { if (message.byzantineValidators) { obj.byzantine_validators = message.byzantineValidators.map(e => e ? Evidence.toAmino(e) : undefined); } else { - obj.byzantine_validators = []; + obj.byzantine_validators = message.byzantineValidators; } return obj; }, @@ -2310,14 +2310,14 @@ export const RequestCheckTx = { message.tx = bytesFromBase64(object.tx); } if (object.type !== undefined && object.type !== null) { - message.type = checkTxTypeFromJSON(object.type); + message.type = object.type; } return message; }, toAmino(message: RequestCheckTx): RequestCheckTxAmino { const obj: any = {}; obj.tx = message.tx ? base64FromBytes(message.tx) : undefined; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; return obj; }, fromAminoMsg(object: RequestCheckTxAminoMsg): RequestCheckTx { @@ -2445,7 +2445,7 @@ export const RequestEndBlock = { }, toAmino(message: RequestEndBlock): RequestEndBlockAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: RequestEndBlockAminoMsg): RequestEndBlock { @@ -2709,9 +2709,9 @@ export const RequestLoadSnapshotChunk = { }, toAmino(message: RequestLoadSnapshotChunk): RequestLoadSnapshotChunkAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunk = message.chunk; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunk = message.chunk === 0 ? undefined : message.chunk; return obj; }, fromAminoMsg(object: RequestLoadSnapshotChunkAminoMsg): RequestLoadSnapshotChunk { @@ -2796,9 +2796,9 @@ export const RequestApplySnapshotChunk = { }, toAmino(message: RequestApplySnapshotChunk): RequestApplySnapshotChunkAmino { const obj: any = {}; - obj.index = message.index; + obj.index = message.index === 0 ? undefined : message.index; obj.chunk = message.chunk ? base64FromBytes(message.chunk) : undefined; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: RequestApplySnapshotChunkAminoMsg): RequestApplySnapshotChunk { @@ -3136,7 +3136,7 @@ export const ResponseException = { }, toAmino(message: ResponseException): ResponseExceptionAmino { const obj: any = {}; - obj.error = message.error; + obj.error = message.error === "" ? undefined : message.error; return obj; }, fromAminoMsg(object: ResponseExceptionAminoMsg): ResponseException { @@ -3199,7 +3199,7 @@ export const ResponseEcho = { }, toAmino(message: ResponseEcho): ResponseEchoAmino { const obj: any = {}; - obj.message = message.message; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: ResponseEchoAminoMsg): ResponseEcho { @@ -3360,10 +3360,10 @@ export const ResponseInfo = { }, 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.data = message.data === "" ? undefined : message.data; + obj.version = message.version === "" ? undefined : message.version; + obj.app_version = message.appVersion !== BigInt(0) ? message.appVersion.toString() : undefined; + obj.last_block_height = message.lastBlockHeight !== BigInt(0) ? message.lastBlockHeight.toString() : undefined; obj.last_block_app_hash = message.lastBlockAppHash ? base64FromBytes(message.lastBlockAppHash) : undefined; return obj; }, @@ -3449,9 +3449,9 @@ export const ResponseSetOption = { }, toAmino(message: ResponseSetOption): ResponseSetOptionAmino { const obj: any = {}; - obj.code = message.code; - obj.log = message.log; - obj.info = message.info; + obj.code = message.code === 0 ? undefined : message.code; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; return obj; }, fromAminoMsg(object: ResponseSetOptionAminoMsg): ResponseSetOption { @@ -3540,7 +3540,7 @@ export const ResponseInitChain = { if (message.validators) { obj.validators = message.validators.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.app_hash = message.appHash ? base64FromBytes(message.appHash) : undefined; return obj; @@ -3699,15 +3699,15 @@ export const ResponseQuery = { }, 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.code = message.code === 0 ? undefined : message.code; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; obj.proof_ops = message.proofOps ? ProofOps.toAmino(message.proofOps) : undefined; - obj.height = message.height ? message.height.toString() : undefined; - obj.codespace = message.codespace; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseQueryAminoMsg): ResponseQuery { @@ -3771,7 +3771,7 @@ export const ResponseBeginBlock = { if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -3914,18 +3914,18 @@ export const ResponseCheckTx = { }, toAmino(message: ResponseCheckTx): ResponseCheckTxAmino { const obj: any = {}; - obj.code = message.code; + obj.code = message.code === 0 ? undefined : message.code; obj.data = message.data ? base64FromBytes(message.data) : undefined; - 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; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } - obj.codespace = message.codespace; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseCheckTxAminoMsg): ResponseCheckTx { @@ -4067,18 +4067,18 @@ export const ResponseDeliverTx = { }, toAmino(message: ResponseDeliverTx): ResponseDeliverTxAmino { const obj: any = {}; - obj.code = message.code; + obj.code = message.code === 0 ? undefined : message.code; obj.data = message.data ? base64FromBytes(message.data) : undefined; - 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; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } - obj.codespace = message.codespace; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseDeliverTxAminoMsg): ResponseDeliverTx { @@ -4164,13 +4164,13 @@ export const ResponseEndBlock = { if (message.validatorUpdates) { obj.validator_updates = message.validatorUpdates.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); } else { - obj.validator_updates = []; + obj.validator_updates = message.validatorUpdates; } 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 = []; + obj.events = message.events; } return obj; }, @@ -4248,7 +4248,7 @@ export const ResponseCommit = { toAmino(message: ResponseCommit): ResponseCommitAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.retain_height = message.retainHeight ? message.retainHeight.toString() : undefined; + obj.retain_height = message.retainHeight !== BigInt(0) ? message.retainHeight.toString() : undefined; return obj; }, fromAminoMsg(object: ResponseCommitAminoMsg): ResponseCommit { @@ -4312,7 +4312,7 @@ export const ResponseListSnapshots = { if (message.snapshots) { obj.snapshots = message.snapshots.map(e => e ? Snapshot.toAmino(e) : undefined); } else { - obj.snapshots = []; + obj.snapshots = message.snapshots; } return obj; }, @@ -4370,13 +4370,13 @@ export const ResponseOfferSnapshot = { fromAmino(object: ResponseOfferSnapshotAmino): ResponseOfferSnapshot { const message = createBaseResponseOfferSnapshot(); if (object.result !== undefined && object.result !== null) { - message.result = responseOfferSnapshot_ResultFromJSON(object.result); + message.result = object.result; } return message; }, toAmino(message: ResponseOfferSnapshot): ResponseOfferSnapshotAmino { const obj: any = {}; - obj.result = message.result; + obj.result = message.result === 0 ? undefined : message.result; return obj; }, fromAminoMsg(object: ResponseOfferSnapshotAminoMsg): ResponseOfferSnapshot { @@ -4521,7 +4521,7 @@ export const ResponseApplySnapshotChunk = { fromAmino(object: ResponseApplySnapshotChunkAmino): ResponseApplySnapshotChunk { const message = createBaseResponseApplySnapshotChunk(); if (object.result !== undefined && object.result !== null) { - message.result = responseApplySnapshotChunk_ResultFromJSON(object.result); + message.result = object.result; } message.refetchChunks = object.refetch_chunks?.map(e => e) || []; message.rejectSenders = object.reject_senders?.map(e => e) || []; @@ -4529,16 +4529,16 @@ export const ResponseApplySnapshotChunk = { }, toAmino(message: ResponseApplySnapshotChunk): ResponseApplySnapshotChunkAmino { const obj: any = {}; - obj.result = message.result; + obj.result = message.result === 0 ? undefined : message.result; if (message.refetchChunks) { obj.refetch_chunks = message.refetchChunks.map(e => e); } else { - obj.refetch_chunks = []; + obj.refetch_chunks = message.refetchChunks; } if (message.rejectSenders) { obj.reject_senders = message.rejectSenders.map(e => e); } else { - obj.reject_senders = []; + obj.reject_senders = message.rejectSenders; } return obj; }, @@ -4724,8 +4724,8 @@ export const BlockParams = { }, 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.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas !== BigInt(0) ? message.maxGas.toString() : undefined; return obj; }, fromAminoMsg(object: BlockParamsAminoMsg): BlockParams { @@ -4797,11 +4797,11 @@ export const LastCommitInfo = { }, toAmino(message: LastCommitInfo): LastCommitInfoAmino { const obj: any = {}; - obj.round = message.round; + obj.round = message.round === 0 ? undefined : message.round; if (message.votes) { obj.votes = message.votes.map(e => e ? VoteInfo.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } return obj; }, @@ -4874,11 +4874,11 @@ export const Event = { }, toAmino(message: Event): EventAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? EventAttribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -4966,7 +4966,7 @@ export const EventAttribute = { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; - obj.index = message.index; + obj.index = message.index === false ? undefined : message.index; return obj; }, fromAminoMsg(object: EventAttributeAminoMsg): EventAttribute { @@ -5066,8 +5066,8 @@ export const TxResult = { }, toAmino(message: TxResult): TxResultAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.index = message.index; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.index = message.index === 0 ? undefined : message.index; obj.tx = message.tx ? base64FromBytes(message.tx) : undefined; obj.result = message.result ? ResponseDeliverTx.toAmino(message.result) : undefined; return obj; @@ -5146,7 +5146,7 @@ export const Validator = { toAmino(message: Validator): ValidatorAmino { const obj: any = {}; obj.address = message.address ? base64FromBytes(message.address) : undefined; - obj.power = message.power ? message.power.toString() : undefined; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -5225,7 +5225,7 @@ export const ValidatorUpdate = { 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; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorUpdateAminoMsg): ValidatorUpdate { @@ -5302,7 +5302,7 @@ export const VoteInfo = { toAmino(message: VoteInfo): VoteInfoAmino { const obj: any = {}; obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; - obj.signed_last_block = message.signedLastBlock; + obj.signed_last_block = message.signedLastBlock === false ? undefined : message.signedLastBlock; return obj; }, fromAminoMsg(object: VoteInfoAminoMsg): VoteInfo { @@ -5397,7 +5397,7 @@ export const Evidence = { fromAmino(object: EvidenceAmino): Evidence { const message = createBaseEvidence(); if (object.type !== undefined && object.type !== null) { - message.type = evidenceTypeFromJSON(object.type); + message.type = object.type; } if (object.validator !== undefined && object.validator !== null) { message.validator = Validator.fromAmino(object.validator); @@ -5415,11 +5415,11 @@ export const Evidence = { }, toAmino(message: Evidence): EvidenceAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; return obj; }, fromAminoMsg(object: EvidenceAminoMsg): Evidence { @@ -5528,9 +5528,9 @@ export const Snapshot = { }, toAmino(message: Snapshot): SnapshotAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunks = message.chunks; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunks = message.chunks === 0 ? undefined : message.chunks; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; obj.metadata = message.metadata ? base64FromBytes(message.metadata) : undefined; return obj; diff --git a/__fixtures__/v-next/outputsign/tendermint/crypto/proof.ts b/__fixtures__/v-next/outputsign/tendermint/crypto/proof.ts index 47c7d7e27c..74328b2835 100644 --- a/__fixtures__/v-next/outputsign/tendermint/crypto/proof.ts +++ b/__fixtures__/v-next/outputsign/tendermint/crypto/proof.ts @@ -211,13 +211,13 @@ export const Proof = { }, toAmino(message: Proof): ProofAmino { const obj: any = {}; - obj.total = message.total ? message.total.toString() : undefined; - obj.index = message.index ? message.index.toString() : undefined; + obj.total = message.total !== BigInt(0) ? message.total.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.leaf_hash = message.leafHash ? base64FromBytes(message.leafHash) : undefined; if (message.aunts) { obj.aunts = message.aunts.map(e => base64FromBytes(e)); } else { - obj.aunts = []; + obj.aunts = message.aunts; } return obj; }, @@ -380,9 +380,9 @@ export const DominoOp = { }, toAmino(message: DominoOp): DominoOpAmino { const obj: any = {}; - obj.key = message.key; - obj.input = message.input; - obj.output = message.output; + obj.key = message.key === "" ? undefined : message.key; + obj.input = message.input === "" ? undefined : message.input; + obj.output = message.output === "" ? undefined : message.output; return obj; }, fromAminoMsg(object: DominoOpAminoMsg): DominoOp { @@ -467,7 +467,7 @@ export const ProofOp = { }, toAmino(message: ProofOp): ProofOpAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; @@ -533,7 +533,7 @@ export const ProofOps = { if (message.ops) { obj.ops = message.ops.map(e => e ? ProofOp.toAmino(e) : undefined); } else { - obj.ops = []; + obj.ops = message.ops; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/tendermint/libs/bits/types.ts b/__fixtures__/v-next/outputsign/tendermint/libs/bits/types.ts index 6e28f1d483..89bfb95e91 100644 --- a/__fixtures__/v-next/outputsign/tendermint/libs/bits/types.ts +++ b/__fixtures__/v-next/outputsign/tendermint/libs/bits/types.ts @@ -85,11 +85,11 @@ export const BitArray = { }, toAmino(message: BitArray): BitArrayAmino { const obj: any = {}; - obj.bits = message.bits ? message.bits.toString() : undefined; + obj.bits = message.bits !== BigInt(0) ? message.bits.toString() : undefined; if (message.elems) { obj.elems = message.elems.map(e => e.toString()); } else { - obj.elems = []; + obj.elems = message.elems; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/tendermint/p2p/types.ts b/__fixtures__/v-next/outputsign/tendermint/p2p/types.ts index f4d7ea731f..b663b8b6e0 100644 --- a/__fixtures__/v-next/outputsign/tendermint/p2p/types.ts +++ b/__fixtures__/v-next/outputsign/tendermint/p2p/types.ts @@ -204,9 +204,9 @@ export const ProtocolVersion = { }, 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; + obj.p2p = message.p2p !== BigInt(0) ? message.p2p.toString() : undefined; + obj.block = message.block !== BigInt(0) ? message.block.toString() : undefined; + obj.app = message.app !== BigInt(0) ? message.app.toString() : undefined; return obj; }, fromAminoMsg(object: ProtocolVersionAminoMsg): ProtocolVersion { @@ -351,12 +351,12 @@ export const NodeInfo = { 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.node_id = message.nodeId === "" ? undefined : message.nodeId; + obj.listen_addr = message.listenAddr === "" ? undefined : message.listenAddr; + obj.network = message.network === "" ? undefined : message.network; + obj.version = message.version === "" ? undefined : message.version; obj.channels = message.channels ? base64FromBytes(message.channels) : undefined; - obj.moniker = message.moniker; + obj.moniker = message.moniker === "" ? undefined : message.moniker; obj.other = message.other ? NodeInfoOther.toAmino(message.other) : undefined; return obj; }, @@ -431,8 +431,8 @@ export const NodeInfoOther = { }, toAmino(message: NodeInfoOther): NodeInfoOtherAmino { const obj: any = {}; - obj.tx_index = message.txIndex; - obj.rpc_address = message.rpcAddress; + obj.tx_index = message.txIndex === "" ? undefined : message.txIndex; + obj.rpc_address = message.rpcAddress === "" ? undefined : message.rpcAddress; return obj; }, fromAminoMsg(object: NodeInfoOtherAminoMsg): NodeInfoOther { @@ -515,11 +515,11 @@ export const PeerInfo = { }, toAmino(message: PeerInfo): PeerInfoAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; if (message.addressInfo) { obj.address_info = message.addressInfo.map(e => e ? PeerAddressInfo.toAmino(e) : undefined); } else { - obj.address_info = []; + obj.address_info = message.addressInfo; } obj.last_connected = message.lastConnected ? Timestamp.toAmino(toTimestamp(message.lastConnected)) : undefined; return obj; @@ -617,10 +617,10 @@ export const PeerAddressInfo = { }, toAmino(message: PeerAddressInfo): PeerAddressInfoAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.last_dial_success = message.lastDialSuccess ? Timestamp.toAmino(toTimestamp(message.lastDialSuccess)) : undefined; obj.last_dial_failure = message.lastDialFailure ? Timestamp.toAmino(toTimestamp(message.lastDialFailure)) : undefined; - obj.dial_failures = message.dialFailures; + obj.dial_failures = message.dialFailures === 0 ? undefined : message.dialFailures; return obj; }, fromAminoMsg(object: PeerAddressInfoAminoMsg): PeerAddressInfo { diff --git a/__fixtures__/v-next/outputsign/tendermint/types/evidence.ts b/__fixtures__/v-next/outputsign/tendermint/types/evidence.ts index 1b15528d9b..7bcd8a747c 100644 --- a/__fixtures__/v-next/outputsign/tendermint/types/evidence.ts +++ b/__fixtures__/v-next/outputsign/tendermint/types/evidence.ts @@ -282,8 +282,8 @@ export const DuplicateVoteEvidence = { 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.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; + obj.validator_power = message.validatorPower !== BigInt(0) ? message.validatorPower.toString() : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -396,13 +396,13 @@ export const LightClientAttackEvidence = { 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; + obj.common_height = message.commonHeight !== BigInt(0) ? message.commonHeight.toString() : undefined; if (message.byzantineValidators) { obj.byzantine_validators = message.byzantineValidators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.byzantine_validators = []; + obj.byzantine_validators = message.byzantineValidators; } - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -467,7 +467,7 @@ export const EvidenceList = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Evidence.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } return obj; }, diff --git a/__fixtures__/v-next/outputsign/tendermint/types/params.ts b/__fixtures__/v-next/outputsign/tendermint/types/params.ts index cf21dae310..581032d686 100644 --- a/__fixtures__/v-next/outputsign/tendermint/types/params.ts +++ b/__fixtures__/v-next/outputsign/tendermint/types/params.ts @@ -419,9 +419,9 @@ export const BlockParams = { }, 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; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas !== BigInt(0) ? message.maxGas.toString() : undefined; + obj.time_iota_ms = message.timeIotaMs !== BigInt(0) ? message.timeIotaMs.toString() : undefined; return obj; }, fromAminoMsg(object: BlockParamsAminoMsg): BlockParams { @@ -512,9 +512,9 @@ export const EvidenceParams = { }, toAmino(message: EvidenceParams): EvidenceParamsAmino { const obj: any = {}; - obj.max_age_num_blocks = message.maxAgeNumBlocks ? message.maxAgeNumBlocks.toString() : undefined; + obj.max_age_num_blocks = message.maxAgeNumBlocks !== BigInt(0) ? message.maxAgeNumBlocks.toString() : undefined; obj.max_age_duration = message.maxAgeDuration ? Duration.toAmino(message.maxAgeDuration) : undefined; - obj.max_bytes = message.maxBytes ? message.maxBytes.toString() : undefined; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; return obj; }, fromAminoMsg(object: EvidenceParamsAminoMsg): EvidenceParams { @@ -578,7 +578,7 @@ export const ValidatorParams = { if (message.pubKeyTypes) { obj.pub_key_types = message.pubKeyTypes.map(e => e); } else { - obj.pub_key_types = []; + obj.pub_key_types = message.pubKeyTypes; } return obj; }, @@ -644,7 +644,7 @@ export const VersionParams = { }, toAmino(message: VersionParams): VersionParamsAmino { const obj: any = {}; - obj.app_version = message.appVersion ? message.appVersion.toString() : undefined; + obj.app_version = message.appVersion !== BigInt(0) ? message.appVersion.toString() : undefined; return obj; }, fromAminoMsg(object: VersionParamsAminoMsg): VersionParams { @@ -722,8 +722,8 @@ export const HashedParams = { }, 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; + obj.block_max_bytes = message.blockMaxBytes !== BigInt(0) ? message.blockMaxBytes.toString() : undefined; + obj.block_max_gas = message.blockMaxGas !== BigInt(0) ? message.blockMaxGas.toString() : undefined; return obj; }, fromAminoMsg(object: HashedParamsAminoMsg): HashedParams { diff --git a/__fixtures__/v-next/outputsign/tendermint/types/types.ts b/__fixtures__/v-next/outputsign/tendermint/types/types.ts index 317601660e..bf695a7392 100644 --- a/__fixtures__/v-next/outputsign/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputsign/tendermint/types/types.ts @@ -565,7 +565,7 @@ export const PartSetHeader = { }, toAmino(message: PartSetHeader): PartSetHeaderAmino { const obj: any = {}; - obj.total = message.total; + obj.total = message.total === 0 ? undefined : message.total; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; return obj; }, @@ -653,7 +653,7 @@ export const Part = { }, toAmino(message: Part): PartAmino { const obj: any = {}; - obj.index = message.index; + obj.index = message.index === 0 ? undefined : message.index; obj.bytes = message.bytes ? base64FromBytes(message.bytes) : undefined; obj.proof = message.proof ? Proof.toAmino(message.proof) : undefined; return obj; @@ -945,8 +945,8 @@ export const Header = { 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.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; obj.last_block_id = message.lastBlockId ? BlockID.toAmino(message.lastBlockId) : undefined; obj.last_commit_hash = message.lastCommitHash ? base64FromBytes(message.lastCommitHash) : undefined; @@ -1021,7 +1021,7 @@ export const Data = { if (message.txs) { obj.txs = message.txs.map(e => base64FromBytes(e)); } else { - obj.txs = []; + obj.txs = message.txs; } return obj; }, @@ -1139,7 +1139,7 @@ export const Vote = { fromAmino(object: VoteAmino): Vote { const message = createBaseVote(); if (object.type !== undefined && object.type !== null) { - message.type = signedMsgTypeFromJSON(object.type); + message.type = object.type; } if (object.height !== undefined && object.height !== null) { message.height = BigInt(object.height); @@ -1166,13 +1166,13 @@ export const Vote = { }, toAmino(message: Vote): VoteAmino { const obj: any = {}; - obj.type = message.type; - obj.height = message.height ? message.height.toString() : undefined; - obj.round = message.round; + obj.type = message.type === 0 ? undefined : message.type; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.validator_address = message.validatorAddress ? base64FromBytes(message.validatorAddress) : undefined; - obj.validator_index = message.validatorIndex; + obj.validator_index = message.validatorIndex === 0 ? undefined : message.validatorIndex; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; return obj; }, @@ -1271,13 +1271,13 @@ export const Commit = { }, toAmino(message: Commit): CommitAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.round = message.round; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : 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 = []; + obj.signatures = message.signatures; } return obj; }, @@ -1359,7 +1359,7 @@ export const CommitSig = { fromAmino(object: CommitSigAmino): CommitSig { const message = createBaseCommitSig(); if (object.block_id_flag !== undefined && object.block_id_flag !== null) { - message.blockIdFlag = blockIDFlagFromJSON(object.block_id_flag); + message.blockIdFlag = object.block_id_flag; } if (object.validator_address !== undefined && object.validator_address !== null) { message.validatorAddress = bytesFromBase64(object.validator_address); @@ -1374,7 +1374,7 @@ export const CommitSig = { }, toAmino(message: CommitSig): CommitSigAmino { const obj: any = {}; - obj.block_id_flag = message.blockIdFlag; + obj.block_id_flag = message.blockIdFlag === 0 ? undefined : message.blockIdFlag; obj.validator_address = message.validatorAddress ? base64FromBytes(message.validatorAddress) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; @@ -1486,7 +1486,7 @@ export const Proposal = { fromAmino(object: ProposalAmino): Proposal { const message = createBaseProposal(); if (object.type !== undefined && object.type !== null) { - message.type = signedMsgTypeFromJSON(object.type); + message.type = object.type; } if (object.height !== undefined && object.height !== null) { message.height = BigInt(object.height); @@ -1510,10 +1510,10 @@ export const Proposal = { }, 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.type = message.type === 0 ? undefined : message.type; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; + obj.pol_round = message.polRound === 0 ? undefined : message.polRound; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; @@ -1779,9 +1779,9 @@ export const BlockMeta = { 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.block_size = message.blockSize !== BigInt(0) ? message.blockSize.toString() : undefined; obj.header = message.header ? Header.toAmino(message.header) : undefined; - obj.num_txs = message.numTxs ? message.numTxs.toString() : undefined; + obj.num_txs = message.numTxs !== BigInt(0) ? message.numTxs.toString() : undefined; return obj; }, fromAminoMsg(object: BlockMetaAminoMsg): BlockMeta { diff --git a/__fixtures__/v-next/outputsign/tendermint/types/validator.ts b/__fixtures__/v-next/outputsign/tendermint/types/validator.ts index 9958a56bbd..e860a9ddb5 100644 --- a/__fixtures__/v-next/outputsign/tendermint/types/validator.ts +++ b/__fixtures__/v-next/outputsign/tendermint/types/validator.ts @@ -142,10 +142,10 @@ export const ValidatorSet = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.proposer = message.proposer ? Validator.toAmino(message.proposer) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorSetAminoMsg): ValidatorSet { @@ -249,8 +249,8 @@ export const Validator = { const obj: any = {}; obj.address = message.address ? base64FromBytes(message.address) : undefined; 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority !== BigInt(0) ? message.proposerPriority.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -329,7 +329,7 @@ export const SimpleValidator = { 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; return obj; }, fromAminoMsg(object: SimpleValidatorAminoMsg): SimpleValidator { diff --git a/__fixtures__/v-next/outputsign/tendermint/version/types.ts b/__fixtures__/v-next/outputsign/tendermint/version/types.ts index ba686782f5..881ca73be2 100644 --- a/__fixtures__/v-next/outputsign/tendermint/version/types.ts +++ b/__fixtures__/v-next/outputsign/tendermint/version/types.ts @@ -128,8 +128,8 @@ export const App = { }, toAmino(message: App): AppAmino { const obj: any = {}; - obj.protocol = message.protocol ? message.protocol.toString() : undefined; - obj.software = message.software; + obj.protocol = message.protocol !== BigInt(0) ? message.protocol.toString() : undefined; + obj.software = message.software === "" ? undefined : message.software; return obj; }, fromAminoMsg(object: AppAminoMsg): App { @@ -207,8 +207,8 @@ export const Consensus = { }, toAmino(message: Consensus): ConsensusAmino { const obj: any = {}; - obj.block = message.block ? message.block.toString() : undefined; - obj.app = message.app ? message.app.toString() : undefined; + obj.block = message.block !== BigInt(0) ? message.block.toString() : undefined; + obj.app = message.app !== BigInt(0) ? message.app.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusAminoMsg): Consensus { diff --git a/__fixtures__/v-next/outputv2/akash/audit/v1beta1/audit.ts b/__fixtures__/v-next/outputv2/akash/audit/v1beta1/audit.ts index 7cb567addc..7168cff660 100644 --- a/__fixtures__/v-next/outputv2/akash/audit/v1beta1/audit.ts +++ b/__fixtures__/v-next/outputv2/akash/audit/v1beta1/audit.ts @@ -14,9 +14,9 @@ export interface ProviderProtoMsg { } /** Provider stores owner auditor and attributes details */ export interface ProviderAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } export interface ProviderAminoMsg { type: "/akash.audit.v1beta1.Provider"; @@ -40,9 +40,9 @@ export interface AuditedAttributesProtoMsg { } /** Attributes */ export interface AuditedAttributesAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } export interface AuditedAttributesAminoMsg { type: "/akash.audit.v1beta1.AuditedAttributes"; @@ -64,7 +64,7 @@ export interface AttributesResponseProtoMsg { } /** AttributesResponse represents details of deployment along with group details */ export interface AttributesResponseAmino { - attributes?: AuditedAttributesAmino[]; + attributes: AuditedAttributesAmino[]; } export interface AttributesResponseAminoMsg { type: "/akash.audit.v1beta1.AttributesResponse"; @@ -85,8 +85,8 @@ export interface AttributesFiltersProtoMsg { } /** AttributesFilters defines filters used to filter deployments */ export interface AttributesFiltersAmino { - auditors?: string[]; - owners?: string[]; + auditors: string[]; + owners: string[]; } export interface AttributesFiltersAminoMsg { type: "/akash.audit.v1beta1.AttributesFilters"; @@ -109,9 +109,9 @@ export interface MsgSignProviderAttributesProtoMsg { } /** MsgSignProviderAttributes defines an SDK message for signing a provider attributes */ export interface MsgSignProviderAttributesAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } export interface MsgSignProviderAttributesAminoMsg { type: "/akash.audit.v1beta1.MsgSignProviderAttributes"; @@ -149,9 +149,9 @@ export interface MsgDeleteProviderAttributesProtoMsg { } /** MsgDeleteProviderAttributes defined the Msg/DeleteProviderAttributes */ export interface MsgDeleteProviderAttributesAmino { - owner?: string; - auditor?: string; - keys?: string[]; + owner: string; + auditor: string; + keys: string[]; } export interface MsgDeleteProviderAttributesAminoMsg { type: "/akash.audit.v1beta1.MsgDeleteProviderAttributes"; @@ -277,12 +277,12 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -402,12 +402,12 @@ export const AuditedAttributes = { }, toAmino(message: AuditedAttributes): AuditedAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -500,7 +500,7 @@ export const AttributesResponse = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -614,12 +614,12 @@ export const AttributesFilters = { if (message.auditors) { obj.auditors = message.auditors.map(e => e); } else { - obj.auditors = []; + obj.auditors = message.auditors; } if (message.owners) { obj.owners = message.owners.map(e => e); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, @@ -739,12 +739,12 @@ export const MsgSignProviderAttributes = { }, toAmino(message: MsgSignProviderAttributes): MsgSignProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -929,12 +929,12 @@ export const MsgDeleteProviderAttributes = { }, toAmino(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/audit/v1beta2/audit.ts b/__fixtures__/v-next/outputv2/akash/audit/v1beta2/audit.ts index dcb8ab847d..4a43ed6a97 100644 --- a/__fixtures__/v-next/outputv2/akash/audit/v1beta2/audit.ts +++ b/__fixtures__/v-next/outputv2/akash/audit/v1beta2/audit.ts @@ -14,9 +14,9 @@ export interface ProviderProtoMsg { } /** Provider stores owner auditor and attributes details */ export interface ProviderAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } export interface ProviderAminoMsg { type: "/akash.audit.v1beta2.Provider"; @@ -40,9 +40,9 @@ export interface AuditedAttributesProtoMsg { } /** Attributes */ export interface AuditedAttributesAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } export interface AuditedAttributesAminoMsg { type: "/akash.audit.v1beta2.AuditedAttributes"; @@ -64,7 +64,7 @@ export interface AttributesResponseProtoMsg { } /** AttributesResponse represents details of deployment along with group details */ export interface AttributesResponseAmino { - attributes?: AuditedAttributesAmino[]; + attributes: AuditedAttributesAmino[]; } export interface AttributesResponseAminoMsg { type: "/akash.audit.v1beta2.AttributesResponse"; @@ -85,8 +85,8 @@ export interface AttributesFiltersProtoMsg { } /** AttributesFilters defines filters used to filter deployments */ export interface AttributesFiltersAmino { - auditors?: string[]; - owners?: string[]; + auditors: string[]; + owners: string[]; } export interface AttributesFiltersAminoMsg { type: "/akash.audit.v1beta2.AttributesFilters"; @@ -109,9 +109,9 @@ export interface MsgSignProviderAttributesProtoMsg { } /** MsgSignProviderAttributes defines an SDK message for signing a provider attributes */ export interface MsgSignProviderAttributesAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } export interface MsgSignProviderAttributesAminoMsg { type: "/akash.audit.v1beta2.MsgSignProviderAttributes"; @@ -149,9 +149,9 @@ export interface MsgDeleteProviderAttributesProtoMsg { } /** MsgDeleteProviderAttributes defined the Msg/DeleteProviderAttributes */ export interface MsgDeleteProviderAttributesAmino { - owner?: string; - auditor?: string; - keys?: string[]; + owner: string; + auditor: string; + keys: string[]; } export interface MsgDeleteProviderAttributesAminoMsg { type: "/akash.audit.v1beta2.MsgDeleteProviderAttributes"; @@ -277,12 +277,12 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -402,12 +402,12 @@ export const AuditedAttributes = { }, toAmino(message: AuditedAttributes): AuditedAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -500,7 +500,7 @@ export const AttributesResponse = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -614,12 +614,12 @@ export const AttributesFilters = { if (message.auditors) { obj.auditors = message.auditors.map(e => e); } else { - obj.auditors = []; + obj.auditors = message.auditors; } if (message.owners) { obj.owners = message.owners.map(e => e); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, @@ -739,12 +739,12 @@ export const MsgSignProviderAttributes = { }, toAmino(message: MsgSignProviderAttributes): MsgSignProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -929,12 +929,12 @@ export const MsgDeleteProviderAttributes = { }, toAmino(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/audit/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/audit/v1beta2/genesis.ts index 8ae5dc1c8e..434d5e08d1 100644 --- a/__fixtures__/v-next/outputv2/akash/audit/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/audit/v1beta2/genesis.ts @@ -12,7 +12,7 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by audit module */ export interface GenesisStateAmino { - attributes?: AuditedAttributesAmino[]; + attributes: AuditedAttributesAmino[]; } export interface GenesisStateAminoMsg { type: "/akash.audit.v1beta2.GenesisState"; @@ -95,7 +95,7 @@ export const GenesisState = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/audit/v1beta2/query.ts b/__fixtures__/v-next/outputv2/akash/audit/v1beta2/query.ts index 7cb1c5b70f..be3c67d14d 100644 --- a/__fixtures__/v-next/outputv2/akash/audit/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv2/akash/audit/v1beta2/query.ts @@ -228,7 +228,7 @@ export const QueryProvidersResponse = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -328,8 +328,8 @@ export const QueryProviderRequest = { }, toAmino(message: QueryProviderRequest): QueryProviderRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; - obj.owner = message.owner; + obj.auditor = message.auditor === "" ? undefined : message.auditor; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest { @@ -514,7 +514,7 @@ export const QueryProviderAttributesRequest = { }, toAmino(message: QueryProviderAttributesRequest): QueryProviderAttributesRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -613,8 +613,8 @@ export const QueryProviderAuditorRequest = { }, toAmino(message: QueryProviderAuditorRequest): QueryProviderAuditorRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; - obj.owner = message.owner; + obj.auditor = message.auditor === "" ? undefined : message.auditor; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderAuditorRequestAminoMsg): QueryProviderAuditorRequest { @@ -714,7 +714,7 @@ export const QueryAuditorAttributesRequest = { }, toAmino(message: QueryAuditorAttributesRequest): QueryAuditorAttributesRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; + obj.auditor = message.auditor === "" ? undefined : message.auditor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta1/attribute.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta1/attribute.ts index a61b5042e2..46061cbef4 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta1/attribute.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta1/attribute.ts @@ -48,9 +48,9 @@ export interface SignedByProtoMsg { */ export interface SignedByAmino { /** all_of all keys in this list must have signed attributes */ - all_of?: string[]; + all_of: string[]; /** any_of at least of of the keys from the list must have signed attributes */ - any_of?: string[]; + any_of: string[]; } export interface SignedByAminoMsg { type: "/akash.base.v1beta1.SignedBy"; @@ -80,9 +80,9 @@ export interface PlacementRequirementsProtoMsg { /** PlacementRequirements */ export interface PlacementRequirementsAmino { /** SignedBy list of keys that tenants expect to have signatures from */ - signed_by?: SignedByAmino; + signed_by: SignedByAmino; /** Attribute list of attributes tenant expects from the provider */ - attributes?: AttributeAmino[]; + attributes: AttributeAmino[]; } export interface PlacementRequirementsAminoMsg { type: "/akash.base.v1beta1.PlacementRequirements"; @@ -172,8 +172,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -286,12 +286,12 @@ export const SignedBy = { if (message.allOf) { obj.all_of = message.allOf.map(e => e); } else { - obj.all_of = []; + obj.all_of = message.allOf; } if (message.anyOf) { obj.any_of = message.anyOf.map(e => e); } else { - obj.any_of = []; + obj.any_of = message.anyOf; } return obj; }, @@ -398,11 +398,11 @@ export const PlacementRequirements = { }, toAmino(message: PlacementRequirements): PlacementRequirementsAmino { const obj: any = {}; - obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : undefined; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : SignedBy.toAmino(SignedBy.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta1/endpoint.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta1/endpoint.ts index a9f6ce1659..06eb8ae413 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta1/endpoint.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta1/endpoint.ts @@ -114,13 +114,13 @@ export const Endpoint = { fromAmino(object: EndpointAmino): Endpoint { const message = createBaseEndpoint(); if (object.kind !== undefined && object.kind !== null) { - message.kind = endpoint_KindFromJSON(object.kind); + message.kind = object.kind; } return message; }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.kind = message.kind; + obj.kind = message.kind === 0 ? undefined : message.kind; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta1/resource.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta1/resource.ts index 552725ebce..57152107af 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta1/resource.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta1/resource.ts @@ -38,7 +38,7 @@ export interface MemoryProtoMsg { } /** Memory stores resource quantity and memory attributes */ export interface MemoryAmino { - quantity?: ResourceValueAmino; + quantity: ResourceValueAmino; attributes?: AttributeAmino[]; } export interface MemoryAminoMsg { @@ -61,7 +61,7 @@ export interface StorageProtoMsg { } /** Storage stores resource quantity and storage attributes */ export interface StorageAmino { - quantity?: ResourceValueAmino; + quantity: ResourceValueAmino; attributes?: AttributeAmino[]; } export interface StorageAminoMsg { @@ -95,7 +95,7 @@ export interface ResourceUnitsAmino { cpu?: CPUAmino; memory?: MemoryAmino; storage?: StorageAmino; - endpoints?: EndpointAmino[]; + endpoints: EndpointAmino[]; } export interface ResourceUnitsAminoMsg { type: "/akash.base.v1beta1.ResourceUnits"; @@ -202,7 +202,7 @@ export const CPU = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -309,11 +309,11 @@ export const Memory = { }, toAmino(message: Memory): MemoryAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -420,11 +420,11 @@ export const Storage = { }, toAmino(message: Storage): StorageAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -571,7 +571,7 @@ export const ResourceUnits = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta2/attribute.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta2/attribute.ts index 9d3e52fc66..2958f3e1bc 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta2/attribute.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta2/attribute.ts @@ -48,9 +48,9 @@ export interface SignedByProtoMsg { */ export interface SignedByAmino { /** all_of all keys in this list must have signed attributes */ - all_of?: string[]; + all_of: string[]; /** any_of at least of of the keys from the list must have signed attributes */ - any_of?: string[]; + any_of: string[]; } export interface SignedByAminoMsg { type: "/akash.base.v1beta2.SignedBy"; @@ -80,9 +80,9 @@ export interface PlacementRequirementsProtoMsg { /** PlacementRequirements */ export interface PlacementRequirementsAmino { /** SignedBy list of keys that tenants expect to have signatures from */ - signed_by?: SignedByAmino; + signed_by: SignedByAmino; /** Attribute list of attributes tenant expects from the provider */ - attributes?: AttributeAmino[]; + attributes: AttributeAmino[]; } export interface PlacementRequirementsAminoMsg { type: "/akash.base.v1beta2.PlacementRequirements"; @@ -172,8 +172,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -286,12 +286,12 @@ export const SignedBy = { if (message.allOf) { obj.all_of = message.allOf.map(e => e); } else { - obj.all_of = []; + obj.all_of = message.allOf; } if (message.anyOf) { obj.any_of = message.anyOf.map(e => e); } else { - obj.any_of = []; + obj.any_of = message.anyOf; } return obj; }, @@ -398,11 +398,11 @@ export const PlacementRequirements = { }, toAmino(message: PlacementRequirements): PlacementRequirementsAmino { const obj: any = {}; - obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : undefined; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : SignedBy.toAmino(SignedBy.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta2/endpoint.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta2/endpoint.ts index a32322b7bd..c48ba7610b 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta2/endpoint.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta2/endpoint.ts @@ -55,7 +55,7 @@ export interface EndpointProtoMsg { /** Endpoint describes a publicly accessible IP service */ export interface EndpointAmino { kind?: Endpoint_Kind; - sequence_number?: number; + sequence_number: number; } export interface EndpointAminoMsg { type: "/akash.base.v1beta2.Endpoint"; @@ -136,7 +136,7 @@ export const Endpoint = { fromAmino(object: EndpointAmino): Endpoint { const message = createBaseEndpoint(); if (object.kind !== undefined && object.kind !== null) { - message.kind = endpoint_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.sequence_number !== undefined && object.sequence_number !== null) { message.sequenceNumber = object.sequence_number; @@ -145,8 +145,8 @@ export const Endpoint = { }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.kind = message.kind; - obj.sequence_number = message.sequenceNumber; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.sequence_number = message.sequenceNumber ?? 0; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta2/resource.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta2/resource.ts index 342718685c..1907da342c 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta2/resource.ts @@ -37,7 +37,7 @@ export interface MemoryProtoMsg { } /** Memory stores resource quantity and memory attributes */ export interface MemoryAmino { - quantity?: ResourceValueAmino; + quantity: ResourceValueAmino; attributes?: AttributeAmino[]; } export interface MemoryAminoMsg { @@ -61,8 +61,8 @@ export interface StorageProtoMsg { } /** Storage stores resource quantity and storage attributes */ export interface StorageAmino { - name?: string; - quantity?: ResourceValueAmino; + name: string; + quantity: ResourceValueAmino; attributes?: AttributeAmino[]; } export interface StorageAminoMsg { @@ -166,7 +166,7 @@ export const CPU = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -273,11 +273,11 @@ export const Memory = { }, toAmino(message: Memory): MemoryAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -399,12 +399,12 @@ export const Storage = { }, toAmino(message: Storage): StorageAmino { const obj: any = {}; - obj.name = message.name; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.name = message.name ?? ""; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta2/resourceunits.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta2/resourceunits.ts index 941481d78d..6ebb69390f 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta2/resourceunits.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta2/resourceunits.ts @@ -25,7 +25,7 @@ export interface ResourceUnitsAmino { cpu?: CPUAmino; memory?: MemoryAmino; storage?: StorageAmino[]; - endpoints?: EndpointAmino[]; + endpoints: EndpointAmino[]; } export interface ResourceUnitsAminoMsg { type: "/akash.base.v1beta2.ResourceUnits"; @@ -171,12 +171,12 @@ export const ResourceUnits = { if (message.storage) { obj.storage = message.storage.map(e => e ? Storage.toAmino(e) : undefined); } else { - obj.storage = []; + obj.storage = message.storage; } if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/cert/v1beta2/cert.ts b/__fixtures__/v-next/outputv2/akash/cert/v1beta2/cert.ts index 433095c805..97f2d45043 100644 --- a/__fixtures__/v-next/outputv2/akash/cert/v1beta2/cert.ts +++ b/__fixtures__/v-next/outputv2/akash/cert/v1beta2/cert.ts @@ -54,8 +54,8 @@ export interface CertificateIDProtoMsg { } /** CertificateID stores owner and sequence number */ export interface CertificateIDAmino { - owner?: string; - serial?: string; + owner: string; + serial: string; } export interface CertificateIDAminoMsg { type: "/akash.cert.v1beta2.CertificateID"; @@ -78,9 +78,9 @@ export interface CertificateProtoMsg { } /** Certificate stores state, certificate and it's public key */ export interface CertificateAmino { - state?: Certificate_State; - cert?: string; - pubkey?: string; + state: Certificate_State; + cert: string; + pubkey: string; } export interface CertificateAminoMsg { type: "/akash.cert.v1beta2.Certificate"; @@ -104,9 +104,9 @@ export interface CertificateFilterProtoMsg { } /** CertificateFilter defines filters used to filter certificates */ export interface CertificateFilterAmino { - owner?: string; - serial?: string; - state?: string; + owner: string; + serial: string; + state: string; } export interface CertificateFilterAminoMsg { type: "/akash.cert.v1beta2.CertificateFilter"; @@ -130,9 +130,9 @@ export interface MsgCreateCertificateProtoMsg { } /** MsgCreateCertificate defines an SDK message for creating certificate */ export interface MsgCreateCertificateAmino { - owner?: string; - cert?: string; - pubkey?: string; + owner: string; + cert: string; + pubkey: string; } export interface MsgCreateCertificateAminoMsg { type: "/akash.cert.v1beta2.MsgCreateCertificate"; @@ -168,7 +168,7 @@ export interface MsgRevokeCertificateProtoMsg { } /** MsgRevokeCertificate defines an SDK message for revoking certificate */ export interface MsgRevokeCertificateAmino { - id?: CertificateIDAmino; + id: CertificateIDAmino; } export interface MsgRevokeCertificateAminoMsg { type: "/akash.cert.v1beta2.MsgRevokeCertificate"; @@ -271,8 +271,8 @@ export const CertificateID = { }, toAmino(message: CertificateID): CertificateIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.serial = message.serial; + obj.owner = message.owner ?? ""; + obj.serial = message.serial ?? ""; return obj; }, fromAminoMsg(object: CertificateIDAminoMsg): CertificateID { @@ -373,7 +373,7 @@ export const Certificate = { fromAmino(object: CertificateAmino): Certificate { const message = createBaseCertificate(); if (object.state !== undefined && object.state !== null) { - message.state = certificate_StateFromJSON(object.state); + message.state = object.state; } if (object.cert !== undefined && object.cert !== null) { message.cert = bytesFromBase64(object.cert); @@ -385,9 +385,9 @@ export const Certificate = { }, toAmino(message: Certificate): CertificateAmino { const obj: any = {}; - obj.state = message.state; - obj.cert = message.cert ? base64FromBytes(message.cert) : undefined; - obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : undefined; + obj.state = message.state ?? 0; + obj.cert = message.cert ? base64FromBytes(message.cert) : ""; + obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : ""; return obj; }, fromAminoMsg(object: CertificateAminoMsg): Certificate { @@ -500,9 +500,9 @@ export const CertificateFilter = { }, toAmino(message: CertificateFilter): CertificateFilterAmino { const obj: any = {}; - obj.owner = message.owner; - obj.serial = message.serial; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.serial = message.serial ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: CertificateFilterAminoMsg): CertificateFilter { @@ -615,9 +615,9 @@ export const MsgCreateCertificate = { }, toAmino(message: MsgCreateCertificate): MsgCreateCertificateAmino { const obj: any = {}; - obj.owner = message.owner; - obj.cert = message.cert ? base64FromBytes(message.cert) : undefined; - obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : undefined; + obj.owner = message.owner ?? ""; + obj.cert = message.cert ? base64FromBytes(message.cert) : ""; + obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : ""; return obj; }, fromAminoMsg(object: MsgCreateCertificateAminoMsg): MsgCreateCertificate { @@ -767,7 +767,7 @@ export const MsgRevokeCertificate = { }, toAmino(message: MsgRevokeCertificate): MsgRevokeCertificateAmino { const obj: any = {}; - obj.id = message.id ? CertificateID.toAmino(message.id) : undefined; + obj.id = message.id ? CertificateID.toAmino(message.id) : CertificateID.toAmino(CertificateID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgRevokeCertificateAminoMsg): MsgRevokeCertificate { diff --git a/__fixtures__/v-next/outputv2/akash/cert/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/cert/v1beta2/genesis.ts index 4d48608458..99bd1ca0f8 100644 --- a/__fixtures__/v-next/outputv2/akash/cert/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/cert/v1beta2/genesis.ts @@ -13,8 +13,8 @@ export interface GenesisCertificateProtoMsg { } /** GenesisCertificate defines certificate entry at genesis */ export interface GenesisCertificateAmino { - owner?: string; - certificate?: CertificateAmino; + owner: string; + certificate: CertificateAmino; } export interface GenesisCertificateAminoMsg { type: "/akash.cert.v1beta2.GenesisCertificate"; @@ -35,7 +35,7 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by cert module */ export interface GenesisStateAmino { - certificates?: GenesisCertificateAmino[]; + certificates: GenesisCertificateAmino[]; } export interface GenesisStateAminoMsg { type: "/akash.cert.v1beta2.GenesisState"; @@ -126,8 +126,8 @@ export const GenesisCertificate = { }, toAmino(message: GenesisCertificate): GenesisCertificateAmino { const obj: any = {}; - obj.owner = message.owner; - obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined; + obj.owner = message.owner ?? ""; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : Certificate.toAmino(Certificate.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisCertificateAminoMsg): GenesisCertificate { @@ -219,7 +219,7 @@ export const GenesisState = { if (message.certificates) { obj.certificates = message.certificates.map(e => e ? GenesisCertificate.toAmino(e) : undefined); } else { - obj.certificates = []; + obj.certificates = message.certificates; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/cert/v1beta2/query.ts b/__fixtures__/v-next/outputv2/akash/cert/v1beta2/query.ts index 444986a501..c93d50492e 100644 --- a/__fixtures__/v-next/outputv2/akash/cert/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv2/akash/cert/v1beta2/query.ts @@ -14,8 +14,8 @@ export interface CertificateResponseProtoMsg { } /** CertificateResponse contains a single X509 certificate and its serial number */ export interface CertificateResponseAmino { - certificate?: CertificateAmino; - serial?: string; + certificate: CertificateAmino; + serial: string; } export interface CertificateResponseAminoMsg { type: "/akash.cert.v1beta2.CertificateResponse"; @@ -153,8 +153,8 @@ export const CertificateResponse = { }, toAmino(message: CertificateResponse): CertificateResponseAmino { const obj: any = {}; - obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined; - obj.serial = message.serial; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : Certificate.toAmino(Certificate.fromPartial({})); + obj.serial = message.serial ?? ""; return obj; }, fromAminoMsg(object: CertificateResponseAminoMsg): CertificateResponse { @@ -366,7 +366,7 @@ export const QueryCertificatesResponse = { if (message.certificates) { obj.certificates = message.certificates.map(e => e ? CertificateResponse.toAmino(e) : undefined); } else { - obj.certificates = []; + obj.certificates = message.certificates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/authz.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/authz.ts index 9f402e93b2..c425838583 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/authz.ts @@ -27,7 +27,7 @@ export interface DepositDeploymentAuthorizationAmino { * SpendLimit is the amount the grantee is authorized to spend from the granter's account for * the purpose of deployment. */ - spend_limit?: CoinAmino; + spend_limit: CoinAmino; } export interface DepositDeploymentAuthorizationAminoMsg { type: "/akash.deployment.v1beta1.DepositDeploymentAuthorization"; @@ -108,7 +108,7 @@ export const DepositDeploymentAuthorization = { }, toAmino(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAmino { const obj: any = {}; - obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/deployment.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/deployment.ts index c6dfa39da1..b079e17c9d 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/deployment.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/deployment.ts @@ -60,10 +60,10 @@ export interface MsgCreateDeploymentProtoMsg { } /** MsgCreateDeployment defines an SDK message for creating deployment */ export interface MsgCreateDeploymentAmino { - id?: DeploymentIDAmino; - groups?: GroupSpecAmino[]; - version?: string; - deposit?: CoinAmino; + id: DeploymentIDAmino; + groups: GroupSpecAmino[]; + version: string; + deposit: CoinAmino; } export interface MsgCreateDeploymentAminoMsg { type: "/akash.deployment.v1beta1.MsgCreateDeployment"; @@ -101,8 +101,8 @@ export interface MsgDepositDeploymentProtoMsg { } /** MsgDepositDeployment deposits more funds into the deposit account */ export interface MsgDepositDeploymentAmino { - id?: DeploymentIDAmino; - amount?: CoinAmino; + id: DeploymentIDAmino; + amount: CoinAmino; } export interface MsgDepositDeploymentAminoMsg { type: "/akash.deployment.v1beta1.MsgDepositDeployment"; @@ -139,9 +139,9 @@ export interface MsgUpdateDeploymentProtoMsg { } /** MsgUpdateDeployment defines an SDK message for updating deployment */ export interface MsgUpdateDeploymentAmino { - id?: DeploymentIDAmino; - groups?: GroupSpecAmino[]; - version?: string; + id: DeploymentIDAmino; + groups: GroupSpecAmino[]; + version: string; } export interface MsgUpdateDeploymentAminoMsg { type: "/akash.deployment.v1beta1.MsgUpdateDeployment"; @@ -177,7 +177,7 @@ export interface MsgCloseDeploymentProtoMsg { } /** MsgCloseDeployment defines an SDK message for closing deployment */ export interface MsgCloseDeploymentAmino { - id?: DeploymentIDAmino; + id: DeploymentIDAmino; } export interface MsgCloseDeploymentAminoMsg { type: "/akash.deployment.v1beta1.MsgCloseDeployment"; @@ -212,8 +212,8 @@ export interface DeploymentIDProtoMsg { } /** DeploymentID stores owner and sequence number */ export interface DeploymentIDAmino { - owner?: string; - dseq?: string; + owner: string; + dseq: string; } export interface DeploymentIDAminoMsg { type: "/akash.deployment.v1beta1.DeploymentID"; @@ -237,9 +237,9 @@ export interface DeploymentProtoMsg { } /** Deployment stores deploymentID, state and version details */ export interface DeploymentAmino { - deployment_id?: DeploymentIDAmino; - state?: Deployment_State; - version?: string; + deployment_id: DeploymentIDAmino; + state: Deployment_State; + version: string; created_at?: string; } export interface DeploymentAminoMsg { @@ -265,9 +265,9 @@ export interface DeploymentFiltersProtoMsg { } /** DeploymentFilters defines filters used to filter deployments */ export interface DeploymentFiltersAmino { - owner?: string; - dseq?: string; - state?: string; + owner: string; + dseq: string; + state: string; } export interface DeploymentFiltersAminoMsg { type: "/akash.deployment.v1beta1.DeploymentFilters"; @@ -398,14 +398,14 @@ export const MsgCreateDeployment = { }, toAmino(message: MsgCreateDeployment): MsgCreateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment { @@ -572,8 +572,8 @@ export const MsgDepositDeployment = { }, 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.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.amount = message.amount ? Coin.toAmino(message.amount) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment { @@ -759,13 +759,13 @@ export const MsgUpdateDeployment = { }, toAmino(message: MsgUpdateDeployment): MsgUpdateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; + obj.version = message.version ? base64FromBytes(message.version) : ""; return obj; }, fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment { @@ -915,7 +915,7 @@ export const MsgCloseDeployment = { }, toAmino(message: MsgCloseDeployment): MsgCloseDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment { @@ -1080,8 +1080,8 @@ export const DeploymentID = { }, toAmino(message: DeploymentID): DeploymentIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; return obj; }, fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID { @@ -1201,7 +1201,7 @@ export const Deployment = { message.deploymentId = DeploymentID.fromAmino(object.deployment_id); } if (object.state !== undefined && object.state !== null) { - message.state = deployment_StateFromJSON(object.state); + message.state = object.state; } if (object.version !== undefined && object.version !== null) { message.version = bytesFromBase64(object.version); @@ -1213,10 +1213,10 @@ export const Deployment = { }, 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 ? base64FromBytes(message.version) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.state = message.state ?? 0; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: DeploymentAminoMsg): Deployment { @@ -1331,9 +1331,9 @@ export const DeploymentFilters = { }, toAmino(message: DeploymentFilters): DeploymentFiltersAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/genesis.ts index f66d9c07d5..323692a6e6 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/genesis.ts @@ -15,8 +15,8 @@ export interface GenesisDeploymentProtoMsg { } /** GenesisDeployment defines the basic genesis state used by deployment module */ export interface GenesisDeploymentAmino { - deployment?: DeploymentAmino; - groups?: GroupAmino[]; + deployment: DeploymentAmino; + groups: GroupAmino[]; } export interface GenesisDeploymentAminoMsg { type: "/akash.deployment.v1beta1.GenesisDeployment"; @@ -38,8 +38,8 @@ export interface GenesisStateProtoMsg { } /** GenesisState stores slice of genesis deployment instance */ export interface GenesisStateAmino { - deployments?: GenesisDeploymentAmino[]; - params?: ParamsAmino; + deployments: GenesisDeploymentAmino[]; + params: ParamsAmino; } export interface GenesisStateAminoMsg { type: "/akash.deployment.v1beta1.GenesisState"; @@ -137,11 +137,11 @@ export const GenesisDeployment = { }, toAmino(message: GenesisDeployment): GenesisDeploymentAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } return obj; }, @@ -251,9 +251,9 @@ export const GenesisState = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/group.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/group.ts index 0c50af5f5a..54165d7bca 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/group.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/group.ts @@ -70,7 +70,7 @@ export interface MsgCloseGroupProtoMsg { } /** MsgCloseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgCloseGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } export interface MsgCloseGroupAminoMsg { type: "/akash.deployment.v1beta1.MsgCloseGroup"; @@ -104,7 +104,7 @@ export interface MsgPauseGroupProtoMsg { } /** MsgPauseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgPauseGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } export interface MsgPauseGroupAminoMsg { type: "/akash.deployment.v1beta1.MsgPauseGroup"; @@ -138,7 +138,7 @@ export interface MsgStartGroupProtoMsg { } /** MsgStartGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgStartGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } export interface MsgStartGroupAminoMsg { type: "/akash.deployment.v1beta1.MsgStartGroup"; @@ -174,9 +174,9 @@ export interface GroupIDProtoMsg { } /** GroupID stores owner, deployment sequence number and group sequence number */ export interface GroupIDAmino { - owner?: string; - dseq?: string; - gseq?: number; + owner: string; + dseq: string; + gseq: number; } export interface GroupIDAminoMsg { type: "/akash.deployment.v1beta1.GroupID"; @@ -200,9 +200,9 @@ export interface GroupSpecProtoMsg { } /** GroupSpec stores group specifications */ export interface GroupSpecAmino { - name?: string; - requirements?: PlacementRequirementsAmino; - resources?: ResourceAmino[]; + name: string; + requirements: PlacementRequirementsAmino; + resources: ResourceAmino[]; } export interface GroupSpecAminoMsg { type: "/akash.deployment.v1beta1.GroupSpec"; @@ -227,9 +227,9 @@ export interface GroupProtoMsg { } /** Group stores group id, state and specifications of group */ export interface GroupAmino { - group_id?: GroupIDAmino; - state?: Group_State; - group_spec?: GroupSpecAmino; + group_id: GroupIDAmino; + state: Group_State; + group_spec: GroupSpecAmino; created_at?: string; } export interface GroupAminoMsg { @@ -255,9 +255,9 @@ export interface ResourceProtoMsg { } /** Resource stores unit, total count and price of resource */ export interface ResourceAmino { - resources?: ResourceUnitsAmino; - count?: number; - price?: CoinAmino; + resources: ResourceUnitsAmino; + count: number; + price: CoinAmino; } export interface ResourceAminoMsg { type: "/akash.deployment.v1beta1.Resource"; @@ -335,7 +335,7 @@ export const MsgCloseGroup = { }, toAmino(message: MsgCloseGroup): MsgCloseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup { @@ -485,7 +485,7 @@ export const MsgPauseGroup = { }, toAmino(message: MsgPauseGroup): MsgPauseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup { @@ -635,7 +635,7 @@ export const MsgStartGroup = { }, toAmino(message: MsgStartGroup): MsgStartGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup { @@ -815,9 +815,9 @@ export const GroupID = { }, toAmino(message: GroupID): GroupIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.gseq = message.gseq; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; return obj; }, fromAminoMsg(object: GroupIDAminoMsg): GroupID { @@ -938,12 +938,12 @@ export const GroupSpec = { }, toAmino(message: GroupSpec): GroupSpecAmino { const obj: any = {}; - obj.name = message.name; - obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : undefined; + obj.name = message.name ?? ""; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : PlacementRequirements.toAmino(PlacementRequirements.fromPartial({})); if (message.resources) { obj.resources = message.resources.map(e => e ? Resource.toAmino(e) : undefined); } else { - obj.resources = []; + obj.resources = message.resources; } return obj; }, @@ -1066,7 +1066,7 @@ export const Group = { message.groupId = GroupID.fromAmino(object.group_id); } if (object.state !== undefined && object.state !== null) { - message.state = group_StateFromJSON(object.state); + message.state = object.state; } if (object.group_spec !== undefined && object.group_spec !== null) { message.groupSpec = GroupSpec.fromAmino(object.group_spec); @@ -1078,10 +1078,10 @@ export const Group = { }, 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; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId) : GroupID.toAmino(GroupID.fromPartial({})); + obj.state = message.state ?? 0; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: GroupAminoMsg): Group { @@ -1198,9 +1198,9 @@ export const Resource = { }, 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; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources) : ResourceUnits.toAmino(ResourceUnits.fromPartial({})); + obj.count = message.count ?? 0; + obj.price = message.price ? Coin.toAmino(message.price) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ResourceAminoMsg): Resource { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/params.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/params.ts index f9bc595098..93e1c120c4 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/params.ts @@ -12,7 +12,7 @@ export interface ParamsProtoMsg { } /** Params defines the parameters for the x/deployment package */ export interface ParamsAmino { - deployment_min_deposit?: CoinAmino; + deployment_min_deposit: CoinAmino; } export interface ParamsAminoMsg { type: "/akash.deployment.v1beta1.Params"; @@ -88,7 +88,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/query.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/query.ts index 095a27ca6a..eee0a36125 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/query.ts @@ -83,8 +83,8 @@ export interface QueryDeploymentResponseProtoMsg { } /** QueryDeploymentResponse is response type for the Query/Deployment RPC method */ export interface QueryDeploymentResponseAmino { - deployment?: DeploymentAmino; - groups?: GroupAmino[]; + deployment: DeploymentAmino; + groups: GroupAmino[]; escrow_account?: AccountAmino; } export interface QueryDeploymentResponseAminoMsg { @@ -330,7 +330,7 @@ export const QueryDeploymentsResponse = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -540,11 +540,11 @@ export const QueryDeploymentResponse = { }, toAmino(message: QueryDeploymentResponse): QueryDeploymentResponseAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/authz.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/authz.ts index d5ac37efb6..0b643b17bb 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/authz.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/authz.ts @@ -27,7 +27,7 @@ export interface DepositDeploymentAuthorizationAmino { * SpendLimit is the amount the grantee is authorized to spend from the granter's account for * the purpose of deployment. */ - spend_limit?: CoinAmino; + spend_limit: CoinAmino; } export interface DepositDeploymentAuthorizationAminoMsg { type: "/akash.deployment.v1beta2.DepositDeploymentAuthorization"; @@ -108,7 +108,7 @@ export const DepositDeploymentAuthorization = { }, toAmino(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAmino { const obj: any = {}; - obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deployment.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deployment.ts index d155339242..b2cc4b9276 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deployment.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deployment.ts @@ -54,8 +54,8 @@ export interface DeploymentIDProtoMsg { } /** DeploymentID stores owner and sequence number */ export interface DeploymentIDAmino { - owner?: string; - dseq?: string; + owner: string; + dseq: string; } export interface DeploymentIDAminoMsg { type: "/akash.deployment.v1beta2.DeploymentID"; @@ -79,9 +79,9 @@ export interface DeploymentProtoMsg { } /** Deployment stores deploymentID, state and version details */ export interface DeploymentAmino { - deployment_id?: DeploymentIDAmino; - state?: Deployment_State; - version?: string; + deployment_id: DeploymentIDAmino; + state: Deployment_State; + version: string; created_at?: string; } export interface DeploymentAminoMsg { @@ -107,9 +107,9 @@ export interface DeploymentFiltersProtoMsg { } /** DeploymentFilters defines filters used to filter deployments */ export interface DeploymentFiltersAmino { - owner?: string; - dseq?: string; - state?: string; + owner: string; + dseq: string; + state: string; } export interface DeploymentFiltersAminoMsg { type: "/akash.deployment.v1beta2.DeploymentFilters"; @@ -202,8 +202,8 @@ export const DeploymentID = { }, toAmino(message: DeploymentID): DeploymentIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; return obj; }, fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID { @@ -323,7 +323,7 @@ export const Deployment = { message.deploymentId = DeploymentID.fromAmino(object.deployment_id); } if (object.state !== undefined && object.state !== null) { - message.state = deployment_StateFromJSON(object.state); + message.state = object.state; } if (object.version !== undefined && object.version !== null) { message.version = bytesFromBase64(object.version); @@ -335,10 +335,10 @@ export const Deployment = { }, 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 ? base64FromBytes(message.version) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.state = message.state ?? 0; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: DeploymentAminoMsg): Deployment { @@ -453,9 +453,9 @@ export const DeploymentFilters = { }, toAmino(message: DeploymentFilters): DeploymentFiltersAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deploymentmsg.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deploymentmsg.ts index c7d45c01a2..91cdf4f6d2 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deploymentmsg.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deploymentmsg.ts @@ -19,12 +19,12 @@ export interface MsgCreateDeploymentProtoMsg { } /** MsgCreateDeployment defines an SDK message for creating deployment */ export interface MsgCreateDeploymentAmino { - id?: DeploymentIDAmino; - groups?: GroupSpecAmino[]; - version?: string; - deposit?: CoinAmino; + id: DeploymentIDAmino; + groups: GroupSpecAmino[]; + version: string; + deposit: CoinAmino; /** Depositor pays for the deposit */ - depositor?: string; + depositor: string; } export interface MsgCreateDeploymentAminoMsg { type: "/akash.deployment.v1beta2.MsgCreateDeployment"; @@ -65,10 +65,10 @@ export interface MsgDepositDeploymentProtoMsg { } /** MsgDepositDeployment deposits more funds into the deposit account */ export interface MsgDepositDeploymentAmino { - id?: DeploymentIDAmino; - amount?: CoinAmino; + id: DeploymentIDAmino; + amount: CoinAmino; /** Depositor pays for the deposit */ - depositor?: string; + depositor: string; } export interface MsgDepositDeploymentAminoMsg { type: "/akash.deployment.v1beta2.MsgDepositDeployment"; @@ -105,8 +105,8 @@ export interface MsgUpdateDeploymentProtoMsg { } /** MsgUpdateDeployment defines an SDK message for updating deployment */ export interface MsgUpdateDeploymentAmino { - id?: DeploymentIDAmino; - version?: string; + id: DeploymentIDAmino; + version: string; } export interface MsgUpdateDeploymentAminoMsg { type: "/akash.deployment.v1beta2.MsgUpdateDeployment"; @@ -141,7 +141,7 @@ export interface MsgCloseDeploymentProtoMsg { } /** MsgCloseDeployment defines an SDK message for closing deployment */ export interface MsgCloseDeploymentAmino { - id?: DeploymentIDAmino; + id: DeploymentIDAmino; } export interface MsgCloseDeploymentAminoMsg { type: "/akash.deployment.v1beta2.MsgCloseDeployment"; @@ -299,15 +299,15 @@ export const MsgCreateDeployment = { }, toAmino(message: MsgCreateDeployment): MsgCreateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined; - obj.depositor = message.depositor; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); + obj.depositor = message.depositor ?? ""; return obj; }, fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment { @@ -489,9 +489,9 @@ export const MsgDepositDeployment = { }, 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; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.amount = message.amount ? Coin.toAmino(message.amount) : Coin.toAmino(Coin.fromPartial({})); + obj.depositor = message.depositor ?? ""; return obj; }, fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment { @@ -656,8 +656,8 @@ export const MsgUpdateDeployment = { }, toAmino(message: MsgUpdateDeployment): MsgUpdateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; - obj.version = message.version ? base64FromBytes(message.version) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.version = message.version ? base64FromBytes(message.version) : ""; return obj; }, fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment { @@ -807,7 +807,7 @@ export const MsgCloseDeployment = { }, toAmino(message: MsgCloseDeployment): MsgCloseDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/genesis.ts index ac33d3e704..3cfeae88fb 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/genesis.ts @@ -15,8 +15,8 @@ export interface GenesisDeploymentProtoMsg { } /** GenesisDeployment defines the basic genesis state used by deployment module */ export interface GenesisDeploymentAmino { - deployment?: DeploymentAmino; - groups?: GroupAmino[]; + deployment: DeploymentAmino; + groups: GroupAmino[]; } export interface GenesisDeploymentAminoMsg { type: "/akash.deployment.v1beta2.GenesisDeployment"; @@ -38,8 +38,8 @@ export interface GenesisStateProtoMsg { } /** GenesisState stores slice of genesis deployment instance */ export interface GenesisStateAmino { - deployments?: GenesisDeploymentAmino[]; - params?: ParamsAmino; + deployments: GenesisDeploymentAmino[]; + params: ParamsAmino; } export interface GenesisStateAminoMsg { type: "/akash.deployment.v1beta2.GenesisState"; @@ -137,11 +137,11 @@ export const GenesisDeployment = { }, toAmino(message: GenesisDeployment): GenesisDeploymentAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } return obj; }, @@ -251,9 +251,9 @@ export const GenesisState = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/group.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/group.ts index e1cea279fc..7ed00bb0ca 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/group.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/group.ts @@ -72,9 +72,9 @@ export interface GroupProtoMsg { } /** Group stores group id, state and specifications of group */ export interface GroupAmino { - group_id?: GroupIDAmino; - state?: Group_State; - group_spec?: GroupSpecAmino; + group_id: GroupIDAmino; + state: Group_State; + group_spec: GroupSpecAmino; created_at?: string; } export interface GroupAminoMsg { @@ -191,7 +191,7 @@ export const Group = { message.groupId = GroupID.fromAmino(object.group_id); } if (object.state !== undefined && object.state !== null) { - message.state = group_StateFromJSON(object.state); + message.state = object.state; } if (object.group_spec !== undefined && object.group_spec !== null) { message.groupSpec = GroupSpec.fromAmino(object.group_spec); @@ -203,10 +203,10 @@ export const Group = { }, 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; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId) : GroupID.toAmino(GroupID.fromPartial({})); + obj.state = message.state ?? 0; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: GroupAminoMsg): Group { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupid.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupid.ts index 92d384389e..4d03f559a8 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupid.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupid.ts @@ -13,9 +13,9 @@ export interface GroupIDProtoMsg { } /** GroupID stores owner, deployment sequence number and group sequence number */ export interface GroupIDAmino { - owner?: string; - dseq?: string; - gseq?: number; + owner: string; + dseq: string; + gseq: number; } export interface GroupIDAminoMsg { type: "/akash.deployment.v1beta2.GroupID"; @@ -123,9 +123,9 @@ export const GroupID = { }, toAmino(message: GroupID): GroupIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.gseq = message.gseq; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; return obj; }, fromAminoMsg(object: GroupIDAminoMsg): GroupID { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupmsg.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupmsg.ts index c3239bc9ef..06e54f774b 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupmsg.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupmsg.ts @@ -12,7 +12,7 @@ export interface MsgCloseGroupProtoMsg { } /** MsgCloseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgCloseGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } export interface MsgCloseGroupAminoMsg { type: "/akash.deployment.v1beta2.MsgCloseGroup"; @@ -46,7 +46,7 @@ export interface MsgPauseGroupProtoMsg { } /** MsgPauseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgPauseGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } export interface MsgPauseGroupAminoMsg { type: "/akash.deployment.v1beta2.MsgPauseGroup"; @@ -80,7 +80,7 @@ export interface MsgStartGroupProtoMsg { } /** MsgStartGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgStartGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } export interface MsgStartGroupAminoMsg { type: "/akash.deployment.v1beta2.MsgStartGroup"; @@ -170,7 +170,7 @@ export const MsgCloseGroup = { }, toAmino(message: MsgCloseGroup): MsgCloseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup { @@ -320,7 +320,7 @@ export const MsgPauseGroup = { }, toAmino(message: MsgPauseGroup): MsgPauseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup { @@ -470,7 +470,7 @@ export const MsgStartGroup = { }, toAmino(message: MsgStartGroup): MsgStartGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupspec.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupspec.ts index 7e78a68dfa..5b094020fc 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupspec.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupspec.ts @@ -15,9 +15,9 @@ export interface GroupSpecProtoMsg { } /** GroupSpec stores group specifications */ export interface GroupSpecAmino { - name?: string; - requirements?: PlacementRequirementsAmino; - resources?: ResourceAmino[]; + name: string; + requirements: PlacementRequirementsAmino; + resources: ResourceAmino[]; } export interface GroupSpecAminoMsg { type: "/akash.deployment.v1beta2.GroupSpec"; @@ -131,12 +131,12 @@ export const GroupSpec = { }, toAmino(message: GroupSpec): GroupSpecAmino { const obj: any = {}; - obj.name = message.name; - obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : undefined; + obj.name = message.name ?? ""; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : PlacementRequirements.toAmino(PlacementRequirements.fromPartial({})); if (message.resources) { obj.resources = message.resources.map(e => e ? Resource.toAmino(e) : undefined); } else { - obj.resources = []; + obj.resources = message.resources; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/params.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/params.ts index 0dea1e669f..9467fe19f2 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/params.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/params.ts @@ -12,7 +12,7 @@ export interface ParamsProtoMsg { } /** Params defines the parameters for the x/deployment package */ export interface ParamsAmino { - deployment_min_deposit?: CoinAmino; + deployment_min_deposit: CoinAmino; } export interface ParamsAminoMsg { type: "/akash.deployment.v1beta2.Params"; @@ -88,7 +88,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/query.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/query.ts index 50676f4e78..65d97aaf47 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/query.ts @@ -84,8 +84,8 @@ export interface QueryDeploymentResponseProtoMsg { } /** QueryDeploymentResponse is response type for the Query/Deployment RPC method */ export interface QueryDeploymentResponseAmino { - deployment?: DeploymentAmino; - groups?: GroupAmino[]; + deployment: DeploymentAmino; + groups: GroupAmino[]; escrow_account?: AccountAmino; } export interface QueryDeploymentResponseAminoMsg { @@ -331,7 +331,7 @@ export const QueryDeploymentsResponse = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -541,11 +541,11 @@ export const QueryDeploymentResponse = { }, toAmino(message: QueryDeploymentResponse): QueryDeploymentResponseAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/resource.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/resource.ts index 447adfed6e..b3b2daf22d 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/resource.ts @@ -15,9 +15,9 @@ export interface ResourceProtoMsg { } /** Resource stores unit, total count and price of resource */ export interface ResourceAmino { - resources?: ResourceUnitsAmino; - count?: number; - price?: DecCoinAmino; + resources: ResourceUnitsAmino; + count: number; + price: DecCoinAmino; } export interface ResourceAminoMsg { type: "/akash.deployment.v1beta2.Resource"; @@ -127,9 +127,9 @@ export const Resource = { }, 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; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources) : ResourceUnits.toAmino(ResourceUnits.fromPartial({})); + obj.count = message.count ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); return obj; }, fromAminoMsg(object: ResourceAminoMsg): Resource { diff --git a/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/genesis.ts index f874e1d624..b1ceb58dd7 100644 --- a/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/genesis.ts @@ -13,8 +13,8 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by escrow module */ export interface GenesisStateAmino { - accounts?: AccountAmino[]; - payments?: PaymentAmino[]; + accounts: AccountAmino[]; + payments: PaymentAmino[]; } export interface GenesisStateAminoMsg { type: "/akash.escrow.v1beta1.GenesisState"; @@ -119,12 +119,12 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } if (message.payments) { obj.payments = message.payments.map(e => e ? Payment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/query.ts b/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/query.ts index 8af75b909f..9813d28d32 100644 --- a/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/query.ts @@ -242,10 +242,10 @@ export const QueryAccountsRequest = { }, toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; - obj.owner = message.owner; - obj.state = message.state; + obj.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -355,7 +355,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -517,11 +517,11 @@ export const QueryPaymentsRequest = { }, 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.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -631,7 +631,7 @@ export const QueryPaymentsResponse = { if (message.payments) { obj.payments = message.payments.map(e => e ? Payment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/types.ts b/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/types.ts index 8c07474e97..63eac84e4a 100644 --- a/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/types.ts +++ b/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/types.ts @@ -111,8 +111,8 @@ export interface AccountIDProtoMsg { } /** AccountID is the account identifier */ export interface AccountIDAmino { - scope?: string; - xid?: string; + scope: string; + xid: string; } export interface AccountIDAminoMsg { type: "/akash.escrow.v1beta1.AccountID"; @@ -145,17 +145,17 @@ export interface AccountProtoMsg { /** Account stores state for an escrow account */ export interface AccountAmino { /** unique identifier for this escrow account */ - id?: AccountIDAmino; + id: AccountIDAmino; /** bech32 encoded account address of the owner of this escrow account */ - owner?: string; + owner: string; /** current state of this escrow account */ - state?: Account_State; + state: Account_State; /** unspent coins received from the owner's wallet */ - balance?: CoinAmino; + balance: CoinAmino; /** total coins spent by this account */ - transferred?: CoinAmino; + transferred: CoinAmino; /** block height at which this account was last settled */ - settled_at?: string; + settled_at: string; } export interface AccountAminoMsg { type: "/akash.escrow.v1beta1.Account"; @@ -186,13 +186,13 @@ export interface PaymentProtoMsg { } /** Payment stores state for a payment */ export interface PaymentAmino { - account_id?: AccountIDAmino; - payment_id?: string; - owner?: string; - state?: Payment_State; - rate?: CoinAmino; - balance?: CoinAmino; - withdrawn?: CoinAmino; + account_id: AccountIDAmino; + payment_id: string; + owner: string; + state: Payment_State; + rate: CoinAmino; + balance: CoinAmino; + withdrawn: CoinAmino; } export interface PaymentAminoMsg { type: "/akash.escrow.v1beta1.Payment"; @@ -287,8 +287,8 @@ export const AccountID = { }, toAmino(message: AccountID): AccountIDAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; + obj.scope = message.scope ?? ""; + obj.xid = message.xid ?? ""; return obj; }, fromAminoMsg(object: AccountIDAminoMsg): AccountID { @@ -439,7 +439,7 @@ export const Account = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = account_StateFromJSON(object.state); + message.state = object.state; } if (object.balance !== undefined && object.balance !== null) { message.balance = Coin.fromAmino(object.balance); @@ -454,12 +454,12 @@ export const Account = { }, 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; + obj.id = message.id ? AccountID.toAmino(message.id) : AccountID.toAmino(AccountID.fromPartial({})); + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.balance = message.balance ? Coin.toAmino(message.balance) : Coin.toAmino(Coin.fromPartial({})); + obj.transferred = message.transferred ? Coin.toAmino(message.transferred) : Coin.toAmino(Coin.fromPartial({})); + obj.settled_at = message.settledAt ? message.settledAt.toString() : "0"; return obj; }, fromAminoMsg(object: AccountAminoMsg): Account { @@ -625,7 +625,7 @@ export const Payment = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = payment_StateFromJSON(object.state); + message.state = object.state; } if (object.rate !== undefined && object.rate !== null) { message.rate = Coin.fromAmino(object.rate); @@ -640,13 +640,13 @@ export const Payment = { }, 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; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId) : AccountID.toAmino(AccountID.fromPartial({})); + obj.payment_id = message.paymentId ?? ""; + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.rate = message.rate ? Coin.toAmino(message.rate) : Coin.toAmino(Coin.fromPartial({})); + obj.balance = message.balance ? Coin.toAmino(message.balance) : Coin.toAmino(Coin.fromPartial({})); + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: PaymentAminoMsg): Payment { diff --git a/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/genesis.ts index 58a193ca15..42f4e3dadd 100644 --- a/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/genesis.ts @@ -13,8 +13,8 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by escrow module */ export interface GenesisStateAmino { - accounts?: AccountAmino[]; - payments?: FractionalPaymentAmino[]; + accounts: AccountAmino[]; + payments: FractionalPaymentAmino[]; } export interface GenesisStateAminoMsg { type: "/akash.escrow.v1beta2.GenesisState"; @@ -119,12 +119,12 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } if (message.payments) { obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/query.ts b/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/query.ts index b2d8539052..e64f5f1338 100644 --- a/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/query.ts @@ -242,10 +242,10 @@ export const QueryAccountsRequest = { }, toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; - obj.owner = message.owner; - obj.state = message.state; + obj.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -355,7 +355,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -517,11 +517,11 @@ export const QueryPaymentsRequest = { }, 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.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -631,7 +631,7 @@ export const QueryPaymentsResponse = { if (message.payments) { obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/types.ts b/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/types.ts index 0e6878e9d3..11901920b9 100644 --- a/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/types.ts +++ b/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/types.ts @@ -111,8 +111,8 @@ export interface AccountIDProtoMsg { } /** AccountID is the account identifier */ export interface AccountIDAmino { - scope?: string; - xid?: string; + scope: string; + xid: string; } export interface AccountIDAminoMsg { type: "/akash.escrow.v1beta2.AccountID"; @@ -156,28 +156,28 @@ export interface AccountProtoMsg { /** Account stores state for an escrow account */ export interface AccountAmino { /** unique identifier for this escrow account */ - id?: AccountIDAmino; + id: AccountIDAmino; /** bech32 encoded account address of the owner of this escrow account */ - owner?: string; + owner: string; /** current state of this escrow account */ - state?: Account_State; + state: Account_State; /** unspent coins received from the owner's wallet */ - balance?: DecCoinAmino; + balance: DecCoinAmino; /** total coins spent by this account */ - transferred?: DecCoinAmino; + transferred: DecCoinAmino; /** block height at which this account was last settled */ - settled_at?: string; + settled_at: string; /** * bech32 encoded account address of the depositor. * If depositor is same as the owner, then any incoming coins are added to the Balance. * If depositor isn't same as the owner, then any incoming coins are added to the Funds. */ - depositor?: string; + depositor: string; /** * Funds are unspent coins received from the (non-Owner) Depositor's wallet. * If there are any funds, they should be spent before spending the Balance. */ - funds?: DecCoinAmino; + funds: DecCoinAmino; } export interface AccountAminoMsg { type: "/akash.escrow.v1beta2.Account"; @@ -210,13 +210,13 @@ export interface FractionalPaymentProtoMsg { } /** Payment stores state for a payment */ export interface FractionalPaymentAmino { - account_id?: AccountIDAmino; - payment_id?: string; - owner?: string; - state?: FractionalPayment_State; - rate?: DecCoinAmino; - balance?: DecCoinAmino; - withdrawn?: CoinAmino; + account_id: AccountIDAmino; + payment_id: string; + owner: string; + state: FractionalPayment_State; + rate: DecCoinAmino; + balance: DecCoinAmino; + withdrawn: CoinAmino; } export interface FractionalPaymentAminoMsg { type: "/akash.escrow.v1beta2.FractionalPayment"; @@ -311,8 +311,8 @@ export const AccountID = { }, toAmino(message: AccountID): AccountIDAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; + obj.scope = message.scope ?? ""; + obj.xid = message.xid ?? ""; return obj; }, fromAminoMsg(object: AccountIDAminoMsg): AccountID { @@ -489,7 +489,7 @@ export const Account = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = account_StateFromJSON(object.state); + message.state = object.state; } if (object.balance !== undefined && object.balance !== null) { message.balance = DecCoin.fromAmino(object.balance); @@ -510,14 +510,14 @@ export const Account = { }, 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; + obj.id = message.id ? AccountID.toAmino(message.id) : AccountID.toAmino(AccountID.fromPartial({})); + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.balance = message.balance ? DecCoin.toAmino(message.balance) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.transferred = message.transferred ? DecCoin.toAmino(message.transferred) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.settled_at = message.settledAt ? message.settledAt.toString() : "0"; + obj.depositor = message.depositor ?? ""; + obj.funds = message.funds ? DecCoin.toAmino(message.funds) : DecCoin.toAmino(DecCoin.fromPartial({})); return obj; }, fromAminoMsg(object: AccountAminoMsg): Account { @@ -683,7 +683,7 @@ export const FractionalPayment = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = fractionalPayment_StateFromJSON(object.state); + message.state = object.state; } if (object.rate !== undefined && object.rate !== null) { message.rate = DecCoin.fromAmino(object.rate); @@ -698,13 +698,13 @@ export const FractionalPayment = { }, 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; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId) : AccountID.toAmino(AccountID.fromPartial({})); + obj.payment_id = message.paymentId ?? ""; + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.rate = message.rate ? DecCoin.toAmino(message.rate) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.balance = message.balance ? DecCoin.toAmino(message.balance) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: FractionalPaymentAminoMsg): FractionalPayment { diff --git a/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/genesis.ts index 4d42e63441..ccd98b8e55 100644 --- a/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/genesis.ts @@ -12,7 +12,7 @@ export interface GenesisStateProtoMsg { } /** GenesisState stores slice of genesis deployment instance */ export interface GenesisStateAmino { - params?: ParamsAmino; + params: ParamsAmino; } export interface GenesisStateAminoMsg { type: "/akash.inflation.v1beta2.GenesisState"; @@ -88,7 +88,7 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/params.ts b/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/params.ts index 1710f70e7b..3ace5c63e8 100644 --- a/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/params.ts +++ b/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/params.ts @@ -24,17 +24,17 @@ export interface ParamsProtoMsg { /** Params defines the parameters for the x/deployment package */ export interface ParamsAmino { /** InflationDecayFactor is the number of years it takes inflation to halve. */ - inflation_decay_factor?: string; + inflation_decay_factor: string; /** * InitialInflation is the rate at which inflation starts at genesis. * It is a decimal value in the range [0.0, 100.0]. */ - initial_inflation?: string; + initial_inflation: string; /** * Variance defines the fraction by which inflation can vary from ideal inflation in a block. * It is a decimal value in the range [0.0, 1.0]. */ - variance?: string; + variance: string; } export interface ParamsAminoMsg { type: "/akash.inflation.v1beta2.Params"; @@ -140,9 +140,9 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.inflation_decay_factor = message.inflationDecayFactor; - obj.initial_inflation = message.initialInflation; - obj.variance = message.variance; + obj.inflation_decay_factor = message.inflationDecayFactor ?? ""; + obj.initial_inflation = message.initialInflation ?? ""; + obj.variance = message.variance ?? ""; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/akash/market/v1beta2/bid.ts b/__fixtures__/v-next/outputv2/akash/market/v1beta2/bid.ts index 7dca8d24d2..99afb3485a 100644 --- a/__fixtures__/v-next/outputv2/akash/market/v1beta2/bid.ts +++ b/__fixtures__/v-next/outputv2/akash/market/v1beta2/bid.ts @@ -72,10 +72,10 @@ export interface MsgCreateBidProtoMsg { } /** MsgCreateBid defines an SDK message for creating Bid */ export interface MsgCreateBidAmino { - order?: OrderIDAmino; - provider?: string; - price?: DecCoinAmino; - deposit?: CoinAmino; + order: OrderIDAmino; + provider: string; + price: DecCoinAmino; + deposit: CoinAmino; } export interface MsgCreateBidAminoMsg { type: "/akash.market.v1beta2.MsgCreateBid"; @@ -112,7 +112,7 @@ export interface MsgCloseBidProtoMsg { } /** MsgCloseBid defines an SDK message for closing bid */ export interface MsgCloseBidAmino { - bid_id?: BidIDAmino; + bid_id: BidIDAmino; } export interface MsgCloseBidAminoMsg { type: "/akash.market.v1beta2.MsgCloseBid"; @@ -156,11 +156,11 @@ export interface BidIDProtoMsg { * A successful bid becomes a Lease(ID). */ export interface BidIDAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - provider?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + provider: string; } export interface BidIDAminoMsg { type: "/akash.market.v1beta2.BidID"; @@ -190,9 +190,9 @@ export interface BidProtoMsg { } /** Bid stores BidID, state of bid and price */ export interface BidAmino { - bid_id?: BidIDAmino; - state?: Bid_State; - price?: DecCoinAmino; + bid_id: BidIDAmino; + state: Bid_State; + price: DecCoinAmino; created_at?: string; } export interface BidAminoMsg { @@ -221,12 +221,12 @@ export interface BidFiltersProtoMsg { } /** BidFilters defines flags for bid list filter */ export interface BidFiltersAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - provider?: string; - state?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + provider: string; + state: string; } export interface BidFiltersAminoMsg { type: "/akash.market.v1beta2.BidFilters"; @@ -356,10 +356,10 @@ export const MsgCreateBid = { }, 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; + obj.order = message.order ? OrderID.toAmino(message.order) : OrderID.toAmino(OrderID.fromPartial({})); + obj.provider = message.provider ?? ""; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateBidAminoMsg): MsgCreateBid { @@ -509,7 +509,7 @@ export const MsgCloseBid = { }, toAmino(message: MsgCloseBid): MsgCloseBidAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseBidAminoMsg): MsgCloseBid { @@ -719,11 +719,11 @@ export const BidID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; return obj; }, fromAminoMsg(object: BidIDAminoMsg): BidID { @@ -845,7 +845,7 @@ export const Bid = { message.bidId = BidID.fromAmino(object.bid_id); } if (object.state !== undefined && object.state !== null) { - message.state = bid_StateFromJSON(object.state); + message.state = object.state; } if (object.price !== undefined && object.price !== null) { message.price = DecCoin.fromAmino(object.price); @@ -857,10 +857,10 @@ export const Bid = { }, 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; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); + obj.state = message.state ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: BidAminoMsg): Bid { @@ -1020,12 +1020,12 @@ export const BidFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: BidFiltersAminoMsg): BidFilters { diff --git a/__fixtures__/v-next/outputv2/akash/market/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/market/v1beta2/genesis.ts index 625477c2c3..c09f496048 100644 --- a/__fixtures__/v-next/outputv2/akash/market/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/market/v1beta2/genesis.ts @@ -16,9 +16,9 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by market module */ export interface GenesisStateAmino { - orders?: OrderAmino[]; - leases?: LeaseAmino[]; - params?: ParamsAmino; + orders: OrderAmino[]; + leases: LeaseAmino[]; + params: ParamsAmino; } export interface GenesisStateAminoMsg { type: "/akash.market.v1beta2.GenesisState"; @@ -141,14 +141,14 @@ export const GenesisState = { if (message.orders) { obj.orders = message.orders.map(e => e ? Order.toAmino(e) : undefined); } else { - obj.orders = []; + obj.orders = message.orders; } if (message.leases) { obj.leases = message.leases.map(e => e ? Lease.toAmino(e) : undefined); } else { - obj.leases = []; + obj.leases = message.leases; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputv2/akash/market/v1beta2/lease.ts b/__fixtures__/v-next/outputv2/akash/market/v1beta2/lease.ts index 40a6562f6e..1b68d4c9e7 100644 --- a/__fixtures__/v-next/outputv2/akash/market/v1beta2/lease.ts +++ b/__fixtures__/v-next/outputv2/akash/market/v1beta2/lease.ts @@ -66,11 +66,11 @@ export interface LeaseIDProtoMsg { } /** LeaseID stores bid details of lease */ export interface LeaseIDAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - provider?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + provider: string; } export interface LeaseIDAminoMsg { type: "/akash.market.v1beta2.LeaseID"; @@ -98,9 +98,9 @@ export interface LeaseProtoMsg { } /** Lease stores LeaseID, state of lease and price */ export interface LeaseAmino { - lease_id?: LeaseIDAmino; - state?: Lease_State; - price?: DecCoinAmino; + lease_id: LeaseIDAmino; + state: Lease_State; + price: DecCoinAmino; created_at?: string; closed_on?: string; } @@ -131,12 +131,12 @@ export interface LeaseFiltersProtoMsg { } /** LeaseFilters defines flags for lease list filter */ export interface LeaseFiltersAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - provider?: string; - state?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + provider: string; + state: string; } export interface LeaseFiltersAminoMsg { type: "/akash.market.v1beta2.LeaseFilters"; @@ -161,7 +161,7 @@ export interface MsgCreateLeaseProtoMsg { } /** MsgCreateLease is sent to create a lease */ export interface MsgCreateLeaseAmino { - bid_id?: BidIDAmino; + bid_id: BidIDAmino; } export interface MsgCreateLeaseAminoMsg { type: "/akash.market.v1beta2.MsgCreateLease"; @@ -195,7 +195,7 @@ export interface MsgWithdrawLeaseProtoMsg { } /** MsgWithdrawLease defines an SDK message for closing bid */ export interface MsgWithdrawLeaseAmino { - bid_id?: LeaseIDAmino; + bid_id: LeaseIDAmino; } export interface MsgWithdrawLeaseAminoMsg { type: "/akash.market.v1beta2.MsgWithdrawLease"; @@ -229,7 +229,7 @@ export interface MsgCloseLeaseProtoMsg { } /** MsgCloseLease defines an SDK message for closing order */ export interface MsgCloseLeaseAmino { - lease_id?: LeaseIDAmino; + lease_id: LeaseIDAmino; } export interface MsgCloseLeaseAminoMsg { type: "/akash.market.v1beta2.MsgCloseLease"; @@ -379,11 +379,11 @@ export const LeaseID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; return obj; }, fromAminoMsg(object: LeaseIDAminoMsg): LeaseID { @@ -519,7 +519,7 @@ export const Lease = { message.leaseId = LeaseID.fromAmino(object.lease_id); } if (object.state !== undefined && object.state !== null) { - message.state = lease_StateFromJSON(object.state); + message.state = object.state; } if (object.price !== undefined && object.price !== null) { message.price = DecCoin.fromAmino(object.price); @@ -534,11 +534,11 @@ export const Lease = { }, 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; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : LeaseID.toAmino(LeaseID.fromPartial({})); + obj.state = message.state ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; + obj.closed_on = message.closedOn !== BigInt(0) ? message.closedOn.toString() : undefined; return obj; }, fromAminoMsg(object: LeaseAminoMsg): Lease { @@ -698,12 +698,12 @@ export const LeaseFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: LeaseFiltersAminoMsg): LeaseFilters { @@ -788,7 +788,7 @@ export const MsgCreateLease = { }, toAmino(message: MsgCreateLease): MsgCreateLeaseAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateLeaseAminoMsg): MsgCreateLease { @@ -938,7 +938,7 @@ export const MsgWithdrawLease = { }, toAmino(message: MsgWithdrawLease): MsgWithdrawLeaseAmino { const obj: any = {}; - obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId) : LeaseID.toAmino(LeaseID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgWithdrawLeaseAminoMsg): MsgWithdrawLease { @@ -1088,7 +1088,7 @@ export const MsgCloseLease = { }, toAmino(message: MsgCloseLease): MsgCloseLeaseAmino { const obj: any = {}; - obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : undefined; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : LeaseID.toAmino(LeaseID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseLeaseAminoMsg): MsgCloseLease { diff --git a/__fixtures__/v-next/outputv2/akash/market/v1beta2/order.ts b/__fixtures__/v-next/outputv2/akash/market/v1beta2/order.ts index 29151aeb4d..be7b2ab39b 100644 --- a/__fixtures__/v-next/outputv2/akash/market/v1beta2/order.ts +++ b/__fixtures__/v-next/outputv2/akash/market/v1beta2/order.ts @@ -64,10 +64,10 @@ export interface OrderIDProtoMsg { } /** OrderID stores owner and all other seq numbers */ export interface OrderIDAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; + owner: string; + dseq: string; + gseq: number; + oseq: number; } export interface OrderIDAminoMsg { type: "/akash.market.v1beta2.OrderID"; @@ -93,9 +93,9 @@ export interface OrderProtoMsg { } /** Order stores orderID, state of order and other details */ export interface OrderAmino { - order_id?: OrderIDAmino; - state?: Order_State; - spec?: GroupSpecAmino; + order_id: OrderIDAmino; + state: Order_State; + spec: GroupSpecAmino; created_at?: string; } export interface OrderAminoMsg { @@ -123,11 +123,11 @@ export interface OrderFiltersProtoMsg { } /** OrderFilters defines flags for order list filter */ export interface OrderFiltersAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - state?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + state: string; } export interface OrderFiltersAminoMsg { type: "/akash.market.v1beta2.OrderFilters"; @@ -252,10 +252,10 @@ export const OrderID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; return obj; }, fromAminoMsg(object: OrderIDAminoMsg): OrderID { @@ -377,7 +377,7 @@ export const Order = { message.orderId = OrderID.fromAmino(object.order_id); } if (object.state !== undefined && object.state !== null) { - message.state = order_StateFromJSON(object.state); + message.state = object.state; } if (object.spec !== undefined && object.spec !== null) { message.spec = GroupSpec.fromAmino(object.spec); @@ -389,10 +389,10 @@ export const Order = { }, 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; + obj.order_id = message.orderId ? OrderID.toAmino(message.orderId) : OrderID.toAmino(OrderID.fromPartial({})); + obj.state = message.state ?? 0; + obj.spec = message.spec ? GroupSpec.toAmino(message.spec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: OrderAminoMsg): Order { @@ -537,11 +537,11 @@ export const OrderFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: OrderFiltersAminoMsg): OrderFilters { diff --git a/__fixtures__/v-next/outputv2/akash/market/v1beta2/params.ts b/__fixtures__/v-next/outputv2/akash/market/v1beta2/params.ts index 04691f77a5..662ed83bca 100644 --- a/__fixtures__/v-next/outputv2/akash/market/v1beta2/params.ts +++ b/__fixtures__/v-next/outputv2/akash/market/v1beta2/params.ts @@ -13,8 +13,8 @@ export interface ParamsProtoMsg { } /** Params is the params for the x/market module */ export interface ParamsAmino { - bid_min_deposit?: CoinAmino; - order_max_bids?: number; + bid_min_deposit: CoinAmino; + order_max_bids: number; } export interface ParamsAminoMsg { type: "/akash.market.v1beta2.Params"; @@ -106,8 +106,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit) : undefined; - obj.order_max_bids = message.orderMaxBids; + obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit) : Coin.toAmino(Coin.fromPartial({})); + obj.order_max_bids = message.orderMaxBids ?? 0; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/akash/market/v1beta2/query.ts b/__fixtures__/v-next/outputv2/akash/market/v1beta2/query.ts index 11b9d24da8..d841bbb5f7 100644 --- a/__fixtures__/v-next/outputv2/akash/market/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv2/akash/market/v1beta2/query.ts @@ -463,7 +463,7 @@ export const QueryOrdersResponse = { if (message.orders) { obj.orders = message.orders.map(e => e ? Order.toAmino(e) : undefined); } else { - obj.orders = []; + obj.orders = message.orders; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -847,7 +847,7 @@ export const QueryBidsResponse = { if (message.bids) { obj.bids = message.bids.map(e => e ? QueryBidResponse.toAmino(e) : undefined); } else { - obj.bids = []; + obj.bids = message.bids; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1249,7 +1249,7 @@ export const QueryLeasesResponse = { if (message.leases) { obj.leases = message.leases.map(e => e ? QueryLeaseResponse.toAmino(e) : undefined); } else { - obj.leases = []; + obj.leases = message.leases; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/akash/provider/v1beta1/provider.ts b/__fixtures__/v-next/outputv2/akash/provider/v1beta1/provider.ts index 63bbc9d130..90a8f61538 100644 --- a/__fixtures__/v-next/outputv2/akash/provider/v1beta1/provider.ts +++ b/__fixtures__/v-next/outputv2/akash/provider/v1beta1/provider.ts @@ -13,8 +13,8 @@ export interface ProviderInfoProtoMsg { } /** ProviderInfo */ export interface ProviderInfoAmino { - email?: string; - website?: string; + email: string; + website: string; } export interface ProviderInfoAminoMsg { type: "/akash.provider.v1beta1.ProviderInfo"; @@ -38,10 +38,10 @@ export interface MsgCreateProviderProtoMsg { } /** MsgCreateProvider defines an SDK message for creating a provider */ export interface MsgCreateProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } export interface MsgCreateProviderAminoMsg { type: "/akash.provider.v1beta1.MsgCreateProvider"; @@ -81,10 +81,10 @@ export interface MsgUpdateProviderProtoMsg { } /** MsgUpdateProvider defines an SDK message for updating a provider */ export interface MsgUpdateProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } export interface MsgUpdateProviderAminoMsg { type: "/akash.provider.v1beta1.MsgUpdateProvider"; @@ -121,7 +121,7 @@ export interface MsgDeleteProviderProtoMsg { } /** MsgDeleteProvider defines an SDK message for deleting a provider */ export interface MsgDeleteProviderAmino { - owner?: string; + owner: string; } export interface MsgDeleteProviderAminoMsg { type: "/akash.provider.v1beta1.MsgDeleteProvider"; @@ -158,10 +158,10 @@ export interface ProviderProtoMsg { } /** Provider stores owner and host details */ export interface ProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } export interface ProviderAminoMsg { type: "/akash.provider.v1beta1.Provider"; @@ -253,8 +253,8 @@ export const ProviderInfo = { }, toAmino(message: ProviderInfo): ProviderInfoAmino { const obj: any = {}; - obj.email = message.email; - obj.website = message.website; + obj.email = message.email ?? ""; + obj.website = message.website ?? ""; return obj; }, fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo { @@ -390,14 +390,14 @@ export const MsgCreateProvider = { }, toAmino(message: MsgCreateProvider): MsgCreateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider { @@ -598,14 +598,14 @@ export const MsgUpdateProvider = { }, toAmino(message: MsgUpdateProvider): MsgUpdateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider { @@ -753,7 +753,7 @@ export const MsgDeleteProvider = { }, toAmino(message: MsgDeleteProvider): MsgDeleteProviderAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner ?? ""; return obj; }, fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider { @@ -954,14 +954,14 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: ProviderAminoMsg): Provider { diff --git a/__fixtures__/v-next/outputv2/akash/provider/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/provider/v1beta2/genesis.ts index 101c453585..a5980b6ae9 100644 --- a/__fixtures__/v-next/outputv2/akash/provider/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/provider/v1beta2/genesis.ts @@ -12,7 +12,7 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by provider module */ export interface GenesisStateAmino { - providers?: ProviderAmino[]; + providers: ProviderAmino[]; } export interface GenesisStateAminoMsg { type: "/akash.provider.v1beta2.GenesisState"; @@ -95,7 +95,7 @@ export const GenesisState = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/akash/provider/v1beta2/provider.ts b/__fixtures__/v-next/outputv2/akash/provider/v1beta2/provider.ts index 7e35e88034..db51e792da 100644 --- a/__fixtures__/v-next/outputv2/akash/provider/v1beta2/provider.ts +++ b/__fixtures__/v-next/outputv2/akash/provider/v1beta2/provider.ts @@ -13,8 +13,8 @@ export interface ProviderInfoProtoMsg { } /** ProviderInfo */ export interface ProviderInfoAmino { - email?: string; - website?: string; + email: string; + website: string; } export interface ProviderInfoAminoMsg { type: "/akash.provider.v1beta2.ProviderInfo"; @@ -38,10 +38,10 @@ export interface MsgCreateProviderProtoMsg { } /** MsgCreateProvider defines an SDK message for creating a provider */ export interface MsgCreateProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } export interface MsgCreateProviderAminoMsg { type: "/akash.provider.v1beta2.MsgCreateProvider"; @@ -81,10 +81,10 @@ export interface MsgUpdateProviderProtoMsg { } /** MsgUpdateProvider defines an SDK message for updating a provider */ export interface MsgUpdateProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } export interface MsgUpdateProviderAminoMsg { type: "/akash.provider.v1beta2.MsgUpdateProvider"; @@ -121,7 +121,7 @@ export interface MsgDeleteProviderProtoMsg { } /** MsgDeleteProvider defines an SDK message for deleting a provider */ export interface MsgDeleteProviderAmino { - owner?: string; + owner: string; } export interface MsgDeleteProviderAminoMsg { type: "/akash.provider.v1beta2.MsgDeleteProvider"; @@ -158,10 +158,10 @@ export interface ProviderProtoMsg { } /** Provider stores owner and host details */ export interface ProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } export interface ProviderAminoMsg { type: "/akash.provider.v1beta2.Provider"; @@ -253,8 +253,8 @@ export const ProviderInfo = { }, toAmino(message: ProviderInfo): ProviderInfoAmino { const obj: any = {}; - obj.email = message.email; - obj.website = message.website; + obj.email = message.email ?? ""; + obj.website = message.website ?? ""; return obj; }, fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo { @@ -390,14 +390,14 @@ export const MsgCreateProvider = { }, toAmino(message: MsgCreateProvider): MsgCreateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider { @@ -598,14 +598,14 @@ export const MsgUpdateProvider = { }, toAmino(message: MsgUpdateProvider): MsgUpdateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider { @@ -753,7 +753,7 @@ export const MsgDeleteProvider = { }, toAmino(message: MsgDeleteProvider): MsgDeleteProviderAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner ?? ""; return obj; }, fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider { @@ -954,14 +954,14 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: ProviderAminoMsg): Provider { diff --git a/__fixtures__/v-next/outputv2/akash/provider/v1beta2/query.ts b/__fixtures__/v-next/outputv2/akash/provider/v1beta2/query.ts index 15e0987f9e..eb1129dc1a 100644 --- a/__fixtures__/v-next/outputv2/akash/provider/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv2/akash/provider/v1beta2/query.ts @@ -261,7 +261,7 @@ export const QueryProvidersResponse = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -346,7 +346,7 @@ export const QueryProviderRequest = { }, toAmino(message: QueryProviderRequest): QueryProviderRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest { diff --git a/__fixtures__/v-next/outputv2/confio/proofs.ts b/__fixtures__/v-next/outputv2/confio/proofs.ts index 134ddf6d86..30b2b82f2f 100644 --- a/__fixtures__/v-next/outputv2/confio/proofs.ts +++ b/__fixtures__/v-next/outputv2/confio/proofs.ts @@ -877,7 +877,7 @@ export const ExistenceProof = { if (message.path) { obj.path = message.path.map(e => e ? InnerOp.toAmino(e) : undefined); } else { - obj.path = []; + obj.path = message.path; } return obj; }, @@ -1261,16 +1261,16 @@ export const LeafOp = { fromAmino(object: LeafOpAmino): LeafOp { const message = createBaseLeafOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prehash_key !== undefined && object.prehash_key !== null) { - message.prehashKey = hashOpFromJSON(object.prehash_key); + message.prehashKey = object.prehash_key; } if (object.prehash_value !== undefined && object.prehash_value !== null) { - message.prehashValue = hashOpFromJSON(object.prehash_value); + message.prehashValue = object.prehash_value; } if (object.length !== undefined && object.length !== null) { - message.length = lengthOpFromJSON(object.length); + message.length = object.length; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1279,10 +1279,10 @@ export const LeafOp = { }, 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.hash = message.hash === 0 ? undefined : message.hash; + obj.prehash_key = message.prehashKey === 0 ? undefined : message.prehashKey; + obj.prehash_value = message.prehashValue === 0 ? undefined : message.prehashValue; + obj.length = message.length === 0 ? undefined : message.length; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; }, @@ -1384,7 +1384,7 @@ export const InnerOp = { fromAmino(object: InnerOpAmino): InnerOp { const message = createBaseInnerOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1396,7 +1396,7 @@ export const InnerOp = { }, toAmino(message: InnerOp): InnerOpAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; obj.suffix = message.suffix ? base64FromBytes(message.suffix) : undefined; return obj; @@ -1532,8 +1532,8 @@ export const ProofSpec = { 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; + obj.max_depth = message.maxDepth === 0 ? undefined : message.maxDepth; + obj.min_depth = message.minDepth === 0 ? undefined : message.minDepth; return obj; }, fromAminoMsg(object: ProofSpecAminoMsg): ProofSpec { @@ -1700,7 +1700,7 @@ export const InnerSpec = { message.emptyChild = bytesFromBase64(object.empty_child); } if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } return message; }, @@ -1709,13 +1709,13 @@ export const InnerSpec = { if (message.childOrder) { obj.child_order = message.childOrder.map(e => e); } else { - obj.child_order = []; + obj.child_order = message.childOrder; } - obj.child_size = message.childSize; - obj.min_prefix_length = message.minPrefixLength; - obj.max_prefix_length = message.maxPrefixLength; + obj.child_size = message.childSize === 0 ? undefined : message.childSize; + obj.min_prefix_length = message.minPrefixLength === 0 ? undefined : message.minPrefixLength; + obj.max_prefix_length = message.maxPrefixLength === 0 ? undefined : message.maxPrefixLength; obj.empty_child = message.emptyChild ? base64FromBytes(message.emptyChild) : undefined; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; return obj; }, fromAminoMsg(object: InnerSpecAminoMsg): InnerSpec { @@ -1807,7 +1807,7 @@ export const BatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? BatchEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2024,12 +2024,12 @@ export const CompressedBatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? CompressedBatchEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.lookupInners) { obj.lookup_inners = message.lookupInners.map(e => e ? InnerOp.toAmino(e) : undefined); } else { - obj.lookup_inners = []; + obj.lookup_inners = message.lookupInners; } return obj; }, @@ -2284,7 +2284,7 @@ export const CompressedExistenceProof = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/config.ts b/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/config.ts index ed916f9a8e..1c8ea49d93 100644 --- a/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/config.ts +++ b/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/config.ts @@ -177,7 +177,7 @@ export const Config = { if (message.modules) { obj.modules = message.modules.map(e => e ? ModuleConfig.toAmino(e) : undefined); } else { - obj.modules = []; + obj.modules = message.modules; } return obj; }, @@ -285,7 +285,7 @@ export const ModuleConfig = { }, toAmino(message: ModuleConfig): ModuleConfigAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.config = message.config ? Any.toAmino(message.config) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/module.ts b/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/module.ts index c38091e3a8..a9c5f92b9b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/module.ts +++ b/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/module.ts @@ -314,16 +314,16 @@ export const ModuleDescriptor = { }, toAmino(message: ModuleDescriptor): ModuleDescriptorAmino { const obj: any = {}; - obj.go_import = message.goImport; + obj.go_import = message.goImport === "" ? undefined : message.goImport; if (message.usePackage) { obj.use_package = message.usePackage.map(e => e ? PackageReference.toAmino(e) : undefined); } else { - obj.use_package = []; + obj.use_package = message.usePackage; } if (message.canMigrateFrom) { obj.can_migrate_from = message.canMigrateFrom.map(e => e ? MigrateFromInfo.toAmino(e) : undefined); } else { - obj.can_migrate_from = []; + obj.can_migrate_from = message.canMigrateFrom; } return obj; }, @@ -429,8 +429,8 @@ export const PackageReference = { }, toAmino(message: PackageReference): PackageReferenceAmino { const obj: any = {}; - obj.name = message.name; - obj.revision = message.revision; + obj.name = message.name === "" ? undefined : message.name; + obj.revision = message.revision === 0 ? undefined : message.revision; return obj; }, fromAminoMsg(object: PackageReferenceAminoMsg): PackageReference { @@ -520,7 +520,7 @@ export const MigrateFromInfo = { }, toAmino(message: MigrateFromInfo): MigrateFromInfoAmino { const obj: any = {}; - obj.module = message.module; + obj.module = message.module === "" ? undefined : message.module; return obj; }, fromAminoMsg(object: MigrateFromInfoAminoMsg): MigrateFromInfo { diff --git a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/auth.ts b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/auth.ts index b1c838d418..a9775ece06 100644 --- a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/auth.ts +++ b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/auth.ts @@ -222,10 +222,10 @@ export const BaseAccount = { }, toAmino(message: BaseAccount): BaseAccountAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : 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; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: BaseAccountAminoMsg): BaseAccount { @@ -355,11 +355,11 @@ export const ModuleAccount = { toAmino(message: ModuleAccount): ModuleAccountAmino { const obj: any = {}; obj.base_account = message.baseAccount ? BaseAccount.toAmino(message.baseAccount) : undefined; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.permissions) { obj.permissions = message.permissions.map(e => e); } else { - obj.permissions = []; + obj.permissions = message.permissions; } return obj; }, @@ -520,11 +520,11 @@ export const Params = { }, 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; + obj.max_memo_characters = message.maxMemoCharacters !== BigInt(0) ? message.maxMemoCharacters.toString() : undefined; + obj.tx_sig_limit = message.txSigLimit !== BigInt(0) ? message.txSigLimit.toString() : undefined; + obj.tx_size_cost_per_byte = message.txSizeCostPerByte !== BigInt(0) ? message.txSizeCostPerByte.toString() : undefined; + obj.sig_verify_cost_ed25519 = message.sigVerifyCostEd25519 !== BigInt(0) ? message.sigVerifyCostEd25519.toString() : undefined; + obj.sig_verify_cost_secp256k1 = message.sigVerifyCostSecp256k1 !== BigInt(0) ? message.sigVerifyCostSecp256k1.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/genesis.ts index c6c7391881..88458f3aec 100644 --- a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/genesis.ts @@ -122,7 +122,7 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts index 1c2922b0f4..589481a5d6 100644 --- a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts @@ -497,7 +497,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? AccountI_ToAmino((e as Any)) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -589,7 +589,7 @@ export const QueryAccountRequest = { }, toAmino(message: QueryAccountRequest): QueryAccountRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryAccountRequestAminoMsg): QueryAccountRequest { @@ -1016,7 +1016,7 @@ export const QueryModuleAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? ModuleAccountI_ToAmino((e as Any)) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } return obj; }, @@ -1179,7 +1179,7 @@ export const Bech32PrefixResponse = { }, toAmino(message: Bech32PrefixResponse): Bech32PrefixResponseAmino { const obj: any = {}; - obj.bech32_prefix = message.bech32Prefix; + obj.bech32_prefix = message.bech32Prefix === "" ? undefined : message.bech32Prefix; return obj; }, fromAminoMsg(object: Bech32PrefixResponseAminoMsg): Bech32PrefixResponse { @@ -1359,7 +1359,7 @@ export const AddressBytesToStringResponse = { }, toAmino(message: AddressBytesToStringResponse): AddressBytesToStringResponseAmino { const obj: any = {}; - obj.address_string = message.addressString; + obj.address_string = message.addressString === "" ? undefined : message.addressString; return obj; }, fromAminoMsg(object: AddressBytesToStringResponseAminoMsg): AddressBytesToStringResponse { @@ -1449,7 +1449,7 @@ export const AddressStringToBytesRequest = { }, toAmino(message: AddressStringToBytesRequest): AddressStringToBytesRequestAmino { const obj: any = {}; - obj.address_string = message.addressString; + obj.address_string = message.addressString === "" ? undefined : message.addressString; return obj; }, fromAminoMsg(object: AddressStringToBytesRequestAminoMsg): AddressStringToBytesRequest { @@ -1574,7 +1574,7 @@ export const AccountI_InterfaceDecoder = (input: BinaryReader | Uint8Array): Bas return data; } }; -export const AccountI_FromAmino = (content: AnyAmino) => { +export const AccountI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/BaseAccount": return Any.fromPartial({ @@ -1606,7 +1606,7 @@ export const ModuleAccountI_InterfaceDecoder = (input: BinaryReader | Uint8Array return data; } }; -export const ModuleAccountI_FromAmino = (content: AnyAmino) => { +export const ModuleAccountI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/ModuleAccount": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts index 4b6cc66cda..74088b7d13 100644 --- a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts @@ -218,7 +218,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { @@ -463,8 +463,8 @@ export const GrantAuthorization = { }, toAmino(message: GrantAuthorization): GrantAuthorizationAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.authorization = message.authorization ? Authorization_ToAmino((message.authorization as Any)) : undefined; obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -565,7 +565,7 @@ export const GrantQueueItem = { if (message.msgTypeUrls) { obj.msg_type_urls = message.msgTypeUrls.map(e => e); } else { - obj.msg_type_urls = []; + obj.msg_type_urls = message.msgTypeUrls; } return obj; }, @@ -609,7 +609,7 @@ export const Authorization_InterfaceDecoder = (input: BinaryReader | Uint8Array) return data; } }; -export const Authorization_FromAmino = (content: AnyAmino) => { +export const Authorization_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "/akash.deployment.v1beta1.DepositDeploymentAuthorization": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/genesis.ts index 86cf59c44c..646ea1abe8 100644 --- a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/genesis.ts @@ -96,7 +96,7 @@ export const GenesisState = { if (message.authorization) { obj.authorization = message.authorization.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.authorization = []; + obj.authorization = message.authorization; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/query.ts index 6948abf482..c06e9fbba1 100644 --- a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/query.ts @@ -279,9 +279,9 @@ export const QueryGrantsRequest = { }, toAmino(message: QueryGrantsRequest): QueryGrantsRequestAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -398,7 +398,7 @@ export const QueryGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -507,7 +507,7 @@ export const QueryGranterGrantsRequest = { }, toAmino(message: QueryGranterGrantsRequest): QueryGranterGrantsRequestAmino { const obj: any = {}; - obj.granter = message.granter; + obj.granter = message.granter === "" ? undefined : message.granter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -624,7 +624,7 @@ export const QueryGranterGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -733,7 +733,7 @@ export const QueryGranteeGrantsRequest = { }, toAmino(message: QueryGranteeGrantsRequest): QueryGranteeGrantsRequestAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -850,7 +850,7 @@ export const QueryGranteeGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/tx.ts index ad397113c2..c846b84c76 100644 --- a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/tx.ts @@ -271,8 +271,8 @@ export const MsgGrant = { }, toAmino(message: MsgGrant): MsgGrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.grant = message.grant ? Grant.toAmino(message.grant) : undefined; return obj; }, @@ -372,7 +372,7 @@ export const MsgExecResponse = { if (message.results) { obj.results = message.results.map(e => base64FromBytes(e)); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -484,11 +484,11 @@ export const MsgExec = { }, toAmino(message: MsgExec): MsgExecAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? Sdk_MsgauthzAuthorization_ToAmino((e as Any)) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -681,9 +681,9 @@ export const MsgRevoke = { }, toAmino(message: MsgRevoke): MsgRevokeAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromAminoMsg(object: MsgRevokeAminoMsg): MsgRevoke { @@ -788,7 +788,7 @@ export const Sdk_Msg_InterfaceDecoder = (input: BinaryReader | Uint8Array): Any return data; } }; -export const Sdk_Msg_FromAmino = (content: AnyAmino) => { +export const Sdk_Msg_FromAmino = (content: AnyAmino): Any => { return Any.fromAmino(content); }; export const Sdk_Msg_ToAmino = (content: Any) => { @@ -802,7 +802,7 @@ export const Authz_Authorization_InterfaceDecoder = (input: BinaryReader | Uint8 return data; } }; -export const Authz_Authorization_FromAmino = (content: AnyAmino) => { +export const Authz_Authorization_FromAmino = (content: AnyAmino): Any => { return Any.fromAmino(content); }; export const Authz_Authorization_ToAmino = (content: Any) => { diff --git a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/authz.ts b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/authz.ts index 4aa18d0bcc..ff6b5e2834 100644 --- a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/authz.ts @@ -114,7 +114,7 @@ export const SendAuthorization = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/bank.ts b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/bank.ts index c5e511a480..ae07ab3b6f 100644 --- a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/bank.ts +++ b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/bank.ts @@ -388,9 +388,9 @@ export const Params = { if (message.sendEnabled) { obj.send_enabled = message.sendEnabled.map(e => e ? SendEnabled.toAmino(e) : undefined); } else { - obj.send_enabled = []; + obj.send_enabled = message.sendEnabled; } - obj.default_send_enabled = message.defaultSendEnabled; + obj.default_send_enabled = message.defaultSendEnabled === false ? undefined : message.defaultSendEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -495,8 +495,8 @@ export const SendEnabled = { }, toAmino(message: SendEnabled): SendEnabledAmino { const obj: any = {}; - obj.denom = message.denom; - obj.enabled = message.enabled; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.enabled = message.enabled === false ? undefined : message.enabled; return obj; }, fromAminoMsg(object: SendEnabledAminoMsg): SendEnabled { @@ -607,11 +607,11 @@ export const Input = { }, toAmino(message: Input): InputAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -723,11 +723,11 @@ export const Output = { }, toAmino(message: Output): OutputAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -828,7 +828,7 @@ export const Supply = { if (message.total) { obj.total = message.total.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total = []; + obj.total = message.total; } return obj; }, @@ -955,12 +955,12 @@ export const DenomUnit = { }, toAmino(message: DenomUnit): DenomUnitAmino { const obj: any = {}; - obj.denom = message.denom; - obj.exponent = message.exponent; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.exponent = message.exponent === 0 ? undefined : message.exponent; if (message.aliases) { obj.aliases = message.aliases.map(e => e); } else { - obj.aliases = []; + obj.aliases = message.aliases; } return obj; }, @@ -1162,18 +1162,18 @@ export const Metadata = { }, toAmino(message: Metadata): MetadataAmino { const obj: any = {}; - obj.description = message.description; + obj.description = message.description === "" ? undefined : message.description; if (message.denomUnits) { obj.denom_units = message.denomUnits.map(e => e ? DenomUnit.toAmino(e) : undefined); } else { - obj.denom_units = []; + obj.denom_units = message.denomUnits; } - 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; + obj.base = message.base === "" ? undefined : message.base; + obj.display = message.display === "" ? undefined : message.display; + obj.name = message.name === "" ? undefined : message.name; + obj.symbol = message.symbol === "" ? undefined : message.symbol; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; return obj; }, fromAminoMsg(object: MetadataAminoMsg): Metadata { diff --git a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/genesis.ts index 040a1e3333..d80952dba4 100644 --- a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/genesis.ts @@ -216,17 +216,17 @@ export const GenesisState = { if (message.balances) { obj.balances = message.balances.map(e => e ? Balance.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } if (message.supply) { obj.supply = message.supply.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.supply = []; + obj.supply = message.supply; } if (message.denomMetadata) { obj.denom_metadata = message.denomMetadata.map(e => e ? Metadata.toAmino(e) : undefined); } else { - obj.denom_metadata = []; + obj.denom_metadata = message.denomMetadata; } return obj; }, @@ -338,11 +338,11 @@ export const Balance = { }, toAmino(message: Balance): BalanceAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/query.ts index a22a44b286..bd0f83107b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/query.ts @@ -643,8 +643,8 @@ export const QueryBalanceRequest = { }, toAmino(message: QueryBalanceRequest): QueryBalanceRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.denom = message.denom; + obj.address = message.address === "" ? undefined : message.address; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest { @@ -843,7 +843,7 @@ export const QueryAllBalancesRequest = { }, toAmino(message: QueryAllBalancesRequest): QueryAllBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -960,7 +960,7 @@ export const QueryAllBalancesResponse = { if (message.balances) { obj.balances = message.balances.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1069,7 +1069,7 @@ export const QuerySpendableBalancesRequest = { }, toAmino(message: QuerySpendableBalancesRequest): QuerySpendableBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1186,7 +1186,7 @@ export const QuerySpendableBalancesResponse = { if (message.balances) { obj.balances = message.balances.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1396,7 +1396,7 @@ export const QueryTotalSupplyResponse = { if (message.supply) { obj.supply = message.supply.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.supply = []; + obj.supply = message.supply; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1488,7 +1488,7 @@ export const QuerySupplyOfRequest = { }, toAmino(message: QuerySupplyOfRequest): QuerySupplyOfRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QuerySupplyOfRequestAminoMsg): QuerySupplyOfRequest { @@ -1952,7 +1952,7 @@ export const QueryDenomsMetadataResponse = { if (message.metadatas) { obj.metadatas = message.metadatas.map(e => e ? Metadata.toAmino(e) : undefined); } else { - obj.metadatas = []; + obj.metadatas = message.metadatas; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2044,7 +2044,7 @@ export const QueryDenomMetadataRequest = { }, toAmino(message: QueryDenomMetadataRequest): QueryDenomMetadataRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomMetadataRequestAminoMsg): QueryDenomMetadataRequest { @@ -2243,7 +2243,7 @@ export const QueryDenomOwnersRequest = { }, toAmino(message: QueryDenomOwnersRequest): QueryDenomOwnersRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2351,7 +2351,7 @@ export const DenomOwner = { }, toAmino(message: DenomOwner): DenomOwnerAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined; return obj; }, @@ -2468,7 +2468,7 @@ export const QueryDenomOwnersResponse = { if (message.denomOwners) { obj.denom_owners = message.denomOwners.map(e => e ? DenomOwner.toAmino(e) : undefined); } else { - obj.denom_owners = []; + obj.denom_owners = message.denomOwners; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/tx.ts index e719e9c2bc..149b49a087 100644 --- a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/tx.ts @@ -181,12 +181,12 @@ export const MsgSend = { }, toAmino(message: MsgSend): MsgSendAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -379,12 +379,12 @@ export const MsgMultiSend = { if (message.inputs) { obj.inputs = message.inputs.map(e => e ? Input.toAmino(e) : undefined); } else { - obj.inputs = []; + obj.inputs = message.inputs; } if (message.outputs) { obj.outputs = message.outputs.map(e => e ? Output.toAmino(e) : undefined); } else { - obj.outputs = []; + obj.outputs = message.outputs; } return obj; }, 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 e7fd30a46e..5f0e09e549 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/abci/v1beta1/abci.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/abci/v1beta1/abci.ts @@ -138,7 +138,7 @@ export interface ABCIMessageLogProtoMsg { } /** ABCIMessageLog defines a structure containing an indexed tx ABCI message log. */ export interface ABCIMessageLogAmino { - msg_index?: number; + msg_index: number; log?: string; /** * Events contains a slice of Event objects that were emitted during some @@ -737,26 +737,26 @@ export const TxResponse = { }, 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; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.txhash = message.txhash === "" ? undefined : message.txhash; + obj.codespace = message.codespace === "" ? undefined : message.codespace; + obj.code = message.code === 0 ? undefined : message.code; + obj.data = message.data === "" ? undefined : message.data; + obj.raw_log = message.rawLog === "" ? undefined : message.rawLog; if (message.logs) { obj.logs = message.logs.map(e => e ? ABCIMessageLog.toAmino(e) : undefined); } else { - obj.logs = []; + obj.logs = message.logs; } - obj.info = message.info; - obj.gas_wanted = message.gasWanted ? message.gasWanted.toString() : undefined; - obj.gas_used = message.gasUsed ? message.gasUsed.toString() : undefined; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; obj.tx = message.tx ? Any.toAmino(message.tx) : undefined; - obj.timestamp = message.timestamp; + obj.timestamp = message.timestamp === "" ? undefined : message.timestamp; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -883,12 +883,12 @@ export const ABCIMessageLog = { }, toAmino(message: ABCIMessageLog): ABCIMessageLogAmino { const obj: any = {}; - obj.msg_index = message.msgIndex; - obj.log = message.log; + obj.msg_index = message.msgIndex ?? 0; + obj.log = message.log === "" ? undefined : message.log; if (message.events) { obj.events = message.events.map(e => e ? StringEvent.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -1000,11 +1000,11 @@ export const StringEvent = { }, toAmino(message: StringEvent): StringEventAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -1110,8 +1110,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -1220,8 +1220,8 @@ export const GasInfo = { }, 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; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; return obj; }, fromAminoMsg(object: GasInfoAminoMsg): GasInfo { @@ -1369,16 +1369,16 @@ export const Result = { toAmino(message: Result): ResultAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.log = message.log; + obj.log = message.log === "" ? undefined : message.log; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } if (message.msgResponses) { obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msg_responses = []; + obj.msg_responses = message.msgResponses; } return obj; }, @@ -1594,7 +1594,7 @@ export const MsgData = { }, toAmino(message: MsgData): MsgDataAmino { const obj: any = {}; - obj.msg_type = message.msgType; + obj.msg_type = message.msgType === "" ? undefined : message.msgType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1715,12 +1715,12 @@ export const TxMsgData = { if (message.data) { obj.data = message.data.map(e => e ? MsgData.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } if (message.msgResponses) { obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msg_responses = []; + obj.msg_responses = message.msgResponses; } return obj; }, @@ -1902,15 +1902,15 @@ export const SearchTxsResult = { }, 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; + obj.total_count = message.totalCount !== BigInt(0) ? message.totalCount.toString() : undefined; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.page_number = message.pageNumber !== BigInt(0) ? message.pageNumber.toString() : undefined; + obj.page_total = message.pageTotal !== BigInt(0) ? message.pageTotal.toString() : undefined; + obj.limit = message.limit !== BigInt(0) ? message.limit.toString() : undefined; if (message.txs) { obj.txs = message.txs.map(e => e ? TxResponse.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } return obj; }, 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 eb41056ffb..113f42438d 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/kv/v1beta1/kv.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/kv/v1beta1/kv.ts @@ -118,7 +118,7 @@ export const Pairs = { if (message.pairs) { obj.pairs = message.pairs.map(e => e ? Pair.toAmino(e) : undefined); } else { - obj.pairs = []; + obj.pairs = message.pairs; } return obj; }, 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 814f1a40ee..3b8343ea94 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/query/v1beta1/pagination.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/query/v1beta1/pagination.ts @@ -302,10 +302,10 @@ export const PageRequest = { toAmino(message: PageRequest): PageRequestAmino { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; - 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; + obj.offset = message.offset !== BigInt(0) ? message.offset.toString() : undefined; + obj.limit = message.limit !== BigInt(0) ? message.limit.toString() : undefined; + obj.count_total = message.countTotal === false ? undefined : message.countTotal; + obj.reverse = message.reverse === false ? undefined : message.reverse; return obj; }, fromAminoMsg(object: PageRequestAminoMsg): PageRequest { @@ -413,7 +413,7 @@ export const PageResponse = { toAmino(message: PageResponse): PageResponseAmino { const obj: any = {}; obj.next_key = message.nextKey ? base64FromBytes(message.nextKey) : undefined; - obj.total = message.total ? message.total.toString() : undefined; + obj.total = message.total !== BigInt(0) ? message.total.toString() : undefined; return obj; }, fromAminoMsg(object: PageResponseAminoMsg): PageResponse { 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 fd13beae43..ecf4b43bf3 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/reflection/v1beta1/reflection.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/reflection/v1beta1/reflection.ts @@ -243,7 +243,7 @@ export const ListAllInterfacesResponse = { if (message.interfaceNames) { obj.interface_names = message.interfaceNames.map(e => e); } else { - obj.interface_names = []; + obj.interface_names = message.interfaceNames; } return obj; }, @@ -334,7 +334,7 @@ export const ListImplementationsRequest = { }, toAmino(message: ListImplementationsRequest): ListImplementationsRequestAmino { const obj: any = {}; - obj.interface_name = message.interfaceName; + obj.interface_name = message.interfaceName === "" ? undefined : message.interfaceName; return obj; }, fromAminoMsg(object: ListImplementationsRequestAminoMsg): ListImplementationsRequest { @@ -433,7 +433,7 @@ export const ListImplementationsResponse = { if (message.implementationMessageNames) { obj.implementation_message_names = message.implementationMessageNames.map(e => e); } else { - obj.implementation_message_names = []; + obj.implementation_message_names = message.implementationMessageNames; } return obj; }, 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 40996eaf7b..a7961fac7f 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/reflection/v2alpha1/reflection.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/reflection/v2alpha1/reflection.ts @@ -969,11 +969,11 @@ export const TxDescriptor = { }, toAmino(message: TxDescriptor): TxDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? MsgDescriptor.toAmino(e) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -1073,7 +1073,7 @@ export const AuthnDescriptor = { if (message.signModes) { obj.sign_modes = message.signModes.map(e => e ? SigningModeDescriptor.toAmino(e) : undefined); } else { - obj.sign_modes = []; + obj.sign_modes = message.signModes; } return obj; }, @@ -1194,9 +1194,9 @@ export const SigningModeDescriptor = { }, toAmino(message: SigningModeDescriptor): SigningModeDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; - obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname === "" ? undefined : message.authnInfoProviderMethodFullname; return obj; }, fromAminoMsg(object: SigningModeDescriptorAminoMsg): SigningModeDescriptor { @@ -1286,7 +1286,7 @@ export const ChainDescriptor = { }, toAmino(message: ChainDescriptor): ChainDescriptorAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: ChainDescriptorAminoMsg): ChainDescriptor { @@ -1385,7 +1385,7 @@ export const CodecDescriptor = { if (message.interfaces) { obj.interfaces = message.interfaces.map(e => e ? InterfaceDescriptor.toAmino(e) : undefined); } else { - obj.interfaces = []; + obj.interfaces = message.interfaces; } return obj; }, @@ -1518,16 +1518,16 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.interfaceAcceptingMessages) { obj.interface_accepting_messages = message.interfaceAcceptingMessages.map(e => e ? InterfaceAcceptingMessageDescriptor.toAmino(e) : undefined); } else { - obj.interface_accepting_messages = []; + obj.interface_accepting_messages = message.interfaceAcceptingMessages; } if (message.interfaceImplementers) { obj.interface_implementers = message.interfaceImplementers.map(e => e ? InterfaceImplementerDescriptor.toAmino(e) : undefined); } else { - obj.interface_implementers = []; + obj.interface_implementers = message.interfaceImplementers; } return obj; }, @@ -1633,8 +1633,8 @@ export const InterfaceImplementerDescriptor = { }, toAmino(message: InterfaceImplementerDescriptor): InterfaceImplementerDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; - obj.type_url = message.typeUrl; + obj.fullname = message.fullname === "" ? undefined : message.fullname; + obj.type_url = message.typeUrl === "" ? undefined : message.typeUrl; return obj; }, fromAminoMsg(object: InterfaceImplementerDescriptorAminoMsg): InterfaceImplementerDescriptor { @@ -1745,11 +1745,11 @@ export const InterfaceAcceptingMessageDescriptor = { }, toAmino(message: InterfaceAcceptingMessageDescriptor): InterfaceAcceptingMessageDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.fieldDescriptorNames) { obj.field_descriptor_names = message.fieldDescriptorNames.map(e => e); } else { - obj.field_descriptor_names = []; + obj.field_descriptor_names = message.fieldDescriptorNames; } return obj; }, @@ -1840,7 +1840,7 @@ export const ConfigurationDescriptor = { }, toAmino(message: ConfigurationDescriptor): ConfigurationDescriptorAmino { const obj: any = {}; - obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix; + obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix === "" ? undefined : message.bech32AccountAddressPrefix; return obj; }, fromAminoMsg(object: ConfigurationDescriptorAminoMsg): ConfigurationDescriptor { @@ -1930,7 +1930,7 @@ export const MsgDescriptor = { }, toAmino(message: MsgDescriptor): MsgDescriptorAmino { const obj: any = {}; - obj.msg_type_url = message.msgTypeUrl; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromAminoMsg(object: MsgDescriptorAminoMsg): MsgDescriptor { @@ -3013,7 +3013,7 @@ export const QueryServicesDescriptor = { if (message.queryServices) { obj.query_services = message.queryServices.map(e => e ? QueryServiceDescriptor.toAmino(e) : undefined); } else { - obj.query_services = []; + obj.query_services = message.queryServices; } return obj; }, @@ -3140,12 +3140,12 @@ export const QueryServiceDescriptor = { }, toAmino(message: QueryServiceDescriptor): QueryServiceDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; - obj.is_module = message.isModule; + obj.fullname = message.fullname === "" ? undefined : message.fullname; + obj.is_module = message.isModule === false ? undefined : message.isModule; if (message.methods) { obj.methods = message.methods.map(e => e ? QueryMethodDescriptor.toAmino(e) : undefined); } else { - obj.methods = []; + obj.methods = message.methods; } return obj; }, @@ -3251,8 +3251,8 @@ export const QueryMethodDescriptor = { }, toAmino(message: QueryMethodDescriptor): QueryMethodDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.full_query_path = message.fullQueryPath; + obj.name = message.name === "" ? undefined : message.name; + obj.full_query_path = message.fullQueryPath === "" ? undefined : message.fullQueryPath; return obj; }, fromAminoMsg(object: QueryMethodDescriptorAminoMsg): QueryMethodDescriptor { 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 914e7193ae..3fcad902d0 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/snapshots/v1beta1/snapshot.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/snapshots/v1beta1/snapshot.ts @@ -358,9 +358,9 @@ export const Snapshot = { }, toAmino(message: Snapshot): SnapshotAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunks = message.chunks; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunks = message.chunks === 0 ? undefined : message.chunks; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; @@ -461,7 +461,7 @@ export const Metadata = { if (message.chunkHashes) { obj.chunk_hashes = message.chunkHashes.map(e => base64FromBytes(e)); } else { - obj.chunk_hashes = []; + obj.chunk_hashes = message.chunkHashes; } return obj; }, @@ -734,7 +734,7 @@ export const SnapshotStoreItem = { }, toAmino(message: SnapshotStoreItem): SnapshotStoreItemAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: SnapshotStoreItemAminoMsg): SnapshotStoreItem { @@ -873,8 +873,8 @@ export const SnapshotIAVLItem = { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; - obj.version = message.version ? message.version.toString() : undefined; - obj.height = message.height; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; + obj.height = message.height === 0 ? undefined : message.height; return obj; }, fromAminoMsg(object: SnapshotIAVLItemAminoMsg): SnapshotIAVLItem { @@ -979,8 +979,8 @@ export const SnapshotExtensionMeta = { }, toAmino(message: SnapshotExtensionMeta): SnapshotExtensionMetaAmino { const obj: any = {}; - obj.name = message.name; - obj.format = message.format; + obj.name = message.name === "" ? undefined : message.name; + obj.format = message.format === 0 ? undefined : message.format; return obj; }, fromAminoMsg(object: SnapshotExtensionMetaAminoMsg): SnapshotExtensionMeta { @@ -1275,7 +1275,7 @@ export const SnapshotSchema = { if (message.keys) { obj.keys = message.keys.map(e => base64FromBytes(e)); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, 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 fb2acf27c3..53302307f1 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 @@ -185,11 +185,11 @@ export const CommitInfo = { }, toAmino(message: CommitInfo): CommitInfoAmino { const obj: any = {}; - obj.version = message.version ? message.version.toString() : undefined; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; if (message.storeInfos) { obj.store_infos = message.storeInfos.map(e => e ? StoreInfo.toAmino(e) : undefined); } else { - obj.store_infos = []; + obj.store_infos = message.storeInfos; } return obj; }, @@ -297,7 +297,7 @@ export const StoreInfo = { }, toAmino(message: StoreInfo): StoreInfoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.commit_id = message.commitId ? CommitID.toAmino(message.commitId) : undefined; return obj; }, @@ -405,7 +405,7 @@ export const CommitID = { }, toAmino(message: CommitID): CommitIDAmino { const obj: any = {}; - obj.version = message.version ? message.version.toString() : undefined; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; return obj; }, 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 da789df45b..a8165a08e2 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/store/v1beta1/listening.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/store/v1beta1/listening.ts @@ -162,8 +162,8 @@ export const StoreKVPair = { }, toAmino(message: StoreKVPair): StoreKVPairAmino { const obj: any = {}; - obj.store_key = message.storeKey; - obj.delete = message.delete; + obj.store_key = message.storeKey === "" ? undefined : message.storeKey; + obj.delete = message.delete === false ? undefined : message.delete; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; return obj; 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 3b72e0d5c1..aabbce302b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/tendermint/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/tendermint/v1beta1/query.ts @@ -448,7 +448,7 @@ export const GetValidatorSetByHeightRequest = { }, toAmino(message: GetValidatorSetByHeightRequest): GetValidatorSetByHeightRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -579,11 +579,11 @@ export const GetValidatorSetByHeightResponse = { }, toAmino(message: GetValidatorSetByHeightResponse): GetValidatorSetByHeightResponseAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -807,11 +807,11 @@ export const GetLatestValidatorSetResponse = { }, toAmino(message: GetLatestValidatorSetResponse): GetLatestValidatorSetResponseAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -954,10 +954,10 @@ export const Validator = { }, toAmino(message: Validator): ValidatorAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority !== BigInt(0) ? message.proposerPriority.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -1049,7 +1049,7 @@ export const GetBlockByHeightRequest = { }, toAmino(message: GetBlockByHeightRequest): GetBlockByHeightRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: GetBlockByHeightRequestAminoMsg): GetBlockByHeightRequest { @@ -1503,7 +1503,7 @@ export const GetSyncingResponse = { }, toAmino(message: GetSyncingResponse): GetSyncingResponseAmino { const obj: any = {}; - obj.syncing = message.syncing; + obj.syncing = message.syncing === false ? undefined : message.syncing; return obj; }, fromAminoMsg(object: GetSyncingResponseAminoMsg): GetSyncingResponse { @@ -1886,18 +1886,18 @@ export const VersionInfo = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.app_name = message.appName === "" ? undefined : message.appName; + obj.version = message.version === "" ? undefined : message.version; + obj.git_commit = message.gitCommit === "" ? undefined : message.gitCommit; + obj.build_tags = message.buildTags === "" ? undefined : message.buildTags; + obj.go_version = message.goVersion === "" ? undefined : message.goVersion; if (message.buildDeps) { obj.build_deps = message.buildDeps.map(e => e ? Module.toAmino(e) : undefined); } else { - obj.build_deps = []; + obj.build_deps = message.buildDeps; } - obj.cosmos_sdk_version = message.cosmosSdkVersion; + obj.cosmos_sdk_version = message.cosmosSdkVersion === "" ? undefined : message.cosmosSdkVersion; return obj; }, fromAminoMsg(object: VersionInfoAminoMsg): VersionInfo { @@ -2017,9 +2017,9 @@ export const Module = { }, toAmino(message: Module): ModuleAmino { const obj: any = {}; - obj.path = message.path; - obj.version = message.version; - obj.sum = message.sum; + obj.path = message.path === "" ? undefined : message.path; + obj.version = message.version === "" ? undefined : message.version; + obj.sum = message.sum === "" ? undefined : message.sum; return obj; }, fromAminoMsg(object: ModuleAminoMsg): Module { diff --git a/__fixtures__/v-next/outputv2/cosmos/base/v1beta1/coin.ts b/__fixtures__/v-next/outputv2/cosmos/base/v1beta1/coin.ts index de30e2f8f5..697e1f0067 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/v1beta1/coin.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/v1beta1/coin.ts @@ -197,8 +197,8 @@ export const Coin = { }, toAmino(message: Coin): CoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: CoinAminoMsg): Coin { @@ -303,8 +303,8 @@ export const DecCoin = { }, toAmino(message: DecCoin): DecCoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: DecCoinAminoMsg): DecCoin { @@ -394,7 +394,7 @@ export const IntProto = { }, toAmino(message: IntProto): IntProtoAmino { const obj: any = {}; - obj.int = message.int; + obj.int = message.int === "" ? undefined : message.int; return obj; }, fromAminoMsg(object: IntProtoAminoMsg): IntProto { @@ -484,7 +484,7 @@ export const DecProto = { }, toAmino(message: DecProto): DecProtoAmino { const obj: any = {}; - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; return obj; }, fromAminoMsg(object: DecProtoAminoMsg): DecProto { diff --git a/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/capability.ts b/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/capability.ts index c9e8671b68..bb4d6d7574 100644 --- a/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/capability.ts +++ b/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/capability.ts @@ -158,7 +158,7 @@ export const Capability = { }, toAmino(message: Capability): CapabilityAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; return obj; }, fromAminoMsg(object: CapabilityAminoMsg): Capability { @@ -263,8 +263,8 @@ export const Owner = { }, toAmino(message: Owner): OwnerAmino { const obj: any = {}; - obj.module = message.module; - obj.name = message.name; + obj.module = message.module === "" ? undefined : message.module; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: OwnerAminoMsg): Owner { @@ -363,7 +363,7 @@ export const CapabilityOwners = { if (message.owners) { obj.owners = message.owners.map(e => e ? Owner.toAmino(e) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/genesis.ts index 8395ae5ce9..503243289b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/genesis.ts @@ -146,7 +146,7 @@ export const GenesisOwners = { }, toAmino(message: GenesisOwners): GenesisOwnersAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.index_owners = message.indexOwners ? CapabilityOwners.toAmino(message.indexOwners) : undefined; return obj; }, @@ -260,11 +260,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; if (message.owners) { obj.owners = message.owners.map(e => e ? GenesisOwners.toAmino(e) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/crisis/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/crisis/v1beta1/tx.ts index 0087200a98..ba83e22d96 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crisis/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crisis/v1beta1/tx.ts @@ -136,9 +136,9 @@ export const MsgVerifyInvariant = { }, toAmino(message: MsgVerifyInvariant): MsgVerifyInvariantAmino { const obj: any = {}; - obj.sender = message.sender; - obj.invariant_module_name = message.invariantModuleName; - obj.invariant_route = message.invariantRoute; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.invariant_module_name = message.invariantModuleName === "" ? undefined : message.invariantModuleName; + obj.invariant_route = message.invariantRoute === "" ? undefined : message.invariantRoute; return obj; }, fromAminoMsg(object: MsgVerifyInvariantAminoMsg): MsgVerifyInvariant { 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 da9a308424..50556b63b2 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crypto/hd/v1/hd.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crypto/hd/v1/hd.ts @@ -174,11 +174,11 @@ export const BIP44Params = { }, 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; + obj.purpose = message.purpose === 0 ? undefined : message.purpose; + obj.coin_type = message.coinType === 0 ? undefined : message.coinType; + obj.account = message.account === 0 ? undefined : message.account; + obj.change = message.change === false ? undefined : message.change; + obj.address_index = message.addressIndex === 0 ? undefined : message.addressIndex; return obj; }, fromAminoMsg(object: BIP44ParamsAminoMsg): BIP44Params { 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 75c596d83f..1a571b0777 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crypto/keyring/v1/record.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crypto/keyring/v1/record.ts @@ -280,7 +280,7 @@ export const Record = { }, toAmino(message: Record): RecordAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : 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; @@ -393,7 +393,7 @@ export const Record_Local = { 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; + obj.priv_key_type = message.privKeyType === "" ? undefined : message.privKeyType; return obj; }, fromAminoMsg(object: Record_LocalAminoMsg): Record_Local { diff --git a/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/keys.ts b/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/keys.ts index 390dbdd0ea..6a26baab97 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/keys.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/keys.ts @@ -123,11 +123,11 @@ export const LegacyAminoPubKey = { }, toAmino(message: LegacyAminoPubKey): LegacyAminoPubKeyAmino { const obj: any = {}; - obj.threshold = message.threshold; + obj.threshold = message.threshold === 0 ? undefined : message.threshold; if (message.publicKeys) { obj.public_keys = message.publicKeys.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.public_keys = []; + obj.public_keys = message.publicKeys; } return obj; }, 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 4cb8099005..dd2588a0c5 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/v1beta1/multisig.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/v1beta1/multisig.ts @@ -145,7 +145,7 @@ export const MultiSignature = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -251,7 +251,7 @@ export const CompactBitArray = { }, toAmino(message: CompactBitArray): CompactBitArrayAmino { const obj: any = {}; - obj.extra_bits_stored = message.extraBitsStored; + obj.extra_bits_stored = message.extraBitsStored === 0 ? undefined : message.extraBitsStored; obj.elems = message.elems ? base64FromBytes(message.elems) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/distribution.ts b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/distribution.ts index df025f3cd6..f4e28999fc 100644 --- a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/distribution.ts +++ b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/distribution.ts @@ -334,7 +334,7 @@ export interface DelegatorStartingInfoProtoMsg { export interface DelegatorStartingInfoAmino { previous_period?: string; stake?: string; - height?: string; + height: string; } export interface DelegatorStartingInfoAminoMsg { type: "cosmos-sdk/DelegatorStartingInfo"; @@ -536,10 +536,10 @@ export const Params = { }, 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; + obj.community_tax = message.communityTax === "" ? undefined : message.communityTax; + obj.base_proposer_reward = message.baseProposerReward === "" ? undefined : message.baseProposerReward; + obj.bonus_proposer_reward = message.bonusProposerReward === "" ? undefined : message.bonusProposerReward; + obj.withdraw_addr_enabled = message.withdrawAddrEnabled === false ? undefined : message.withdrawAddrEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -653,9 +653,9 @@ export const ValidatorHistoricalRewards = { if (message.cumulativeRewardRatio) { obj.cumulative_reward_ratio = message.cumulativeRewardRatio.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.cumulative_reward_ratio = []; + obj.cumulative_reward_ratio = message.cumulativeRewardRatio; } - obj.reference_count = message.referenceCount; + obj.reference_count = message.referenceCount === 0 ? undefined : message.referenceCount; return obj; }, fromAminoMsg(object: ValidatorHistoricalRewardsAminoMsg): ValidatorHistoricalRewards { @@ -771,9 +771,9 @@ export const ValidatorCurrentRewards = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } - obj.period = message.period ? message.period.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorCurrentRewardsAminoMsg): ValidatorCurrentRewards { @@ -872,7 +872,7 @@ export const ValidatorAccumulatedCommission = { if (message.commission) { obj.commission = message.commission.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.commission = []; + obj.commission = message.commission; } return obj; }, @@ -972,7 +972,7 @@ export const ValidatorOutstandingRewards = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, @@ -1080,8 +1080,8 @@ export const ValidatorSlashEvent = { }, toAmino(message: ValidatorSlashEvent): ValidatorSlashEventAmino { const obj: any = {}; - obj.validator_period = message.validatorPeriod ? message.validatorPeriod.toString() : undefined; - obj.fraction = message.fraction; + obj.validator_period = message.validatorPeriod !== BigInt(0) ? message.validatorPeriod.toString() : undefined; + obj.fraction = message.fraction === "" ? undefined : message.fraction; return obj; }, fromAminoMsg(object: ValidatorSlashEventAminoMsg): ValidatorSlashEvent { @@ -1180,7 +1180,7 @@ export const ValidatorSlashEvents = { if (message.validatorSlashEvents) { obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEvent.toAmino(e) : undefined); } else { - obj.validator_slash_events = []; + obj.validator_slash_events = message.validatorSlashEvents; } return obj; }, @@ -1280,7 +1280,7 @@ export const FeePool = { if (message.communityPool) { obj.community_pool = message.communityPool.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.community_pool = []; + obj.community_pool = message.communityPool; } return obj; }, @@ -1422,13 +1422,13 @@ export const CommunityPoolSpendProposal = { }, toAmino(message: CommunityPoolSpendProposal): CommunityPoolSpendProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.recipient = message.recipient; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.recipient = message.recipient === "" ? undefined : message.recipient; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -1553,9 +1553,9 @@ export const DelegatorStartingInfo = { }, 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; + obj.previous_period = message.previousPeriod !== BigInt(0) ? message.previousPeriod.toString() : undefined; + obj.stake = message.stake === "" ? undefined : message.stake; + obj.height = message.height ? message.height.toString() : "0"; return obj; }, fromAminoMsg(object: DelegatorStartingInfoAminoMsg): DelegatorStartingInfo { @@ -1666,11 +1666,11 @@ export const DelegationDelegatorReward = { }, toAmino(message: DelegationDelegatorReward): DelegationDelegatorRewardAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.reward) { obj.reward = message.reward.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.reward = []; + obj.reward = message.reward; } return obj; }, @@ -1821,11 +1821,11 @@ export const CommunityPoolSpendProposalWithDeposit = { }, 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; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.recipient = message.recipient === "" ? undefined : message.recipient; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.deposit = message.deposit === "" ? undefined : message.deposit; return obj; }, fromAminoMsg(object: CommunityPoolSpendProposalWithDepositAminoMsg): CommunityPoolSpendProposalWithDeposit { diff --git a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/genesis.ts index fbef30da58..6cda0ae837 100644 --- a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/genesis.ts @@ -389,8 +389,8 @@ export const DelegatorWithdrawInfo = { }, toAmino(message: DelegatorWithdrawInfo): DelegatorWithdrawInfoAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.withdraw_address = message.withdrawAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: DelegatorWithdrawInfoAminoMsg): DelegatorWithdrawInfo { @@ -501,11 +501,11 @@ export const ValidatorOutstandingRewardsRecord = { }, toAmino(message: ValidatorOutstandingRewardsRecord): ValidatorOutstandingRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.outstandingRewards) { obj.outstanding_rewards = message.outstandingRewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.outstanding_rewards = []; + obj.outstanding_rewards = message.outstandingRewards; } return obj; }, @@ -613,7 +613,7 @@ export const ValidatorAccumulatedCommissionRecord = { }, toAmino(message: ValidatorAccumulatedCommissionRecord): ValidatorAccumulatedCommissionRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.accumulated = message.accumulated ? ValidatorAccumulatedCommission.toAmino(message.accumulated) : undefined; return obj; }, @@ -738,8 +738,8 @@ export const ValidatorHistoricalRewardsRecord = { }, toAmino(message: ValidatorHistoricalRewardsRecord): ValidatorHistoricalRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.period = message.period ? message.period.toString() : undefined; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; obj.rewards = message.rewards ? ValidatorHistoricalRewards.toAmino(message.rewards) : undefined; return obj; }, @@ -847,7 +847,7 @@ export const ValidatorCurrentRewardsRecord = { }, toAmino(message: ValidatorCurrentRewardsRecord): ValidatorCurrentRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.rewards = message.rewards ? ValidatorCurrentRewards.toAmino(message.rewards) : undefined; return obj; }, @@ -970,8 +970,8 @@ export const DelegatorStartingInfoRecord = { }, toAmino(message: DelegatorStartingInfoRecord): DelegatorStartingInfoRecordAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.starting_info = message.startingInfo ? DelegatorStartingInfo.toAmino(message.startingInfo) : undefined; return obj; }, @@ -1113,9 +1113,9 @@ export const ValidatorSlashEventRecord = { }, 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_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; obj.validator_slash_event = message.validatorSlashEvent ? ValidatorSlashEvent.toAmino(message.validatorSlashEvent) : undefined; return obj; }, @@ -1392,38 +1392,38 @@ export const GenesisState = { if (message.delegatorWithdrawInfos) { obj.delegator_withdraw_infos = message.delegatorWithdrawInfos.map(e => e ? DelegatorWithdrawInfo.toAmino(e) : undefined); } else { - obj.delegator_withdraw_infos = []; + obj.delegator_withdraw_infos = message.delegatorWithdrawInfos; } - obj.previous_proposer = message.previousProposer; + obj.previous_proposer = message.previousProposer === "" ? undefined : message.previousProposer; if (message.outstandingRewards) { obj.outstanding_rewards = message.outstandingRewards.map(e => e ? ValidatorOutstandingRewardsRecord.toAmino(e) : undefined); } else { - obj.outstanding_rewards = []; + obj.outstanding_rewards = message.outstandingRewards; } if (message.validatorAccumulatedCommissions) { obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions.map(e => e ? ValidatorAccumulatedCommissionRecord.toAmino(e) : undefined); } else { - obj.validator_accumulated_commissions = []; + obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions; } if (message.validatorHistoricalRewards) { obj.validator_historical_rewards = message.validatorHistoricalRewards.map(e => e ? ValidatorHistoricalRewardsRecord.toAmino(e) : undefined); } else { - obj.validator_historical_rewards = []; + obj.validator_historical_rewards = message.validatorHistoricalRewards; } if (message.validatorCurrentRewards) { obj.validator_current_rewards = message.validatorCurrentRewards.map(e => e ? ValidatorCurrentRewardsRecord.toAmino(e) : undefined); } else { - obj.validator_current_rewards = []; + obj.validator_current_rewards = message.validatorCurrentRewards; } if (message.delegatorStartingInfos) { obj.delegator_starting_infos = message.delegatorStartingInfos.map(e => e ? DelegatorStartingInfoRecord.toAmino(e) : undefined); } else { - obj.delegator_starting_infos = []; + obj.delegator_starting_infos = message.delegatorStartingInfos; } if (message.validatorSlashEvents) { obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEventRecord.toAmino(e) : undefined); } else { - obj.validator_slash_events = []; + obj.validator_slash_events = message.validatorSlashEvents; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/query.ts index ad631439d4..57c7fbbbaf 100644 --- a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/query.ts @@ -785,7 +785,7 @@ export const QueryValidatorOutstandingRewardsRequest = { }, toAmino(message: QueryValidatorOutstandingRewardsRequest): QueryValidatorOutstandingRewardsRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryValidatorOutstandingRewardsRequestAminoMsg): QueryValidatorOutstandingRewardsRequest { @@ -967,7 +967,7 @@ export const QueryValidatorCommissionRequest = { }, toAmino(message: QueryValidatorCommissionRequest): QueryValidatorCommissionRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryValidatorCommissionRequestAminoMsg): QueryValidatorCommissionRequest { @@ -1200,9 +1200,9 @@ export const QueryValidatorSlashesRequest = { }, 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.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.starting_height = message.startingHeight !== BigInt(0) ? message.startingHeight.toString() : undefined; + obj.ending_height = message.endingHeight !== BigInt(0) ? message.endingHeight.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1319,7 +1319,7 @@ export const QueryValidatorSlashesResponse = { if (message.slashes) { obj.slashes = message.slashes.map(e => e ? ValidatorSlashEvent.toAmino(e) : undefined); } else { - obj.slashes = []; + obj.slashes = message.slashes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1426,8 +1426,8 @@ export const QueryDelegationRewardsRequest = { }, toAmino(message: QueryDelegationRewardsRequest): QueryDelegationRewardsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryDelegationRewardsRequestAminoMsg): QueryDelegationRewardsRequest { @@ -1526,7 +1526,7 @@ export const QueryDelegationRewardsResponse = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, @@ -1617,7 +1617,7 @@ export const QueryDelegationTotalRewardsRequest = { }, toAmino(message: QueryDelegationTotalRewardsRequest): QueryDelegationTotalRewardsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegationTotalRewardsRequestAminoMsg): QueryDelegationTotalRewardsRequest { @@ -1737,12 +1737,12 @@ export const QueryDelegationTotalRewardsResponse = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DelegationDelegatorReward.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } if (message.total) { obj.total = message.total.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.total = []; + obj.total = message.total; } return obj; }, @@ -1833,7 +1833,7 @@ export const QueryDelegatorValidatorsRequest = { }, toAmino(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegatorValidatorsRequestAminoMsg): QueryDelegatorValidatorsRequest { @@ -1932,7 +1932,7 @@ export const QueryDelegatorValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e); } else { - obj.validators = []; + obj.validators = message.validators; } return obj; }, @@ -2023,7 +2023,7 @@ export const QueryDelegatorWithdrawAddressRequest = { }, toAmino(message: QueryDelegatorWithdrawAddressRequest): QueryDelegatorWithdrawAddressRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegatorWithdrawAddressRequestAminoMsg): QueryDelegatorWithdrawAddressRequest { @@ -2113,7 +2113,7 @@ export const QueryDelegatorWithdrawAddressResponse = { }, toAmino(message: QueryDelegatorWithdrawAddressResponse): QueryDelegatorWithdrawAddressResponseAmino { const obj: any = {}; - obj.withdraw_address = message.withdrawAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: QueryDelegatorWithdrawAddressResponseAminoMsg): QueryDelegatorWithdrawAddressResponse { @@ -2284,7 +2284,7 @@ export const QueryCommunityPoolResponse = { if (message.pool) { obj.pool = message.pool.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.pool = []; + obj.pool = message.pool; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/tx.ts index f166774336..82d7617805 100644 --- a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/tx.ts @@ -275,8 +275,8 @@ export const MsgSetWithdrawAddress = { }, toAmino(message: MsgSetWithdrawAddress): MsgSetWithdrawAddressAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.withdraw_address = message.withdrawAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: MsgSetWithdrawAddressAminoMsg): MsgSetWithdrawAddress { @@ -453,8 +453,8 @@ export const MsgWithdrawDelegatorReward = { }, toAmino(message: MsgWithdrawDelegatorReward): MsgWithdrawDelegatorRewardAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: MsgWithdrawDelegatorRewardAminoMsg): MsgWithdrawDelegatorReward { @@ -553,7 +553,7 @@ export const MsgWithdrawDelegatorRewardResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -644,7 +644,7 @@ export const MsgWithdrawValidatorCommission = { }, toAmino(message: MsgWithdrawValidatorCommission): MsgWithdrawValidatorCommissionAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: MsgWithdrawValidatorCommissionAminoMsg): MsgWithdrawValidatorCommission { @@ -743,7 +743,7 @@ export const MsgWithdrawValidatorCommissionResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -858,9 +858,9 @@ export const MsgFundCommunityPool = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.depositor = message.depositor; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: MsgFundCommunityPoolAminoMsg): MsgFundCommunityPool { diff --git a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/evidence.ts b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/evidence.ts index 42c079fcca..8b75ef8d43 100644 --- a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/evidence.ts +++ b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/evidence.ts @@ -154,10 +154,10 @@ export const Equivocation = { }, toAmino(message: Equivocation): EquivocationAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.power = message.power ? message.power.toString() : undefined; - obj.consensus_address = message.consensusAddress; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; + obj.consensus_address = message.consensusAddress === "" ? undefined : message.consensusAddress; return obj; }, fromAminoMsg(object: EquivocationAminoMsg): Equivocation { diff --git a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/genesis.ts index 2bbef64430..09d7cfa980 100644 --- a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/genesis.ts @@ -98,7 +98,7 @@ export const GenesisState = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/query.ts index e7fc3e25b9..9911498135 100644 --- a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/query.ts @@ -479,7 +479,7 @@ export const QueryAllEvidenceResponse = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts index 80c4416786..13ec8095dd 100644 --- a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts @@ -141,7 +141,7 @@ export const MsgSubmitEvidence = { }, toAmino(message: MsgSubmitEvidence): MsgSubmitEvidenceAmino { const obj: any = {}; - obj.submitter = message.submitter; + obj.submitter = message.submitter === "" ? undefined : message.submitter; obj.evidence = message.evidence ? Evidence_ToAmino((message.evidence as Any)) : undefined; return obj; }, @@ -265,7 +265,7 @@ export const Evidence_InterfaceDecoder = (input: BinaryReader | Uint8Array): Any return data; } }; -export const Evidence_FromAmino = (content: AnyAmino) => { +export const Evidence_FromAmino = (content: AnyAmino): Any => { return Any.fromAmino(content); }; export const Evidence_ToAmino = (content: Any) => { diff --git a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts index 43ccad0a87..5b2298644c 100644 --- a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts +++ b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts @@ -281,7 +281,7 @@ export const BasicAllowance = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -455,12 +455,12 @@ export const PeriodicAllowance = { if (message.periodSpendLimit) { obj.period_spend_limit = message.periodSpendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.period_spend_limit = []; + obj.period_spend_limit = message.periodSpendLimit; } if (message.periodCanSpend) { obj.period_can_spend = message.periodCanSpend.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.period_can_spend = []; + obj.period_can_spend = message.periodCanSpend; } obj.period_reset = message.periodReset ? Timestamp.toAmino(toTimestamp(message.periodReset)) : undefined; return obj; @@ -580,7 +580,7 @@ export const AllowedMsgAllowance = { if (message.allowedMessages) { obj.allowed_messages = message.allowedMessages.map(e => e); } else { - obj.allowed_messages = []; + obj.allowed_messages = message.allowedMessages; } return obj; }, @@ -703,8 +703,8 @@ export const Grant = { }, toAmino(message: Grant): GrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.allowance = message.allowance ? FeeAllowanceI_ToAmino((message.allowance as Any)) : undefined; return obj; }, @@ -744,7 +744,7 @@ export const FeeAllowanceI_InterfaceDecoder = (input: BinaryReader | Uint8Array) return data; } }; -export const FeeAllowanceI_FromAmino = (content: AnyAmino) => { +export const FeeAllowanceI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/BasicAllowance": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/genesis.ts index 12b23b7660..2d2419cfdb 100644 --- a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/genesis.ts @@ -96,7 +96,7 @@ export const GenesisState = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/query.ts index 5f471e3aee..427f5f6676 100644 --- a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/query.ts @@ -236,8 +236,8 @@ export const QueryAllowanceRequest = { }, toAmino(message: QueryAllowanceRequest): QueryAllowanceRequestAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; return obj; }, fromAminoMsg(object: QueryAllowanceRequestAminoMsg): QueryAllowanceRequest { @@ -436,7 +436,7 @@ export const QueryAllowancesRequest = { }, toAmino(message: QueryAllowancesRequest): QueryAllowancesRequestAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -553,7 +553,7 @@ export const QueryAllowancesResponse = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -662,7 +662,7 @@ export const QueryAllowancesByGranterRequest = { }, toAmino(message: QueryAllowancesByGranterRequest): QueryAllowancesByGranterRequestAmino { const obj: any = {}; - obj.granter = message.granter; + obj.granter = message.granter === "" ? undefined : message.granter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -779,7 +779,7 @@ export const QueryAllowancesByGranterResponse = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts index 9ca55919b6..2809ae3f6b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts @@ -199,8 +199,8 @@ export const MsgGrantAllowance = { }, toAmino(message: MsgGrantAllowance): MsgGrantAllowanceAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.allowance = message.allowance ? FeeAllowanceI_ToAmino((message.allowance as Any)) : undefined; return obj; }, @@ -378,8 +378,8 @@ export const MsgRevokeAllowance = { }, toAmino(message: MsgRevokeAllowance): MsgRevokeAllowanceAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; return obj; }, fromAminoMsg(object: MsgRevokeAllowanceAminoMsg): MsgRevokeAllowance { @@ -490,7 +490,7 @@ export const FeeAllowanceI_InterfaceDecoder = (input: BinaryReader | Uint8Array) return data; } }; -export const FeeAllowanceI_FromAmino = (content: AnyAmino) => { +export const FeeAllowanceI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/BasicAllowance": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv2/cosmos/genutil/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/genutil/v1beta1/genesis.ts index 0b307ccb46..228d368faa 100644 --- a/__fixtures__/v-next/outputv2/cosmos/genutil/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/genutil/v1beta1/genesis.ts @@ -13,7 +13,7 @@ export interface GenesisStateProtoMsg { /** GenesisState defines the raw genesis transaction in JSON. */ export interface GenesisStateAmino { /** gen_txs defines the genesis transactions. */ - gen_txs?: string[]; + gen_txs: string[]; } export interface GenesisStateAminoMsg { type: "cosmos-sdk/GenesisState"; @@ -97,7 +97,7 @@ export const GenesisState = { if (message.genTxs) { obj.gen_txs = message.genTxs.map(e => base64FromBytes(e)); } else { - obj.gen_txs = []; + obj.gen_txs = message.genTxs; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1/genesis.ts index 18e0531d06..9af249949e 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1/genesis.ts @@ -235,21 +235,21 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + obj.starting_proposal_id = message.startingProposalId !== BigInt(0) ? message.startingProposalId.toString() : undefined; if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1/gov.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1/gov.ts index 0abce38607..40b690db14 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1/gov.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1/gov.ts @@ -495,7 +495,7 @@ export const WeightedVoteOption = { fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { const message = createBaseWeightedVoteOption(); if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.weight !== undefined && object.weight !== null) { message.weight = object.weight; @@ -504,8 +504,8 @@ export const WeightedVoteOption = { }, toAmino(message: WeightedVoteOption): WeightedVoteOptionAmino { const obj: any = {}; - obj.option = message.option; - obj.weight = message.weight; + obj.option = message.option === 0 ? undefined : message.option; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption { @@ -633,12 +633,12 @@ export const Deposit = { }, toAmino(message: Deposit): DepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -855,7 +855,7 @@ export const Proposal = { } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -880,24 +880,24 @@ export const Proposal = { }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.status = message.status; + obj.status = message.status === 0 ? undefined : message.status; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined; if (message.totalDeposit) { obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_deposit = []; + obj.total_deposit = message.totalDeposit; } obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined; obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined; - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: ProposalAminoMsg): Proposal { @@ -1032,10 +1032,10 @@ export const TallyResult = { }, 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; + obj.yes_count = message.yesCount === "" ? undefined : message.yesCount; + obj.abstain_count = message.abstainCount === "" ? undefined : message.abstainCount; + obj.no_count = message.noCount === "" ? undefined : message.noCount; + obj.no_with_veto_count = message.noWithVetoCount === "" ? undefined : message.noWithVetoCount; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -1178,14 +1178,14 @@ export const Vote = { }, toAmino(message: Vote): VoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: VoteAminoMsg): Vote { @@ -1301,7 +1301,7 @@ export const DepositParams = { if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; return obj; @@ -1515,9 +1515,9 @@ export const TallyParams = { }, toAmino(message: TallyParams): TallyParamsAmino { const obj: any = {}; - obj.quorum = message.quorum; - obj.threshold = message.threshold; - obj.veto_threshold = message.vetoThreshold; + obj.quorum = message.quorum === "" ? undefined : message.quorum; + obj.threshold = message.threshold === "" ? undefined : message.threshold; + obj.veto_threshold = message.vetoThreshold === "" ? undefined : message.vetoThreshold; return obj; }, fromAminoMsg(object: TallyParamsAminoMsg): TallyParams { diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1/query.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1/query.ts index 88a06bf67a..331e754a63 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1/query.ts @@ -491,7 +491,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -705,7 +705,7 @@ export const QueryProposalsRequest = { fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { const message = createBaseQueryProposalsRequest(); if (object.proposal_status !== undefined && object.proposal_status !== null) { - message.proposalStatus = proposalStatusFromJSON(object.proposal_status); + message.proposalStatus = object.proposal_status; } if (object.voter !== undefined && object.voter !== null) { message.voter = object.voter; @@ -720,9 +720,9 @@ export const QueryProposalsRequest = { }, toAmino(message: QueryProposalsRequest): QueryProposalsRequestAmino { const obj: any = {}; - obj.proposal_status = message.proposalStatus; - obj.voter = message.voter; - obj.depositor = message.depositor; + obj.proposal_status = message.proposalStatus === 0 ? undefined : message.proposalStatus; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.depositor = message.depositor === "" ? undefined : message.depositor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -839,7 +839,7 @@ export const QueryProposalsResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -948,8 +948,8 @@ export const QueryVoteRequest = { }, toAmino(message: QueryVoteRequest): QueryVoteRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest { @@ -1150,7 +1150,7 @@ export const QueryVotesRequest = { }, toAmino(message: QueryVotesRequest): QueryVotesRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1267,7 +1267,7 @@ export const QueryVotesResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1359,7 +1359,7 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.params_type = message.paramsType; + obj.params_type = message.paramsType === "" ? undefined : message.paramsType; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -1594,8 +1594,8 @@ export const QueryDepositRequest = { }, toAmino(message: QueryDepositRequest): QueryDepositRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest { @@ -1796,7 +1796,7 @@ export const QueryDepositsRequest = { }, toAmino(message: QueryDepositsRequest): QueryDepositsRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1913,7 +1913,7 @@ export const QueryDepositsResponse = { if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2007,7 +2007,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts index e6bece5fa0..37dbeabdfa 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts @@ -138,7 +138,7 @@ export interface MsgVoteProtoMsg { } /** MsgVote defines a message to cast a vote. */ export interface MsgVoteAmino { - proposal_id?: string; + proposal_id: string; voter?: string; option?: VoteOption; metadata?: string; @@ -181,7 +181,7 @@ export interface MsgVoteWeightedProtoMsg { } /** MsgVoteWeighted defines a message to cast a vote. */ export interface MsgVoteWeightedAmino { - proposal_id?: string; + proposal_id: string; voter?: string; options?: WeightedVoteOptionAmino[]; metadata?: string; @@ -223,7 +223,7 @@ export interface MsgDepositProtoMsg { } /** MsgDeposit defines a message to submit a deposit to an existing proposal. */ export interface MsgDepositAmino { - proposal_id?: string; + proposal_id: string; depositor?: string; amount?: CoinAmino[]; } @@ -376,15 +376,15 @@ export const MsgSubmitProposal = { if (message.messages) { obj.messages = message.messages.map(e => e ? ProposalContentI_ToAmino((e as Any)) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; - obj.metadata = message.metadata; + obj.proposer = message.proposer === "" ? undefined : message.proposer; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -476,7 +476,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -584,7 +584,7 @@ export const MsgExecLegacyContent = { toAmino(message: MsgExecLegacyContent): MsgExecLegacyContentAmino { const obj: any = {}; obj.content = message.content ? ProposalContentI_ToAmino((message.content as Any)) : undefined; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; return obj; }, fromAminoMsg(object: MsgExecLegacyContentAminoMsg): MsgExecLegacyContent { @@ -784,7 +784,7 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; @@ -793,10 +793,10 @@ export const MsgVote = { }, 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.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -1011,14 +1011,14 @@ export const MsgVoteWeighted = { }, toAmino(message: MsgVoteWeighted): MsgVoteWeightedAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgVoteWeightedAminoMsg): MsgVoteWeighted { @@ -1218,12 +1218,12 @@ export const MsgDeposit = { }, toAmino(message: MsgDeposit): MsgDepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -1343,7 +1343,7 @@ export const ProposalContentI_InterfaceDecoder = (input: BinaryReader | Uint8Arr return data; } }; -export const ProposalContentI_FromAmino = (content: AnyAmino) => { +export const ProposalContentI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/v1/TextProposal": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/genesis.ts index 512f0b515e..d23c90d59d 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/genesis.ts @@ -235,21 +235,21 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + obj.starting_proposal_id = message.startingProposalId !== BigInt(0) ? message.startingProposalId.toString() : undefined; if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts index c7afa8ad25..74e27922a4 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts @@ -360,7 +360,7 @@ export interface VoteProtoMsg { * A Vote consists of a proposal ID, the voter, and the vote option. */ export interface VoteAmino { - proposal_id?: string; + proposal_id: string; voter?: string; /** * Deprecated: Prefer to use `options` instead. This field is set in queries @@ -557,7 +557,7 @@ export const WeightedVoteOption = { fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { const message = createBaseWeightedVoteOption(); if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.weight !== undefined && object.weight !== null) { message.weight = object.weight; @@ -566,8 +566,8 @@ export const WeightedVoteOption = { }, toAmino(message: WeightedVoteOption): WeightedVoteOptionAmino { const obj: any = {}; - obj.option = message.option; - obj.weight = message.weight; + obj.option = message.option === 0 ? undefined : message.option; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption { @@ -673,8 +673,8 @@ export const TextProposal = { }, toAmino(message: TextProposal): TextProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: TextProposalAminoMsg): TextProposal { @@ -802,12 +802,12 @@ export const Deposit = { }, toAmino(message: Deposit): DepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -1008,7 +1008,7 @@ export const Proposal = { message.content = ProposalContentI_FromAmino(object.content); } if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -1030,16 +1030,16 @@ export const Proposal = { }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.content = message.content ? ProposalContentI_ToAmino((message.content as Any)) : undefined; - obj.status = message.status; + obj.status = message.status === 0 ? undefined : message.status; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined; if (message.totalDeposit) { obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_deposit = []; + obj.total_deposit = message.totalDeposit; } obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined; obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined; @@ -1177,10 +1177,10 @@ export const TallyResult = { }, 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; + obj.yes = message.yes === "" ? undefined : message.yes; + obj.abstain = message.abstain === "" ? undefined : message.abstain; + obj.no = message.no === "" ? undefined : message.no; + obj.no_with_veto = message.noWithVeto === "" ? undefined : message.noWithVeto; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -1316,20 +1316,20 @@ export const Vote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } message.options = object.options?.map(e => WeightedVoteOption.fromAmino(e)) || []; return message; }, 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.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -1446,7 +1446,7 @@ export const DepositParams = { if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; return obj; @@ -1709,7 +1709,7 @@ export const ProposalContentI_InterfaceDecoder = (input: BinaryReader | Uint8Arr return data; } }; -export const ProposalContentI_FromAmino = (content: AnyAmino) => { +export const ProposalContentI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/TextProposal": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/query.ts index c77052b4cf..0f82a35852 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/query.ts @@ -491,7 +491,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -705,7 +705,7 @@ export const QueryProposalsRequest = { fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { const message = createBaseQueryProposalsRequest(); if (object.proposal_status !== undefined && object.proposal_status !== null) { - message.proposalStatus = proposalStatusFromJSON(object.proposal_status); + message.proposalStatus = object.proposal_status; } if (object.voter !== undefined && object.voter !== null) { message.voter = object.voter; @@ -720,9 +720,9 @@ export const QueryProposalsRequest = { }, toAmino(message: QueryProposalsRequest): QueryProposalsRequestAmino { const obj: any = {}; - obj.proposal_status = message.proposalStatus; - obj.voter = message.voter; - obj.depositor = message.depositor; + obj.proposal_status = message.proposalStatus === 0 ? undefined : message.proposalStatus; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.depositor = message.depositor === "" ? undefined : message.depositor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -839,7 +839,7 @@ export const QueryProposalsResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -948,8 +948,8 @@ export const QueryVoteRequest = { }, toAmino(message: QueryVoteRequest): QueryVoteRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest { @@ -1150,7 +1150,7 @@ export const QueryVotesRequest = { }, toAmino(message: QueryVotesRequest): QueryVotesRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1267,7 +1267,7 @@ export const QueryVotesResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1359,7 +1359,7 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.params_type = message.paramsType; + obj.params_type = message.paramsType === "" ? undefined : message.paramsType; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -1594,8 +1594,8 @@ export const QueryDepositRequest = { }, toAmino(message: QueryDepositRequest): QueryDepositRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest { @@ -1796,7 +1796,7 @@ export const QueryDepositsRequest = { }, toAmino(message: QueryDepositsRequest): QueryDepositsRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1913,7 +1913,7 @@ export const QueryDepositsResponse = { if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2007,7 +2007,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts index 1fcf5dcd45..dc90529591 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts @@ -56,7 +56,7 @@ export interface MsgSubmitProposalResponseProtoMsg { } /** MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. */ export interface MsgSubmitProposalResponseAmino { - proposal_id?: string; + proposal_id: string; } export interface MsgSubmitProposalResponseAminoMsg { type: "cosmos-sdk/MsgSubmitProposalResponse"; @@ -126,7 +126,7 @@ export interface MsgVoteWeightedProtoMsg { * Since: cosmos-sdk 0.43 */ export interface MsgVoteWeightedAmino { - proposal_id?: string; + proposal_id: string; voter?: string; options?: WeightedVoteOptionAmino[]; } @@ -182,7 +182,7 @@ export interface MsgDepositProtoMsg { } /** MsgDeposit defines a message to submit a deposit to an existing proposal. */ export interface MsgDepositAmino { - proposal_id?: string; + proposal_id: string; depositor?: string; amount?: CoinAmino[]; } @@ -317,9 +317,9 @@ export const MsgSubmitProposal = { if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; + obj.proposer = message.proposer === "" ? undefined : message.proposer; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -411,7 +411,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -527,15 +527,15 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } return message; }, 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.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -735,12 +735,12 @@ export const MsgVoteWeighted = { }, toAmino(message: MsgVoteWeighted): MsgVoteWeightedAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -941,12 +941,12 @@ export const MsgDeposit = { }, toAmino(message: MsgDeposit): MsgDepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -1066,7 +1066,7 @@ export const ProposalContentI_InterfaceDecoder = (input: BinaryReader | Uint8Arr return data; } }; -export const ProposalContentI_FromAmino = (content: AnyAmino) => { +export const ProposalContentI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/TextProposal": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/events.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/events.ts index 58aaafcee5..410885d358 100644 --- a/__fixtures__/v-next/outputv2/cosmos/group/v1/events.ts +++ b/__fixtures__/v-next/outputv2/cosmos/group/v1/events.ts @@ -277,7 +277,7 @@ export const EventCreateGroup = { }, toAmino(message: EventCreateGroup): EventCreateGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: EventCreateGroupAminoMsg): EventCreateGroup { @@ -369,7 +369,7 @@ export const EventUpdateGroup = { }, toAmino(message: EventUpdateGroup): EventUpdateGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: EventUpdateGroupAminoMsg): EventUpdateGroup { @@ -459,7 +459,7 @@ export const EventCreateGroupPolicy = { }, toAmino(message: EventCreateGroupPolicy): EventCreateGroupPolicyAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventCreateGroupPolicyAminoMsg): EventCreateGroupPolicy { @@ -549,7 +549,7 @@ export const EventUpdateGroupPolicy = { }, toAmino(message: EventUpdateGroupPolicy): EventUpdateGroupPolicyAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventUpdateGroupPolicyAminoMsg): EventUpdateGroupPolicy { @@ -641,7 +641,7 @@ export const EventSubmitProposal = { }, toAmino(message: EventSubmitProposal): EventSubmitProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventSubmitProposalAminoMsg): EventSubmitProposal { @@ -733,7 +733,7 @@ export const EventWithdrawProposal = { }, toAmino(message: EventWithdrawProposal): EventWithdrawProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventWithdrawProposalAminoMsg): EventWithdrawProposal { @@ -825,7 +825,7 @@ export const EventVote = { }, toAmino(message: EventVote): EventVoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventVoteAminoMsg): EventVote { @@ -926,14 +926,14 @@ export const EventExec = { message.proposalId = BigInt(object.proposal_id); } if (object.result !== undefined && object.result !== null) { - message.result = proposalExecutorResultFromJSON(object.result); + message.result = object.result; } return message; }, toAmino(message: EventExec): EventExecAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.result = message.result; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.result = message.result === 0 ? undefined : message.result; return obj; }, fromAminoMsg(object: EventExecAminoMsg): EventExec { @@ -1040,8 +1040,8 @@ export const EventLeaveGroup = { }, toAmino(message: EventLeaveGroup): EventLeaveGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.address = message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventLeaveGroupAminoMsg): EventLeaveGroup { diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/genesis.ts index 090b9a1dc9..52d6a5b96f 100644 --- a/__fixtures__/v-next/outputv2/cosmos/group/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/group/v1/genesis.ts @@ -283,33 +283,33 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.group_seq = message.groupSeq ? message.groupSeq.toString() : undefined; + obj.group_seq = message.groupSeq !== BigInt(0) ? message.groupSeq.toString() : undefined; if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } if (message.groupMembers) { obj.group_members = message.groupMembers.map(e => e ? GroupMember.toAmino(e) : undefined); } else { - obj.group_members = []; + obj.group_members = message.groupMembers; } - obj.group_policy_seq = message.groupPolicySeq ? message.groupPolicySeq.toString() : undefined; + obj.group_policy_seq = message.groupPolicySeq !== BigInt(0) ? message.groupPolicySeq.toString() : undefined; if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } - obj.proposal_seq = message.proposalSeq ? message.proposalSeq.toString() : undefined; + obj.proposal_seq = message.proposalSeq !== BigInt(0) ? message.proposalSeq.toString() : undefined; if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/query.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/query.ts index db8be6f191..a799bade41 100644 --- a/__fixtures__/v-next/outputv2/cosmos/group/v1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/group/v1/query.ts @@ -727,7 +727,7 @@ export const QueryGroupInfoRequest = { }, toAmino(message: QueryGroupInfoRequest): QueryGroupInfoRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGroupInfoRequestAminoMsg): QueryGroupInfoRequest { @@ -909,7 +909,7 @@ export const QueryGroupPolicyInfoRequest = { }, toAmino(message: QueryGroupPolicyInfoRequest): QueryGroupPolicyInfoRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryGroupPolicyInfoRequestAminoMsg): QueryGroupPolicyInfoRequest { @@ -1110,7 +1110,7 @@ export const QueryGroupMembersRequest = { }, toAmino(message: QueryGroupMembersRequest): QueryGroupMembersRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1227,7 +1227,7 @@ export const QueryGroupMembersResponse = { if (message.members) { obj.members = message.members.map(e => e ? GroupMember.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1336,7 +1336,7 @@ export const QueryGroupsByAdminRequest = { }, toAmino(message: QueryGroupsByAdminRequest): QueryGroupsByAdminRequestAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1453,7 +1453,7 @@ export const QueryGroupsByAdminResponse = { if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1564,7 +1564,7 @@ export const QueryGroupPoliciesByGroupRequest = { }, toAmino(message: QueryGroupPoliciesByGroupRequest): QueryGroupPoliciesByGroupRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1681,7 +1681,7 @@ export const QueryGroupPoliciesByGroupResponse = { if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1790,7 +1790,7 @@ export const QueryGroupPoliciesByAdminRequest = { }, toAmino(message: QueryGroupPoliciesByAdminRequest): QueryGroupPoliciesByAdminRequestAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1907,7 +1907,7 @@ export const QueryGroupPoliciesByAdminResponse = { if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2001,7 +2001,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -2200,7 +2200,7 @@ export const QueryProposalsByGroupPolicyRequest = { }, toAmino(message: QueryProposalsByGroupPolicyRequest): QueryProposalsByGroupPolicyRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2317,7 +2317,7 @@ export const QueryProposalsByGroupPolicyResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2426,8 +2426,8 @@ export const QueryVoteByProposalVoterRequest = { }, toAmino(message: QueryVoteByProposalVoterRequest): QueryVoteByProposalVoterRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteByProposalVoterRequestAminoMsg): QueryVoteByProposalVoterRequest { @@ -2628,7 +2628,7 @@ export const QueryVotesByProposalRequest = { }, toAmino(message: QueryVotesByProposalRequest): QueryVotesByProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2745,7 +2745,7 @@ export const QueryVotesByProposalResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2854,7 +2854,7 @@ export const QueryVotesByVoterRequest = { }, toAmino(message: QueryVotesByVoterRequest): QueryVotesByVoterRequestAmino { const obj: any = {}; - obj.voter = message.voter; + obj.voter = message.voter === "" ? undefined : message.voter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2971,7 +2971,7 @@ export const QueryVotesByVoterResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -3080,7 +3080,7 @@ export const QueryGroupsByMemberRequest = { }, toAmino(message: QueryGroupsByMemberRequest): QueryGroupsByMemberRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -3197,7 +3197,7 @@ export const QueryGroupsByMemberResponse = { if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -3291,7 +3291,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts index 2c60838068..d5abbb8fd1 100644 --- a/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts @@ -888,13 +888,13 @@ export const MsgCreateGroup = { }, toAmino(message: MsgCreateGroup): MsgCreateGroupAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgCreateGroupAminoMsg): MsgCreateGroup { @@ -986,7 +986,7 @@ export const MsgCreateGroupResponse = { }, toAmino(message: MsgCreateGroupResponse): MsgCreateGroupResponseAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateGroupResponseAminoMsg): MsgCreateGroupResponse { @@ -1114,12 +1114,12 @@ export const MsgUpdateGroupMembers = { }, toAmino(message: MsgUpdateGroupMembers): MsgUpdateGroupMembersAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; if (message.memberUpdates) { obj.member_updates = message.memberUpdates.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.member_updates = []; + obj.member_updates = message.memberUpdates; } return obj; }, @@ -1314,9 +1314,9 @@ export const MsgUpdateGroupAdmin = { }, 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; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgUpdateGroupAdminAminoMsg): MsgUpdateGroupAdmin { @@ -1510,9 +1510,9 @@ export const MsgUpdateGroupMetadata = { }, toAmino(message: MsgUpdateGroupMetadata): MsgUpdateGroupMetadataAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgUpdateGroupMetadataAminoMsg): MsgUpdateGroupMetadata { @@ -1723,9 +1723,9 @@ export const MsgCreateGroupPolicy = { }, 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.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.decision_policy = message.decisionPolicy ? DecisionPolicy_ToAmino((message.decisionPolicy as Any)) : undefined; return obj; }, @@ -1816,7 +1816,7 @@ export const MsgCreateGroupPolicyResponse = { }, toAmino(message: MsgCreateGroupPolicyResponse): MsgCreateGroupPolicyResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: MsgCreateGroupPolicyResponseAminoMsg): MsgCreateGroupPolicyResponse { @@ -1936,9 +1936,9 @@ export const MsgUpdateGroupPolicyAdmin = { }, toAmino(message: MsgUpdateGroupPolicyAdmin): MsgUpdateGroupPolicyAdminAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; - obj.new_admin = message.newAdmin; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgUpdateGroupPolicyAdminAminoMsg): MsgUpdateGroupPolicyAdmin { @@ -2111,15 +2111,15 @@ export const MsgCreateGroupWithPolicy = { }, toAmino(message: MsgCreateGroupWithPolicy): MsgCreateGroupWithPolicyAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } - obj.group_metadata = message.groupMetadata; - obj.group_policy_metadata = message.groupPolicyMetadata; - obj.group_policy_as_admin = message.groupPolicyAsAdmin; + obj.group_metadata = message.groupMetadata === "" ? undefined : message.groupMetadata; + obj.group_policy_metadata = message.groupPolicyMetadata === "" ? undefined : message.groupPolicyMetadata; + obj.group_policy_as_admin = message.groupPolicyAsAdmin === false ? undefined : message.groupPolicyAsAdmin; obj.decision_policy = message.decisionPolicy ? DecisionPolicy_ToAmino((message.decisionPolicy as Any)) : undefined; return obj; }, @@ -2227,8 +2227,8 @@ export const MsgCreateGroupWithPolicyResponse = { }, toAmino(message: MsgCreateGroupWithPolicyResponse): MsgCreateGroupWithPolicyResponseAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.group_policy_address = message.groupPolicyAddress; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.group_policy_address = message.groupPolicyAddress === "" ? undefined : message.groupPolicyAddress; return obj; }, fromAminoMsg(object: MsgCreateGroupWithPolicyResponseAminoMsg): MsgCreateGroupWithPolicyResponse { @@ -2422,8 +2422,8 @@ export const MsgUpdateGroupPolicyDecisionPolicy = { }, toAmino(message: MsgUpdateGroupPolicyDecisionPolicy): MsgUpdateGroupPolicyDecisionPolicyAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; obj.decision_policy = message.decisionPolicy ? DecisionPolicy_ToAmino((message.decisionPolicy as Any)) : undefined; return obj; }, @@ -2616,9 +2616,9 @@ export const MsgUpdateGroupPolicyMetadata = { }, toAmino(message: MsgUpdateGroupPolicyMetadata): MsgUpdateGroupPolicyMetadataAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgUpdateGroupPolicyMetadataAminoMsg): MsgUpdateGroupPolicyMetadata { @@ -2846,25 +2846,25 @@ export const MsgSubmitProposal = { } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; if (object.exec !== undefined && object.exec !== null) { - message.exec = execFromJSON(object.exec); + message.exec = object.exec; } return message; }, toAmino(message: MsgSubmitProposal): MsgSubmitProposalAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.proposers) { obj.proposers = message.proposers.map(e => e); } else { - obj.proposers = []; + obj.proposers = message.proposers; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.exec = message.exec; + obj.exec = message.exec === 0 ? undefined : message.exec; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -2956,7 +2956,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -3063,8 +3063,8 @@ export const MsgWithdrawProposal = { }, toAmino(message: MsgWithdrawProposal): MsgWithdrawProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.address = message.address; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: MsgWithdrawProposalAminoMsg): MsgWithdrawProposal { @@ -3276,23 +3276,23 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; } if (object.exec !== undefined && object.exec !== null) { - message.exec = execFromJSON(object.exec); + message.exec = object.exec; } return message; }, 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; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.exec = message.exec === 0 ? undefined : message.exec; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -3471,8 +3471,8 @@ export const MsgExec = { }, toAmino(message: MsgExec): MsgExecAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.signer = message.signer; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgExecAminoMsg): MsgExec { @@ -3651,8 +3651,8 @@ export const MsgLeaveGroup = { }, toAmino(message: MsgLeaveGroup): MsgLeaveGroupAmino { const obj: any = {}; - obj.address = message.address; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLeaveGroupAminoMsg): MsgLeaveGroup { @@ -3761,7 +3761,7 @@ export const DecisionPolicy_InterfaceDecoder = (input: BinaryReader | Uint8Array return data; } }; -export const DecisionPolicy_FromAmino = (content: AnyAmino) => { +export const DecisionPolicy_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/ThresholdDecisionPolicy": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts index 46bc7d3566..11277cf566 100644 --- a/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts +++ b/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts @@ -871,9 +871,9 @@ export const Member = { }, toAmino(message: Member): MemberAmino { const obj: any = {}; - obj.address = message.address; - obj.weight = message.weight; - obj.metadata = message.metadata; + obj.address = message.address === "" ? undefined : message.address; + obj.weight = message.weight === "" ? undefined : message.weight; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.added_at = message.addedAt ? Timestamp.toAmino(toTimestamp(message.addedAt)) : undefined; return obj; }, @@ -973,7 +973,7 @@ export const Members = { if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } return obj; }, @@ -1082,7 +1082,7 @@ export const ThresholdDecisionPolicy = { }, toAmino(message: ThresholdDecisionPolicy): ThresholdDecisionPolicyAmino { const obj: any = {}; - obj.threshold = message.threshold; + obj.threshold = message.threshold === "" ? undefined : message.threshold; obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined; return obj; }, @@ -1191,7 +1191,7 @@ export const PercentageDecisionPolicy = { }, toAmino(message: PercentageDecisionPolicy): PercentageDecisionPolicyAmino { const obj: any = {}; - obj.percentage = message.percentage; + obj.percentage = message.percentage === "" ? undefined : message.percentage; obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined; return obj; }, @@ -1471,11 +1471,11 @@ export const GroupInfo = { }, 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.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; obj.created_at = message.createdAt ? Timestamp.toAmino(toTimestamp(message.createdAt)) : undefined; return obj; }, @@ -1585,7 +1585,7 @@ export const GroupMember = { }, toAmino(message: GroupMember): GroupMemberAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.member = message.member ? Member.toAmino(message.member) : undefined; return obj; }, @@ -1772,11 +1772,11 @@ export const GroupPolicyInfo = { }, 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.address = message.address === "" ? undefined : message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; obj.decision_policy = message.decisionPolicy ? DecisionPolicy_ToAmino((message.decisionPolicy as Any)) : undefined; obj.created_at = message.createdAt ? Timestamp.toAmino(toTimestamp(message.createdAt)) : undefined; return obj; @@ -2049,10 +2049,10 @@ export const Proposal = { message.groupPolicyVersion = BigInt(object.group_policy_version); } if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.result !== undefined && object.result !== null) { - message.result = proposalResultFromJSON(object.result); + message.result = object.result; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -2061,33 +2061,33 @@ export const Proposal = { message.votingPeriodEnd = fromTimestamp(Timestamp.fromAmino(object.voting_period_end)); } if (object.executor_result !== undefined && object.executor_result !== null) { - message.executorResult = proposalExecutorResultFromJSON(object.executor_result); + message.executorResult = object.executor_result; } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; return message; }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.address = message.address; - obj.metadata = message.metadata; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.metadata = message.metadata === "" ? undefined : message.metadata; if (message.proposers) { obj.proposers = message.proposers.map(e => e); } else { - obj.proposers = []; + obj.proposers = message.proposers; } obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; - 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.group_version = message.groupVersion !== BigInt(0) ? message.groupVersion.toString() : undefined; + obj.group_policy_version = message.groupPolicyVersion !== BigInt(0) ? message.groupPolicyVersion.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.result = message.result === 0 ? undefined : message.result; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.voting_period_end = message.votingPeriodEnd ? Timestamp.toAmino(toTimestamp(message.votingPeriodEnd)) : undefined; - obj.executor_result = message.executorResult; + obj.executor_result = message.executorResult === 0 ? undefined : message.executorResult; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } return obj; }, @@ -2223,10 +2223,10 @@ export const TallyResult = { }, 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; + obj.yes_count = message.yesCount === "" ? undefined : message.yesCount; + obj.abstain_count = message.abstainCount === "" ? undefined : message.abstainCount; + obj.no_count = message.noCount === "" ? undefined : message.noCount; + obj.no_with_veto_count = message.noWithVetoCount === "" ? undefined : message.noWithVetoCount; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -2366,7 +2366,7 @@ export const Vote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; @@ -2378,10 +2378,10 @@ export const Vote = { }, 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.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; return obj; }, @@ -2419,7 +2419,7 @@ export const DecisionPolicy_InterfaceDecoder = (input: BinaryReader | Uint8Array return data; } }; -export const DecisionPolicy_FromAmino = (content: AnyAmino) => { +export const DecisionPolicy_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/ThresholdDecisionPolicy": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/mint.ts index 33b03bc80b..6cdd2ae018 100644 --- a/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/mint.ts @@ -156,8 +156,8 @@ export const Minter = { }, toAmino(message: Minter): MinterAmino { const obj: any = {}; - obj.inflation = message.inflation; - obj.annual_provisions = message.annualProvisions; + obj.inflation = message.inflation === "" ? undefined : message.inflation; + obj.annual_provisions = message.annualProvisions === "" ? undefined : message.annualProvisions; return obj; }, fromAminoMsg(object: MinterAminoMsg): Minter { @@ -324,12 +324,12 @@ export const Params = { }, 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; + obj.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; + obj.inflation_rate_change = message.inflationRateChange === "" ? undefined : message.inflationRateChange; + obj.inflation_max = message.inflationMax === "" ? undefined : message.inflationMax; + obj.inflation_min = message.inflationMin === "" ? undefined : message.inflationMin; + obj.goal_bonded = message.goalBonded === "" ? undefined : message.goalBonded; + obj.blocks_per_year = message.blocksPerYear !== BigInt(0) ? message.blocksPerYear.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/event.ts b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/event.ts index ad4cc847c0..87a1bfcbb5 100644 --- a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/event.ts +++ b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/event.ts @@ -192,10 +192,10 @@ export const EventSend = { }, toAmino(message: EventSend): EventSendAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: EventSendAminoMsg): EventSend { @@ -315,9 +315,9 @@ export const EventMint = { }, toAmino(message: EventMint): EventMintAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: EventMintAminoMsg): EventMint { @@ -437,9 +437,9 @@ export const EventBurn = { }, toAmino(message: EventBurn): EventBurnAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: EventBurnAminoMsg): EventBurn { diff --git a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/genesis.ts index 3aee5524a8..1fd06cb742 100644 --- a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/genesis.ts @@ -149,12 +149,12 @@ export const GenesisState = { if (message.classes) { obj.classes = message.classes.map(e => e ? Class.toAmino(e) : undefined); } else { - obj.classes = []; + obj.classes = message.classes; } if (message.entries) { obj.entries = message.entries.map(e => e ? Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -266,11 +266,11 @@ export const Entry = { }, toAmino(message: Entry): EntryAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; if (message.nfts) { obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e) : undefined); } else { - obj.nfts = []; + obj.nfts = message.nfts; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/nft.ts b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/nft.ts index 16b1a21af2..0fbb3d6486 100644 --- a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/nft.ts +++ b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/nft.ts @@ -253,12 +253,12 @@ export const Class = { }, 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.id = message.id === "" ? undefined : message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.symbol = message.symbol === "" ? undefined : message.symbol; + obj.description = message.description === "" ? undefined : message.description; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; obj.data = message.data ? Any.toAmino(message.data) : undefined; return obj; }, @@ -411,10 +411,10 @@ export const NFT = { }, 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.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; obj.data = message.data ? Any.toAmino(message.data) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/query.ts index 9a1af41fae..7db0aa1f69 100644 --- a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/query.ts @@ -386,8 +386,8 @@ export const QueryBalanceRequest = { }, toAmino(message: QueryBalanceRequest): QueryBalanceRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest { @@ -479,7 +479,7 @@ export const QueryBalanceResponse = { }, toAmino(message: QueryBalanceResponse): QueryBalanceResponseAmino { const obj: any = {}; - obj.amount = message.amount ? message.amount.toString() : undefined; + obj.amount = message.amount !== BigInt(0) ? message.amount.toString() : undefined; return obj; }, fromAminoMsg(object: QueryBalanceResponseAminoMsg): QueryBalanceResponse { @@ -584,8 +584,8 @@ export const QueryOwnerRequest = { }, toAmino(message: QueryOwnerRequest): QueryOwnerRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: QueryOwnerRequestAminoMsg): QueryOwnerRequest { @@ -675,7 +675,7 @@ export const QueryOwnerResponse = { }, toAmino(message: QueryOwnerResponse): QueryOwnerResponseAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryOwnerResponseAminoMsg): QueryOwnerResponse { @@ -765,7 +765,7 @@ export const QuerySupplyRequest = { }, toAmino(message: QuerySupplyRequest): QuerySupplyRequestAmino { const obj: any = {}; - obj.class_id = message.classId; + obj.class_id = message.classId === "" ? undefined : message.classId; return obj; }, fromAminoMsg(object: QuerySupplyRequestAminoMsg): QuerySupplyRequest { @@ -857,7 +857,7 @@ export const QuerySupplyResponse = { }, toAmino(message: QuerySupplyResponse): QuerySupplyResponseAmino { const obj: any = {}; - obj.amount = message.amount ? message.amount.toString() : undefined; + obj.amount = message.amount !== BigInt(0) ? message.amount.toString() : undefined; return obj; }, fromAminoMsg(object: QuerySupplyResponseAminoMsg): QuerySupplyResponse { @@ -979,8 +979,8 @@ export const QueryNFTsRequest = { }, toAmino(message: QueryNFTsRequest): QueryNFTsRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.owner = message.owner === "" ? undefined : message.owner; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1097,7 +1097,7 @@ export const QueryNFTsResponse = { if (message.nfts) { obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e) : undefined); } else { - obj.nfts = []; + obj.nfts = message.nfts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1204,8 +1204,8 @@ export const QueryNFTRequest = { }, toAmino(message: QueryNFTRequest): QueryNFTRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: QueryNFTRequestAminoMsg): QueryNFTRequest { @@ -1387,7 +1387,7 @@ export const QueryClassRequest = { }, toAmino(message: QueryClassRequest): QueryClassRequestAmino { const obj: any = {}; - obj.class_id = message.classId; + obj.class_id = message.classId === "" ? undefined : message.classId; return obj; }, fromAminoMsg(object: QueryClassRequestAminoMsg): QueryClassRequest { @@ -1687,7 +1687,7 @@ export const QueryClassesResponse = { if (message.classes) { obj.classes = message.classes.map(e => e ? Class.toAmino(e) : undefined); } else { - obj.classes = []; + obj.classes = message.classes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/tx.ts index 4eb1049160..1131b9985d 100644 --- a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/tx.ts @@ -162,10 +162,10 @@ export const MsgSend = { }, toAmino(message: MsgSend): MsgSendAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: MsgSendAminoMsg): MsgSend { diff --git a/__fixtures__/v-next/outputv2/cosmos/orm/v1/orm.ts b/__fixtures__/v-next/outputv2/cosmos/orm/v1/orm.ts index 085006274d..881a0aa78d 100644 --- a/__fixtures__/v-next/outputv2/cosmos/orm/v1/orm.ts +++ b/__fixtures__/v-next/outputv2/cosmos/orm/v1/orm.ts @@ -335,9 +335,9 @@ export const TableDescriptor = { if (message.index) { obj.index = message.index.map(e => e ? SecondaryIndexDescriptor.toAmino(e) : undefined); } else { - obj.index = []; + obj.index = message.index; } - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: TableDescriptorAminoMsg): TableDescriptor { @@ -442,8 +442,8 @@ export const PrimaryKeyDescriptor = { }, toAmino(message: PrimaryKeyDescriptor): PrimaryKeyDescriptorAmino { const obj: any = {}; - obj.fields = message.fields; - obj.auto_increment = message.autoIncrement; + obj.fields = message.fields === "" ? undefined : message.fields; + obj.auto_increment = message.autoIncrement === false ? undefined : message.autoIncrement; return obj; }, fromAminoMsg(object: PrimaryKeyDescriptorAminoMsg): PrimaryKeyDescriptor { @@ -563,9 +563,9 @@ export const SecondaryIndexDescriptor = { }, toAmino(message: SecondaryIndexDescriptor): SecondaryIndexDescriptorAmino { const obj: any = {}; - obj.fields = message.fields; - obj.id = message.id; - obj.unique = message.unique; + obj.fields = message.fields === "" ? undefined : message.fields; + obj.id = message.id === 0 ? undefined : message.id; + obj.unique = message.unique === false ? undefined : message.unique; return obj; }, fromAminoMsg(object: SecondaryIndexDescriptorAminoMsg): SecondaryIndexDescriptor { @@ -655,7 +655,7 @@ export const SingletonDescriptor = { }, toAmino(message: SingletonDescriptor): SingletonDescriptorAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: SingletonDescriptorAminoMsg): SingletonDescriptor { diff --git a/__fixtures__/v-next/outputv2/cosmos/orm/v1alpha1/schema.ts b/__fixtures__/v-next/outputv2/cosmos/orm/v1alpha1/schema.ts index 4bdb684d76..b207e23c77 100644 --- a/__fixtures__/v-next/outputv2/cosmos/orm/v1alpha1/schema.ts +++ b/__fixtures__/v-next/outputv2/cosmos/orm/v1alpha1/schema.ts @@ -260,7 +260,7 @@ export const ModuleSchemaDescriptor = { if (message.schemaFile) { obj.schema_file = message.schemaFile.map(e => e ? ModuleSchemaDescriptor_FileEntry.toAmino(e) : undefined); } else { - obj.schema_file = []; + obj.schema_file = message.schemaFile; } obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; @@ -376,15 +376,15 @@ export const ModuleSchemaDescriptor_FileEntry = { message.protoFileName = object.proto_file_name; } if (object.storage_type !== undefined && object.storage_type !== null) { - message.storageType = storageTypeFromJSON(object.storage_type); + message.storageType = object.storage_type; } return message; }, toAmino(message: ModuleSchemaDescriptor_FileEntry): ModuleSchemaDescriptor_FileEntryAmino { const obj: any = {}; - obj.id = message.id; - obj.proto_file_name = message.protoFileName; - obj.storage_type = message.storageType; + obj.id = message.id === 0 ? undefined : message.id; + obj.proto_file_name = message.protoFileName === "" ? undefined : message.protoFileName; + obj.storage_type = message.storageType === 0 ? undefined : message.storageType; return obj; }, fromAminoMsg(object: ModuleSchemaDescriptor_FileEntryAminoMsg): ModuleSchemaDescriptor_FileEntry { diff --git a/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/params.ts b/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/params.ts index 5caa207692..3252c9cc13 100644 --- a/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/params.ts @@ -163,12 +163,12 @@ export const ParameterChangeProposal = { }, toAmino(message: ParameterChangeProposal): ParameterChangeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.changes) { obj.changes = message.changes.map(e => e ? ParamChange.toAmino(e) : undefined); } else { - obj.changes = []; + obj.changes = message.changes; } return obj; }, @@ -289,9 +289,9 @@ export const ParamChange = { }, toAmino(message: ParamChange): ParamChangeAmino { const obj: any = {}; - obj.subspace = message.subspace; - obj.key = message.key; - obj.value = message.value; + obj.subspace = message.subspace === "" ? undefined : message.subspace; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: ParamChangeAminoMsg): ParamChange { diff --git a/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/query.ts index 06b91a563f..f5e99776c6 100644 --- a/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/query.ts @@ -215,8 +215,8 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.subspace = message.subspace; - obj.key = message.key; + obj.subspace = message.subspace === "" ? undefined : message.subspace; + obj.key = message.key === "" ? undefined : message.key; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -479,7 +479,7 @@ export const QuerySubspacesResponse = { if (message.subspaces) { obj.subspaces = message.subspaces.map(e => e ? Subspace.toAmino(e) : undefined); } else { - obj.subspaces = []; + obj.subspaces = message.subspaces; } return obj; }, @@ -591,11 +591,11 @@ export const Subspace = { }, toAmino(message: Subspace): SubspaceAmino { const obj: any = {}; - obj.subspace = message.subspace; + obj.subspace = message.subspace === "" ? undefined : message.subspace; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/genesis.ts index 1aa601c315..6e21989663 100644 --- a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/genesis.ts @@ -249,12 +249,12 @@ export const GenesisState = { if (message.signingInfos) { obj.signing_infos = message.signingInfos.map(e => e ? SigningInfo.toAmino(e) : undefined); } else { - obj.signing_infos = []; + obj.signing_infos = message.signingInfos; } if (message.missedBlocks) { obj.missed_blocks = message.missedBlocks.map(e => e ? ValidatorMissedBlocks.toAmino(e) : undefined); } else { - obj.missed_blocks = []; + obj.missed_blocks = message.missedBlocks; } return obj; }, @@ -362,7 +362,7 @@ export const SigningInfo = { }, toAmino(message: SigningInfo): SigningInfoAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.validator_signing_info = message.validatorSigningInfo ? ValidatorSigningInfo.toAmino(message.validatorSigningInfo) : undefined; return obj; }, @@ -474,11 +474,11 @@ export const ValidatorMissedBlocks = { }, toAmino(message: ValidatorMissedBlocks): ValidatorMissedBlocksAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.missedBlocks) { obj.missed_blocks = message.missedBlocks.map(e => e ? MissedBlock.toAmino(e) : undefined); } else { - obj.missed_blocks = []; + obj.missed_blocks = message.missedBlocks; } return obj; }, @@ -586,8 +586,8 @@ export const MissedBlock = { }, toAmino(message: MissedBlock): MissedBlockAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; - obj.missed = message.missed; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; + obj.missed = message.missed === false ? undefined : message.missed; return obj; }, fromAminoMsg(object: MissedBlockAminoMsg): MissedBlock { diff --git a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/query.ts index f7900a9259..34634c28ff 100644 --- a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/query.ts @@ -391,7 +391,7 @@ export const QuerySigningInfoRequest = { }, toAmino(message: QuerySigningInfoRequest): QuerySigningInfoRequestAmino { const obj: any = {}; - obj.cons_address = message.consAddress; + obj.cons_address = message.consAddress === "" ? undefined : message.consAddress; return obj; }, fromAminoMsg(object: QuerySigningInfoRequestAminoMsg): QuerySigningInfoRequest { @@ -691,7 +691,7 @@ export const QuerySigningInfosResponse = { if (message.info) { obj.info = message.info.map(e => e ? ValidatorSigningInfo.toAmino(e) : undefined); } else { - obj.info = []; + obj.info = message.info; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/slashing.ts b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/slashing.ts index 123d8a917d..c28706cc72 100644 --- a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/slashing.ts +++ b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/slashing.ts @@ -255,12 +255,12 @@ export const ValidatorSigningInfo = { }, 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.address = message.address === "" ? undefined : message.address; + obj.start_height = message.startHeight !== BigInt(0) ? message.startHeight.toString() : undefined; + obj.index_offset = message.indexOffset !== BigInt(0) ? message.indexOffset.toString() : undefined; obj.jailed_until = message.jailedUntil ? Timestamp.toAmino(toTimestamp(message.jailedUntil)) : undefined; - obj.tombstoned = message.tombstoned; - obj.missed_blocks_counter = message.missedBlocksCounter ? message.missedBlocksCounter.toString() : undefined; + obj.tombstoned = message.tombstoned === false ? undefined : message.tombstoned; + obj.missed_blocks_counter = message.missedBlocksCounter !== BigInt(0) ? message.missedBlocksCounter.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorSigningInfoAminoMsg): ValidatorSigningInfo { @@ -414,7 +414,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.signed_blocks_window = message.signedBlocksWindow ? message.signedBlocksWindow.toString() : undefined; + obj.signed_blocks_window = message.signedBlocksWindow !== BigInt(0) ? message.signedBlocksWindow.toString() : undefined; obj.min_signed_per_window = message.minSignedPerWindow ? base64FromBytes(message.minSignedPerWindow) : undefined; obj.downtime_jail_duration = message.downtimeJailDuration ? Duration.toAmino(message.downtimeJailDuration) : undefined; obj.slash_fraction_double_sign = message.slashFractionDoubleSign ? base64FromBytes(message.slashFractionDoubleSign) : undefined; diff --git a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/tx.ts index 23f326c34b..580baacee9 100644 --- a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/tx.ts @@ -11,7 +11,7 @@ export interface MsgUnjailProtoMsg { } /** MsgUnjail defines the Msg/Unjail request type */ export interface MsgUnjailAmino { - validator_addr?: string; + validator_addr: string; } export interface MsgUnjailAminoMsg { type: "cosmos-sdk/MsgUnjail"; @@ -100,7 +100,7 @@ export const MsgUnjail = { }, toAmino(message: MsgUnjail): MsgUnjailAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr ?? ""; return obj; }, fromAminoMsg(object: MsgUnjailAminoMsg): MsgUnjail { diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/authz.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/authz.ts index 215adc1853..2898e30cf5 100644 --- a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/authz.ts @@ -249,7 +249,7 @@ export const StakeAuthorization = { message.denyList = StakeAuthorization_Validators.fromAmino(object.deny_list); } if (object.authorization_type !== undefined && object.authorization_type !== null) { - message.authorizationType = authorizationTypeFromJSON(object.authorization_type); + message.authorizationType = object.authorization_type; } return message; }, @@ -258,7 +258,7 @@ export const StakeAuthorization = { 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; + obj.authorization_type = message.authorizationType === 0 ? undefined : message.authorizationType; return obj; }, fromAminoMsg(object: StakeAuthorizationAminoMsg): StakeAuthorization { @@ -357,7 +357,7 @@ export const StakeAuthorization_Validators = { if (message.address) { obj.address = message.address.map(e => e); } else { - obj.address = []; + obj.address = message.address; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/genesis.ts index 40a3f330ab..6359cfc088 100644 --- a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/genesis.ts @@ -303,29 +303,29 @@ export const GenesisState = { if (message.lastValidatorPowers) { obj.last_validator_powers = message.lastValidatorPowers.map(e => e ? LastValidatorPower.toAmino(e) : undefined); } else { - obj.last_validator_powers = []; + obj.last_validator_powers = message.lastValidatorPowers; } if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } if (message.delegations) { obj.delegations = message.delegations.map(e => e ? Delegation.toAmino(e) : undefined); } else { - obj.delegations = []; + obj.delegations = message.delegations; } if (message.unbondingDelegations) { obj.unbonding_delegations = message.unbondingDelegations.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_delegations = []; + obj.unbonding_delegations = message.unbondingDelegations; } if (message.redelegations) { obj.redelegations = message.redelegations.map(e => e ? Redelegation.toAmino(e) : undefined); } else { - obj.redelegations = []; + obj.redelegations = message.redelegations; } - obj.exported = message.exported; + obj.exported = message.exported === false ? undefined : message.exported; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -432,8 +432,8 @@ export const LastValidatorPower = { }, toAmino(message: LastValidatorPower): LastValidatorPowerAmino { const obj: any = {}; - obj.address = message.address; - obj.power = message.power ? message.power.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: LastValidatorPowerAminoMsg): LastValidatorPower { diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/query.ts index b50fd0499a..9cf4741ad7 100644 --- a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/query.ts @@ -934,7 +934,7 @@ export const QueryValidatorsRequest = { }, toAmino(message: QueryValidatorsRequest): QueryValidatorsRequestAmino { const obj: any = {}; - obj.status = message.status; + obj.status = message.status === "" ? undefined : message.status; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1051,7 +1051,7 @@ export const QueryValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1143,7 +1143,7 @@ export const QueryValidatorRequest = { }, toAmino(message: QueryValidatorRequest): QueryValidatorRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryValidatorRequestAminoMsg): QueryValidatorRequest { @@ -1342,7 +1342,7 @@ export const QueryValidatorDelegationsRequest = { }, toAmino(message: QueryValidatorDelegationsRequest): QueryValidatorDelegationsRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1459,7 +1459,7 @@ export const QueryValidatorDelegationsResponse = { if (message.delegationResponses) { obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_responses = []; + obj.delegation_responses = message.delegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1568,7 +1568,7 @@ export const QueryValidatorUnbondingDelegationsRequest = { }, toAmino(message: QueryValidatorUnbondingDelegationsRequest): QueryValidatorUnbondingDelegationsRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1685,7 +1685,7 @@ export const QueryValidatorUnbondingDelegationsResponse = { if (message.unbondingResponses) { obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_responses = []; + obj.unbonding_responses = message.unbondingResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1792,8 +1792,8 @@ export const QueryDelegationRequest = { }, toAmino(message: QueryDelegationRequest): QueryDelegationRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryDelegationRequestAminoMsg): QueryDelegationRequest { @@ -1990,8 +1990,8 @@ export const QueryUnbondingDelegationRequest = { }, toAmino(message: QueryUnbondingDelegationRequest): QueryUnbondingDelegationRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryUnbondingDelegationRequestAminoMsg): QueryUnbondingDelegationRequest { @@ -2190,7 +2190,7 @@ export const QueryDelegatorDelegationsRequest = { }, toAmino(message: QueryDelegatorDelegationsRequest): QueryDelegatorDelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2307,7 +2307,7 @@ export const QueryDelegatorDelegationsResponse = { if (message.delegationResponses) { obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_responses = []; + obj.delegation_responses = message.delegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2416,7 +2416,7 @@ export const QueryDelegatorUnbondingDelegationsRequest = { }, toAmino(message: QueryDelegatorUnbondingDelegationsRequest): QueryDelegatorUnbondingDelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2533,7 +2533,7 @@ export const QueryDelegatorUnbondingDelegationsResponse = { if (message.unbondingResponses) { obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_responses = []; + obj.unbonding_responses = message.unbondingResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2672,9 +2672,9 @@ export const QueryRedelegationsRequest = { }, 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.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.src_validator_addr = message.srcValidatorAddr === "" ? undefined : message.srcValidatorAddr; + obj.dst_validator_addr = message.dstValidatorAddr === "" ? undefined : message.dstValidatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2791,7 +2791,7 @@ export const QueryRedelegationsResponse = { if (message.redelegationResponses) { obj.redelegation_responses = message.redelegationResponses.map(e => e ? RedelegationResponse.toAmino(e) : undefined); } else { - obj.redelegation_responses = []; + obj.redelegation_responses = message.redelegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2900,7 +2900,7 @@ export const QueryDelegatorValidatorsRequest = { }, toAmino(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -3017,7 +3017,7 @@ export const QueryDelegatorValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -3124,8 +3124,8 @@ export const QueryDelegatorValidatorRequest = { }, toAmino(message: QueryDelegatorValidatorRequest): QueryDelegatorValidatorRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryDelegatorValidatorRequestAminoMsg): QueryDelegatorValidatorRequest { @@ -3309,7 +3309,7 @@ export const QueryHistoricalInfoRequest = { }, toAmino(message: QueryHistoricalInfoRequest): QueryHistoricalInfoRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: QueryHistoricalInfoRequestAminoMsg): QueryHistoricalInfoRequest { diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts index 6a59cb3d58..d99d157c00 100644 --- a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts +++ b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts @@ -815,8 +815,8 @@ export interface PoolProtoMsg { * denomination. */ export interface PoolAmino { - not_bonded_tokens?: string; - bonded_tokens?: string; + not_bonded_tokens: string; + bonded_tokens: string; } export interface PoolAminoMsg { type: "cosmos-sdk/Pool"; @@ -922,7 +922,7 @@ export const HistoricalInfo = { if (message.valset) { obj.valset = message.valset.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.valset = []; + obj.valset = message.valset; } return obj; }, @@ -1043,9 +1043,9 @@ export const CommissionRates = { }, toAmino(message: CommissionRates): CommissionRatesAmino { const obj: any = {}; - obj.rate = message.rate; - obj.max_rate = message.maxRate; - obj.max_change_rate = message.maxChangeRate; + obj.rate = message.rate === "" ? undefined : message.rate; + obj.max_rate = message.maxRate === "" ? undefined : message.maxRate; + obj.max_change_rate = message.maxChangeRate === "" ? undefined : message.maxChangeRate; return obj; }, fromAminoMsg(object: CommissionRatesAminoMsg): CommissionRates { @@ -1303,11 +1303,11 @@ export const Description = { }, 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; + obj.moniker = message.moniker === "" ? undefined : message.moniker; + obj.identity = message.identity === "" ? undefined : message.identity; + obj.website = message.website === "" ? undefined : message.website; + obj.security_contact = message.securityContact === "" ? undefined : message.securityContact; + obj.details = message.details === "" ? undefined : message.details; return obj; }, fromAminoMsg(object: DescriptionAminoMsg): Description { @@ -1528,7 +1528,7 @@ export const Validator = { message.jailed = object.jailed; } if (object.status !== undefined && object.status !== null) { - message.status = bondStatusFromJSON(object.status); + message.status = object.status; } if (object.tokens !== undefined && object.tokens !== null) { message.tokens = object.tokens; @@ -1555,17 +1555,17 @@ export const Validator = { }, toAmino(message: Validator): ValidatorAmino { const obj: any = {}; - obj.operator_address = message.operatorAddress; + obj.operator_address = message.operatorAddress === "" ? undefined : 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.jailed = message.jailed === false ? undefined : message.jailed; + obj.status = message.status === 0 ? undefined : message.status; + obj.tokens = message.tokens === "" ? undefined : message.tokens; + obj.delegator_shares = message.delegatorShares === "" ? undefined : message.delegatorShares; obj.description = message.description ? Description.toAmino(message.description) : undefined; - obj.unbonding_height = message.unbondingHeight ? message.unbondingHeight.toString() : undefined; + obj.unbonding_height = message.unbondingHeight !== BigInt(0) ? message.unbondingHeight.toString() : undefined; obj.unbonding_time = message.unbondingTime ? Timestamp.toAmino(toTimestamp(message.unbondingTime)) : undefined; obj.commission = message.commission ? Commission.toAmino(message.commission) : undefined; - obj.min_self_delegation = message.minSelfDelegation; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -1664,7 +1664,7 @@ export const ValAddresses = { if (message.addresses) { obj.addresses = message.addresses.map(e => e); } else { - obj.addresses = []; + obj.addresses = message.addresses; } return obj; }, @@ -1770,8 +1770,8 @@ export const DVPair = { }, toAmino(message: DVPair): DVPairAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: DVPairAminoMsg): DVPair { @@ -1870,7 +1870,7 @@ export const DVPairs = { if (message.pairs) { obj.pairs = message.pairs.map(e => e ? DVPair.toAmino(e) : undefined); } else { - obj.pairs = []; + obj.pairs = message.pairs; } return obj; }, @@ -1991,9 +1991,9 @@ export const DVVTriplet = { }, toAmino(message: DVVTriplet): DVVTripletAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; return obj; }, fromAminoMsg(object: DVVTripletAminoMsg): DVVTriplet { @@ -2092,7 +2092,7 @@ export const DVVTriplets = { if (message.triplets) { obj.triplets = message.triplets.map(e => e ? DVVTriplet.toAmino(e) : undefined); } else { - obj.triplets = []; + obj.triplets = message.triplets; } return obj; }, @@ -2213,9 +2213,9 @@ export const Delegation = { }, toAmino(message: Delegation): DelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.shares = message.shares; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.shares = message.shares === "" ? undefined : message.shares; return obj; }, fromAminoMsg(object: DelegationAminoMsg): Delegation { @@ -2341,12 +2341,12 @@ export const UnbondingDelegation = { }, toAmino(message: UnbondingDelegation): UnbondingDelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.entries) { obj.entries = message.entries.map(e => e ? UnbondingDelegationEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2484,10 +2484,10 @@ export const UnbondingDelegationEntry = { }, toAmino(message: UnbondingDelegationEntry): UnbondingDelegationEntryAmino { const obj: any = {}; - obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.creation_height = message.creationHeight !== BigInt(0) ? message.creationHeight.toString() : undefined; obj.completion_time = message.completionTime ? Timestamp.toAmino(toTimestamp(message.completionTime)) : undefined; - obj.initial_balance = message.initialBalance; - obj.balance = message.balance; + obj.initial_balance = message.initialBalance === "" ? undefined : message.initialBalance; + obj.balance = message.balance === "" ? undefined : message.balance; return obj; }, fromAminoMsg(object: UnbondingDelegationEntryAminoMsg): UnbondingDelegationEntry { @@ -2624,10 +2624,10 @@ export const RedelegationEntry = { }, toAmino(message: RedelegationEntry): RedelegationEntryAmino { const obj: any = {}; - obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.creation_height = message.creationHeight !== BigInt(0) ? message.creationHeight.toString() : undefined; obj.completion_time = message.completionTime ? Timestamp.toAmino(toTimestamp(message.completionTime)) : undefined; - obj.initial_balance = message.initialBalance; - obj.shares_dst = message.sharesDst; + obj.initial_balance = message.initialBalance === "" ? undefined : message.initialBalance; + obj.shares_dst = message.sharesDst === "" ? undefined : message.sharesDst; return obj; }, fromAminoMsg(object: RedelegationEntryAminoMsg): RedelegationEntry { @@ -2768,13 +2768,13 @@ export const Redelegation = { }, toAmino(message: Redelegation): RedelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; if (message.entries) { obj.entries = message.entries.map(e => e ? RedelegationEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2943,11 +2943,11 @@ export const Params = { 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; + obj.max_validators = message.maxValidators === 0 ? undefined : message.maxValidators; + obj.max_entries = message.maxEntries === 0 ? undefined : message.maxEntries; + obj.historical_entries = message.historicalEntries === 0 ? undefined : message.historicalEntries; + obj.bond_denom = message.bondDenom === "" ? undefined : message.bondDenom; + obj.min_commission_rate = message.minCommissionRate === "" ? undefined : message.minCommissionRate; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -3165,7 +3165,7 @@ export const RedelegationEntryResponse = { toAmino(message: RedelegationEntryResponse): RedelegationEntryResponseAmino { const obj: any = {}; obj.redelegation_entry = message.redelegationEntry ? RedelegationEntry.toAmino(message.redelegationEntry) : undefined; - obj.balance = message.balance; + obj.balance = message.balance === "" ? undefined : message.balance; return obj; }, fromAminoMsg(object: RedelegationEntryResponseAminoMsg): RedelegationEntryResponse { @@ -3282,7 +3282,7 @@ export const RedelegationResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? RedelegationEntryResponse.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -3388,8 +3388,8 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.not_bonded_tokens = message.notBondedTokens; - obj.bonded_tokens = message.bondedTokens; + obj.not_bonded_tokens = message.notBondedTokens ?? ""; + obj.bonded_tokens = message.bondedTokens ?? ""; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { @@ -3422,7 +3422,7 @@ export const Cosmos_cryptoPubKey_InterfaceDecoder = (input: BinaryReader | Uint8 return data; } }; -export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino) => { +export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino): Any => { return encodePubkey(content); }; export const Cosmos_cryptoPubKey_ToAmino = (content: Any): Pubkey | null => { diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts index 0910b38161..2b21ac2f99 100644 --- a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts @@ -445,9 +445,9 @@ export const MsgCreateValidator = { 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.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; obj.value = message.value ? Coin.toAmino(message.value) : undefined; return obj; @@ -659,9 +659,9 @@ export const MsgEditValidator = { 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; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.commission_rate = message.commissionRate === "" ? undefined : message.commissionRate; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; return obj; }, fromAminoMsg(object: MsgEditValidatorAminoMsg): MsgEditValidator { @@ -855,8 +855,8 @@ export const MsgDelegate = { }, toAmino(message: MsgDelegate): MsgDelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -1066,9 +1066,9 @@ export const MsgBeginRedelegate = { }, 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.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -1281,8 +1281,8 @@ export const MsgUndelegate = { }, toAmino(message: MsgUndelegate): MsgUndelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -1406,7 +1406,7 @@ export const Cosmos_cryptoPubKey_InterfaceDecoder = (input: BinaryReader | Uint8 return data; } }; -export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino) => { +export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino): Any => { return encodePubkey(content); }; export const Cosmos_cryptoPubKey_ToAmino = (content: Any): Pubkey | null => { 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 d7c2782a1e..90eb296624 100644 --- a/__fixtures__/v-next/outputv2/cosmos/tx/signing/v1beta1/signing.ts +++ b/__fixtures__/v-next/outputv2/cosmos/tx/signing/v1beta1/signing.ts @@ -318,7 +318,7 @@ export const SignatureDescriptors = { if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor.toAmino(e) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -447,7 +447,7 @@ export const SignatureDescriptor = { 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; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureDescriptorAminoMsg): SignatureDescriptor { @@ -653,7 +653,7 @@ export const SignatureDescriptor_Data_Single = { fromAmino(object: SignatureDescriptor_Data_SingleAmino): SignatureDescriptor_Data_Single { const message = createBaseSignatureDescriptor_Data_Single(); if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.signature !== undefined && object.signature !== null) { message.signature = bytesFromBase64(object.signature); @@ -662,7 +662,7 @@ export const SignatureDescriptor_Data_Single = { }, toAmino(message: SignatureDescriptor_Data_Single): SignatureDescriptor_Data_SingleAmino { const obj: any = {}; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; return obj; }, @@ -780,7 +780,7 @@ export const SignatureDescriptor_Data_Multi = { if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor_Data.toAmino(e) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/service.ts b/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/service.ts index 6047958802..7beb5470a5 100644 --- a/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/service.ts +++ b/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/service.ts @@ -582,7 +582,7 @@ export const GetTxsEventRequest = { message.pagination = PageRequest.fromAmino(object.pagination); } if (object.order_by !== undefined && object.order_by !== null) { - message.orderBy = orderByFromJSON(object.order_by); + message.orderBy = object.order_by; } return message; }, @@ -591,10 +591,10 @@ export const GetTxsEventRequest = { if (message.events) { obj.events = message.events.map(e => e); } else { - obj.events = []; + obj.events = message.events; } obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; - obj.order_by = message.orderBy; + obj.order_by = message.orderBy === 0 ? undefined : message.orderBy; return obj; }, fromAminoMsg(object: GetTxsEventRequestAminoMsg): GetTxsEventRequest { @@ -731,12 +731,12 @@ export const GetTxsEventResponse = { if (message.txs) { obj.txs = message.txs.map(e => e ? Tx.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } if (message.txResponses) { obj.tx_responses = message.txResponses.map(e => e ? TxResponse.toAmino(e) : undefined); } else { - obj.tx_responses = []; + obj.tx_responses = message.txResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -837,14 +837,14 @@ export const BroadcastTxRequest = { message.txBytes = bytesFromBase64(object.tx_bytes); } if (object.mode !== undefined && object.mode !== null) { - message.mode = broadcastModeFromJSON(object.mode); + message.mode = object.mode; } return message; }, toAmino(message: BroadcastTxRequest): BroadcastTxRequestAmino { const obj: any = {}; obj.tx_bytes = message.txBytes ? base64FromBytes(message.txBytes) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; return obj; }, fromAminoMsg(object: BroadcastTxRequestAminoMsg): BroadcastTxRequest { @@ -1244,7 +1244,7 @@ export const GetTxRequest = { }, toAmino(message: GetTxRequest): GetTxRequestAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === "" ? undefined : message.hash; return obj; }, fromAminoMsg(object: GetTxRequestAminoMsg): GetTxRequest { @@ -1463,7 +1463,7 @@ export const GetBlockWithTxsRequest = { }, toAmino(message: GetBlockWithTxsRequest): GetBlockWithTxsRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1614,7 +1614,7 @@ export const GetBlockWithTxsResponse = { if (message.txs) { obj.txs = message.txs.map(e => e ? Tx.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.block = message.block ? Block.toAmino(message.block) : undefined; diff --git a/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/tx.ts index 024e697a51..6ef830229c 100644 --- a/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/tx.ts @@ -868,7 +868,7 @@ export const Tx = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -1000,7 +1000,7 @@ export const TxRaw = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -1140,8 +1140,8 @@ export const SignDoc = { const obj: any = {}; obj.body_bytes = message.bodyBytes ? base64FromBytes(message.bodyBytes) : undefined; obj.auth_info_bytes = message.authInfoBytes ? base64FromBytes(message.authInfoBytes) : undefined; - obj.chain_id = message.chainId; - obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; return obj; }, fromAminoMsg(object: SignDocAminoMsg): SignDoc { @@ -1316,9 +1316,9 @@ export const SignDocDirectAux = { const obj: any = {}; obj.body_bytes = message.bodyBytes ? base64FromBytes(message.bodyBytes) : undefined; 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.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined; return obj; }, @@ -1492,19 +1492,19 @@ export const TxBody = { if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.memo = message.memo; - obj.timeout_height = message.timeoutHeight ? message.timeoutHeight.toString() : undefined; + obj.memo = message.memo === "" ? undefined : message.memo; + obj.timeout_height = message.timeoutHeight !== BigInt(0) ? message.timeoutHeight.toString() : undefined; if (message.extensionOptions) { obj.extension_options = message.extensionOptions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extension_options = []; + obj.extension_options = message.extensionOptions; } if (message.nonCriticalExtensionOptions) { obj.non_critical_extension_options = message.nonCriticalExtensionOptions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.non_critical_extension_options = []; + obj.non_critical_extension_options = message.nonCriticalExtensionOptions; } return obj; }, @@ -1638,7 +1638,7 @@ export const AuthInfo = { if (message.signerInfos) { obj.signer_infos = message.signerInfos.map(e => e ? SignerInfo.toAmino(e) : undefined); } else { - obj.signer_infos = []; + obj.signer_infos = message.signerInfos; } obj.fee = message.fee ? Fee.toAmino(message.fee) : undefined; obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined; @@ -1769,7 +1769,7 @@ export const SignerInfo = { 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; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: SignerInfoAminoMsg): SignerInfo { @@ -1963,13 +1963,13 @@ export const ModeInfo_Single = { fromAmino(object: ModeInfo_SingleAmino): ModeInfo_Single { const message = createBaseModeInfo_Single(); if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } return message; }, toAmino(message: ModeInfo_Single): ModeInfo_SingleAmino { const obj: any = {}; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; return obj; }, fromAminoMsg(object: ModeInfo_SingleAminoMsg): ModeInfo_Single { @@ -2086,7 +2086,7 @@ export const ModeInfo_Multi = { if (message.modeInfos) { obj.mode_infos = message.modeInfos.map(e => e ? ModeInfo.toAmino(e) : undefined); } else { - obj.mode_infos = []; + obj.mode_infos = message.modeInfos; } return obj; }, @@ -2233,11 +2233,11 @@ export const Fee = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.gas_limit = message.gasLimit ? message.gasLimit.toString() : undefined; - obj.payer = message.payer; - obj.granter = message.granter; + obj.gas_limit = message.gasLimit !== BigInt(0) ? message.gasLimit.toString() : undefined; + obj.payer = message.payer === "" ? undefined : message.payer; + obj.granter = message.granter === "" ? undefined : message.granter; return obj; }, fromAminoMsg(object: FeeAminoMsg): Fee { @@ -2351,9 +2351,9 @@ export const Tip = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.tipper = message.tipper; + obj.tipper = message.tipper === "" ? undefined : message.tipper; return obj; }, fromAminoMsg(object: TipAminoMsg): Tip { @@ -2481,7 +2481,7 @@ export const AuxSignerData = { message.signDoc = SignDocDirectAux.fromAmino(object.sign_doc); } if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.sig !== undefined && object.sig !== null) { message.sig = bytesFromBase64(object.sig); @@ -2490,9 +2490,9 @@ export const AuxSignerData = { }, toAmino(message: AuxSignerData): AuxSignerDataAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.sign_doc = message.signDoc ? SignDocDirectAux.toAmino(message.signDoc) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.sig = message.sig ? base64FromBytes(message.sig) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/query.ts index 0eefa8057b..96421a56e3 100644 --- a/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/query.ts @@ -561,7 +561,7 @@ export const QueryAppliedPlanRequest = { }, toAmino(message: QueryAppliedPlanRequest): QueryAppliedPlanRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: QueryAppliedPlanRequestAminoMsg): QueryAppliedPlanRequest { @@ -653,7 +653,7 @@ export const QueryAppliedPlanResponse = { }, toAmino(message: QueryAppliedPlanResponse): QueryAppliedPlanResponseAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: QueryAppliedPlanResponseAminoMsg): QueryAppliedPlanResponse { @@ -745,7 +745,7 @@ export const QueryUpgradedConsensusStateRequest = { }, toAmino(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAmino { const obj: any = {}; - obj.last_height = message.lastHeight ? message.lastHeight.toString() : undefined; + obj.last_height = message.lastHeight !== BigInt(0) ? message.lastHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryUpgradedConsensusStateRequestAminoMsg): QueryUpgradedConsensusStateRequest { @@ -925,7 +925,7 @@ export const QueryModuleVersionsRequest = { }, toAmino(message: QueryModuleVersionsRequest): QueryModuleVersionsRequestAmino { const obj: any = {}; - obj.module_name = message.moduleName; + obj.module_name = message.moduleName === "" ? undefined : message.moduleName; return obj; }, fromAminoMsg(object: QueryModuleVersionsRequestAminoMsg): QueryModuleVersionsRequest { @@ -1024,7 +1024,7 @@ export const QueryModuleVersionsResponse = { if (message.moduleVersions) { obj.module_versions = message.moduleVersions.map(e => e ? ModuleVersion.toAmino(e) : undefined); } else { - obj.module_versions = []; + obj.module_versions = message.moduleVersions; } return obj; }, @@ -1187,7 +1187,7 @@ export const QueryAuthorityResponse = { }, toAmino(message: QueryAuthorityResponse): QueryAuthorityResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryAuthorityResponseAminoMsg): QueryAuthorityResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/tx.ts index 9c7ec2458e..f85558ee4b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/tx.ts @@ -209,7 +209,7 @@ export const MsgSoftwareUpgrade = { }, toAmino(message: MsgSoftwareUpgrade): MsgSoftwareUpgradeAmino { const obj: any = {}; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; return obj; }, @@ -372,7 +372,7 @@ export const MsgCancelUpgrade = { }, toAmino(message: MsgCancelUpgrade): MsgCancelUpgradeAmino { const obj: any = {}; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; return obj; }, fromAminoMsg(object: MsgCancelUpgradeAminoMsg): MsgCancelUpgrade { diff --git a/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/upgrade.ts b/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/upgrade.ts index 2daeaf336d..e1c43bb2c3 100644 --- a/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/upgrade.ts +++ b/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/upgrade.ts @@ -348,10 +348,10 @@ export const Plan = { }, toAmino(message: Plan): PlanAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.height = message.height ? message.height.toString() : undefined; - obj.info = message.info; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.info = message.info === "" ? undefined : message.info; obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; return obj; }, @@ -474,8 +474,8 @@ export const SoftwareUpgradeProposal = { }, toAmino(message: SoftwareUpgradeProposal): SoftwareUpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; return obj; }, @@ -581,8 +581,8 @@ export const CancelSoftwareUpgradeProposal = { }, toAmino(message: CancelSoftwareUpgradeProposal): CancelSoftwareUpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: CancelSoftwareUpgradeProposalAminoMsg): CancelSoftwareUpgradeProposal { @@ -689,8 +689,8 @@ export const ModuleVersion = { }, toAmino(message: ModuleVersion): ModuleVersionAmino { const obj: any = {}; - obj.name = message.name; - obj.version = message.version ? message.version.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; return obj; }, fromAminoMsg(object: ModuleVersionAminoMsg): ModuleVersion { diff --git a/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/tx.ts index e60881a6df..5dd2924605 100644 --- a/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/tx.ts @@ -301,15 +301,15 @@ export const MsgCreateVestingAccount = { }, toAmino(message: MsgCreateVestingAccount): MsgCreateVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.end_time = message.endTime ? message.endTime.toString() : undefined; - obj.delayed = message.delayed; + obj.end_time = message.endTime !== BigInt(0) ? message.endTime.toString() : undefined; + obj.delayed = message.delayed === false ? undefined : message.delayed; return obj; }, fromAminoMsg(object: MsgCreateVestingAccountAminoMsg): MsgCreateVestingAccount { @@ -507,12 +507,12 @@ export const MsgCreatePermanentLockedAccount = { }, toAmino(message: MsgCreatePermanentLockedAccount): MsgCreatePermanentLockedAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -728,13 +728,13 @@ export const MsgCreatePeriodicVestingAccount = { }, 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; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/vesting.ts b/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/vesting.ts index 19329313fa..5edf48a5b6 100644 --- a/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/vesting.ts +++ b/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/vesting.ts @@ -355,19 +355,19 @@ export const BaseVestingAccount = { if (message.originalVesting) { obj.original_vesting = message.originalVesting.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.original_vesting = []; + obj.original_vesting = message.originalVesting; } if (message.delegatedFree) { obj.delegated_free = message.delegatedFree.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.delegated_free = []; + obj.delegated_free = message.delegatedFree; } if (message.delegatedVesting) { obj.delegated_vesting = message.delegatedVesting.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.delegated_vesting = []; + obj.delegated_vesting = message.delegatedVesting; } - obj.end_time = message.endTime ? message.endTime.toString() : undefined; + obj.end_time = message.endTime !== BigInt(0) ? message.endTime.toString() : undefined; return obj; }, fromAminoMsg(object: BaseVestingAccountAminoMsg): BaseVestingAccount { @@ -477,7 +477,7 @@ export const ContinuousVestingAccount = { 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; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; return obj; }, fromAminoMsg(object: ContinuousVestingAccountAminoMsg): ContinuousVestingAccount { @@ -682,11 +682,11 @@ export const Period = { }, toAmino(message: Period): PeriodAmino { const obj: any = {}; - obj.length = message.length ? message.length.toString() : undefined; + obj.length = message.length !== BigInt(0) ? message.length.toString() : undefined; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -818,11 +818,11 @@ export const PeriodicVestingAccount = { 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; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmos_proto/cosmos.ts b/__fixtures__/v-next/outputv2/cosmos_proto/cosmos.ts index 8571549ff3..1d551b4f57 100644 --- a/__fixtures__/v-next/outputv2/cosmos_proto/cosmos.ts +++ b/__fixtures__/v-next/outputv2/cosmos_proto/cosmos.ts @@ -254,8 +254,8 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: InterfaceDescriptorAminoMsg): InterfaceDescriptor { @@ -378,17 +378,17 @@ export const ScalarDescriptor = { if (object.description !== undefined && object.description !== null) { message.description = object.description; } - message.fieldType = object.field_type?.map(e => scalarTypeFromJSON(e)) || []; + message.fieldType = object.field_type?.map(e => e) || []; return message; }, toAmino(message: ScalarDescriptor): ScalarDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; if (message.fieldType) { obj.field_type = message.fieldType.map(e => e); } else { - obj.field_type = []; + obj.field_type = message.fieldType; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/genesis.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/genesis.ts index 88658333ef..41beb793fe 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/genesis.ts @@ -305,22 +305,22 @@ export const GenesisState = { if (message.codes) { obj.codes = message.codes.map(e => e ? Code.toAmino(e) : undefined); } else { - obj.codes = []; + obj.codes = message.codes; } if (message.contracts) { obj.contracts = message.contracts.map(e => e ? Contract.toAmino(e) : undefined); } else { - obj.contracts = []; + obj.contracts = message.contracts; } if (message.sequences) { obj.sequences = message.sequences.map(e => e ? Sequence.toAmino(e) : undefined); } else { - obj.sequences = []; + obj.sequences = message.sequences; } if (message.genMsgs) { obj.gen_msgs = message.genMsgs.map(e => e ? GenesisState_GenMsgs.toAmino(e) : undefined); } else { - obj.gen_msgs = []; + obj.gen_msgs = message.genMsgs; } return obj; }, @@ -588,10 +588,10 @@ export const Code = { }, toAmino(message: Code): CodeAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.code_info = message.codeInfo ? CodeInfo.toAmino(message.codeInfo) : undefined; obj.code_bytes = message.codeBytes ? base64FromBytes(message.codeBytes) : undefined; - obj.pinned = message.pinned; + obj.pinned = message.pinned === false ? undefined : message.pinned; return obj; }, fromAminoMsg(object: CodeAminoMsg): Code { @@ -719,12 +719,12 @@ export const Contract = { }, toAmino(message: Contract): ContractAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : 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 = []; + obj.contract_state = message.contractState; } return obj; }, @@ -833,7 +833,7 @@ export const Sequence = { toAmino(message: Sequence): SequenceAmino { const obj: any = {}; obj.id_key = message.idKey ? base64FromBytes(message.idKey) : undefined; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: SequenceAminoMsg): Sequence { diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/ibc.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/ibc.ts index f2f9145dd0..7f18b8b41c 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/ibc.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/ibc.ts @@ -190,9 +190,9 @@ export const MsgIBCSend = { }, 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.channel = message.channel === "" ? undefined : message.channel; + obj.timeout_height = message.timeoutHeight !== BigInt(0) ? message.timeoutHeight.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -283,7 +283,7 @@ export const MsgIBCCloseChannel = { }, toAmino(message: MsgIBCCloseChannel): MsgIBCCloseChannelAmino { const obj: any = {}; - obj.channel = message.channel; + obj.channel = message.channel === "" ? undefined : message.channel; return obj; }, fromAminoMsg(object: MsgIBCCloseChannelAminoMsg): MsgIBCCloseChannel { diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/proposal.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/proposal.ts index 103a1d6e03..50384fcf85 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/proposal.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/proposal.ts @@ -534,9 +534,9 @@ export const StoreCodeProposal = { }, toAmino(message: StoreCodeProposal): StoreCodeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.run_as = message.runAs; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; return obj; @@ -741,17 +741,17 @@ export const InstantiateContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -904,10 +904,10 @@ export const MigrateContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1043,9 +1043,9 @@ export const SudoContractProposal = { }, toAmino(message: SudoContractProposal): SudoContractProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1217,15 +1217,15 @@ export const ExecuteContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; + obj.contract = message.contract === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -1361,10 +1361,10 @@ export const UpdateAdminProposal = { }, toAmino(message: UpdateAdminProposal): UpdateAdminProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.new_admin = message.newAdmin; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: UpdateAdminProposalAminoMsg): UpdateAdminProposal { @@ -1484,9 +1484,9 @@ export const ClearAdminProposal = { }, toAmino(message: ClearAdminProposal): ClearAdminProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: ClearAdminProposalAminoMsg): ClearAdminProposal { @@ -1621,12 +1621,12 @@ export const PinCodesProposal = { }, toAmino(message: PinCodesProposal): PinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, @@ -1762,12 +1762,12 @@ export const UnpinCodesProposal = { }, toAmino(message: UnpinCodesProposal): UnpinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/query.ts index 1834ffee49..43bc1933e3 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/query.ts @@ -451,7 +451,7 @@ export interface CodeInfoResponseProtoMsg { } /** CodeInfoResponse contains code meta data from CodeInfo */ export interface CodeInfoResponseAmino { - code_id?: string; + code_id: string; creator?: string; data_hash?: string; } @@ -477,7 +477,7 @@ export interface QueryCodeResponseProtoMsg { /** QueryCodeResponse is the response type for the Query/Code RPC method */ export interface QueryCodeResponseAmino { code_info?: CodeInfoResponseAmino; - data?: string; + data: string; } export interface QueryCodeResponseAminoMsg { type: "wasm/QueryCodeResponse"; @@ -665,7 +665,7 @@ export const QueryContractInfoRequest = { }, toAmino(message: QueryContractInfoRequest): QueryContractInfoRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryContractInfoRequestAminoMsg): QueryContractInfoRequest { @@ -772,7 +772,7 @@ export const QueryContractInfoResponse = { }, toAmino(message: QueryContractInfoResponse): QueryContractInfoResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.contract_info = message.contractInfo ? ContractInfo.toAmino(message.contractInfo) : undefined; return obj; }, @@ -880,7 +880,7 @@ export const QueryContractHistoryRequest = { }, toAmino(message: QueryContractHistoryRequest): QueryContractHistoryRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -997,7 +997,7 @@ export const QueryContractHistoryResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? ContractCodeHistoryEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1108,7 +1108,7 @@ export const QueryContractsByCodeRequest = { }, toAmino(message: QueryContractsByCodeRequest): QueryContractsByCodeRequestAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1225,7 +1225,7 @@ export const QueryContractsByCodeResponse = { if (message.contracts) { obj.contracts = message.contracts.map(e => e); } else { - obj.contracts = []; + obj.contracts = message.contracts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1334,7 +1334,7 @@ export const QueryAllContractStateRequest = { }, toAmino(message: QueryAllContractStateRequest): QueryAllContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1451,7 +1451,7 @@ export const QueryAllContractStateResponse = { if (message.models) { obj.models = message.models.map(e => e ? Model.toAmino(e) : undefined); } else { - obj.models = []; + obj.models = message.models; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1558,7 +1558,7 @@ export const QueryRawContractStateRequest = { }, toAmino(message: QueryRawContractStateRequest): QueryRawContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? base64FromBytes(message.queryData) : undefined; return obj; }, @@ -1754,7 +1754,7 @@ export const QuerySmartContractStateRequest = { }, toAmino(message: QuerySmartContractStateRequest): QuerySmartContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? JSON.parse(fromUtf8(message.queryData)) : undefined; return obj; }, @@ -1937,7 +1937,7 @@ export const QueryCodeRequest = { }, toAmino(message: QueryCodeRequest): QueryCodeRequestAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCodeRequestAminoMsg): QueryCodeRequest { @@ -2059,8 +2059,8 @@ export const CodeInfoResponse = { }, toAmino(message: CodeInfoResponse): CodeInfoResponseAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; - obj.creator = message.creator; + obj.code_id = message.codeId ? message.codeId.toString() : "0"; + obj.creator = message.creator === "" ? undefined : message.creator; obj.data_hash = message.dataHash ? base64FromBytes(message.dataHash) : undefined; return obj; }, @@ -2169,7 +2169,7 @@ export const QueryCodeResponse = { toAmino(message: QueryCodeResponse): QueryCodeResponseAmino { const obj: any = {}; obj.code_info = message.codeInfo ? CodeInfoResponse.toAmino(message.codeInfo) : undefined; - obj.data = message.data ? base64FromBytes(message.data) : undefined; + obj.data = message.data ? base64FromBytes(message.data) : ""; return obj; }, fromAminoMsg(object: QueryCodeResponseAminoMsg): QueryCodeResponse { @@ -2377,7 +2377,7 @@ export const QueryCodesResponse = { if (message.codeInfos) { obj.code_infos = message.codeInfos.map(e => e ? CodeInfoResponse.toAmino(e) : undefined); } else { - obj.code_infos = []; + obj.code_infos = message.codeInfos; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2596,7 +2596,7 @@ export const QueryPinnedCodesResponse = { if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/tx.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/tx.ts index bf8348d70a..255d69aefc 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/tx.ts @@ -455,7 +455,7 @@ export const MsgStoreCode = { }, toAmino(message: MsgStoreCode): MsgStoreCodeAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; return obj; @@ -549,7 +549,7 @@ export const MsgStoreCodeResponse = { }, toAmino(message: MsgStoreCodeResponse): MsgStoreCodeResponseAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgStoreCodeResponseAminoMsg): MsgStoreCodeResponse { @@ -722,15 +722,15 @@ export const MsgInstantiateContract = { }, 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.sender = message.sender === "" ? undefined : message.sender; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -836,7 +836,7 @@ export const MsgInstantiateContractResponse = { }, toAmino(message: MsgInstantiateContractResponse): MsgInstantiateContractResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -978,13 +978,13 @@ export const MsgExecuteContract = { }, toAmino(message: MsgExecuteContract): MsgExecuteContractAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -1212,9 +1212,9 @@ export const MsgMigrateContract = { }, 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.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1425,9 +1425,9 @@ export const MsgUpdateAdmin = { }, toAmino(message: MsgUpdateAdmin): MsgUpdateAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.new_admin = message.newAdmin; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: MsgUpdateAdminAminoMsg): MsgUpdateAdmin { @@ -1604,8 +1604,8 @@ export const MsgClearAdmin = { }, toAmino(message: MsgClearAdmin): MsgClearAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: MsgClearAdminAminoMsg): MsgClearAdmin { diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts index 1184878c13..ad2145018d 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts @@ -434,13 +434,13 @@ export const AccessTypeParam = { fromAmino(object: AccessTypeParamAmino): AccessTypeParam { const message = createBaseAccessTypeParam(); if (object.value !== undefined && object.value !== null) { - message.value = accessTypeFromJSON(object.value); + message.value = object.value; } return message; }, toAmino(message: AccessTypeParam): AccessTypeParamAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: AccessTypeParamAminoMsg): AccessTypeParam { @@ -536,7 +536,7 @@ export const AccessConfig = { fromAmino(object: AccessConfigAmino): AccessConfig { const message = createBaseAccessConfig(); if (object.permission !== undefined && object.permission !== null) { - message.permission = accessTypeFromJSON(object.permission); + message.permission = object.permission; } if (object.address !== undefined && object.address !== null) { message.address = object.address; @@ -545,8 +545,8 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.permission = message.permission; - obj.address = message.address; + obj.permission = message.permission === 0 ? undefined : message.permission; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -661,7 +661,7 @@ export const Params = { message.codeUploadAccess = AccessConfig.fromAmino(object.code_upload_access); } if (object.instantiate_default_permission !== undefined && object.instantiate_default_permission !== null) { - message.instantiateDefaultPermission = accessTypeFromJSON(object.instantiate_default_permission); + message.instantiateDefaultPermission = object.instantiate_default_permission; } if (object.max_wasm_code_size !== undefined && object.max_wasm_code_size !== null) { message.maxWasmCodeSize = BigInt(object.max_wasm_code_size); @@ -671,8 +671,8 @@ export const Params = { 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; + obj.instantiate_default_permission = message.instantiateDefaultPermission === 0 ? undefined : message.instantiateDefaultPermission; + obj.max_wasm_code_size = message.maxWasmCodeSize !== BigInt(0) ? message.maxWasmCodeSize.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -795,7 +795,7 @@ export const CodeInfo = { toAmino(message: CodeInfo): CodeInfoAmino { const obj: any = {}; obj.code_hash = message.codeHash ? base64FromBytes(message.codeHash) : undefined; - obj.creator = message.creator; + obj.creator = message.creator === "" ? undefined : message.creator; obj.instantiate_config = message.instantiateConfig ? AccessConfig.toAmino(message.instantiateConfig) : undefined; return obj; }, @@ -982,12 +982,12 @@ export const ContractInfo = { }, 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.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.creator = message.creator === "" ? undefined : message.creator; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.label = message.label === "" ? undefined : message.label; obj.created = message.created ? AbsoluteTxPosition.toAmino(message.created) : undefined; - obj.ibc_port_id = message.ibcPortId; + obj.ibc_port_id = message.ibcPortId === "" ? undefined : message.ibcPortId; obj.extension = message.extension ? ContractInfoExtension_ToAmino((message.extension as Any)) : undefined; return obj; }, @@ -1112,7 +1112,7 @@ export const ContractCodeHistoryEntry = { fromAmino(object: ContractCodeHistoryEntryAmino): ContractCodeHistoryEntry { const message = createBaseContractCodeHistoryEntry(); if (object.operation !== undefined && object.operation !== null) { - message.operation = contractCodeHistoryOperationTypeFromJSON(object.operation); + message.operation = object.operation; } if (object.code_id !== undefined && object.code_id !== null) { message.codeId = BigInt(object.code_id); @@ -1127,8 +1127,8 @@ export const ContractCodeHistoryEntry = { }, toAmino(message: ContractCodeHistoryEntry): ContractCodeHistoryEntryAmino { const obj: any = {}; - obj.operation = message.operation; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.operation = message.operation === 0 ? undefined : message.operation; + obj.code_id = message.codeId !== BigInt(0) ? 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; @@ -1239,8 +1239,8 @@ export const AbsoluteTxPosition = { }, 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; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; + obj.tx_index = message.txIndex !== BigInt(0) ? message.txIndex.toString() : undefined; return obj; }, fromAminoMsg(object: AbsoluteTxPositionAminoMsg): AbsoluteTxPosition { @@ -1379,7 +1379,7 @@ export const ContractInfoExtension_InterfaceDecoder = (input: BinaryReader | Uin return data; } }; -export const ContractInfoExtension_FromAmino = (content: AnyAmino) => { +export const ContractInfoExtension_FromAmino = (content: AnyAmino): Any => { return Any.fromAmino(content); }; export const ContractInfoExtension_ToAmino = (content: Any) => { diff --git a/__fixtures__/v-next/outputv2/evmos/claims/v1/claims.ts b/__fixtures__/v-next/outputv2/evmos/claims/v1/claims.ts index fff2a8946a..3b791f66b4 100644 --- a/__fixtures__/v-next/outputv2/evmos/claims/v1/claims.ts +++ b/__fixtures__/v-next/outputv2/evmos/claims/v1/claims.ts @@ -248,7 +248,7 @@ export const Claim = { fromAmino(object: ClaimAmino): Claim { const message = createBaseClaim(); if (object.action !== undefined && object.action !== null) { - message.action = actionFromJSON(object.action); + message.action = object.action; } if (object.completed !== undefined && object.completed !== null) { message.completed = object.completed; @@ -260,9 +260,9 @@ export const Claim = { }, toAmino(message: Claim): ClaimAmino { const obj: any = {}; - obj.action = message.action; - obj.completed = message.completed; - obj.claimable_amount = message.claimableAmount; + obj.action = message.action === 0 ? undefined : message.action; + obj.completed = message.completed === false ? undefined : message.completed; + obj.claimable_amount = message.claimableAmount === "" ? undefined : message.claimableAmount; return obj; }, fromAminoMsg(object: ClaimAminoMsg): Claim { @@ -390,12 +390,12 @@ export const ClaimsRecordAddress = { }, toAmino(message: ClaimsRecordAddress): ClaimsRecordAddressAmino { const obj: any = {}; - obj.address = message.address; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.address = message.address === "" ? undefined : message.address; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.actionsCompleted) { obj.actions_completed = message.actionsCompleted.map(e => e); } else { - obj.actions_completed = []; + obj.actions_completed = message.actionsCompleted; } return obj; }, @@ -509,11 +509,11 @@ export const ClaimsRecord = { }, toAmino(message: ClaimsRecord): ClaimsRecordAmino { const obj: any = {}; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.actionsCompleted) { obj.actions_completed = message.actionsCompleted.map(e => e); } else { - obj.actions_completed = []; + obj.actions_completed = message.actionsCompleted; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/evmos/claims/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/claims/v1/genesis.ts index 0ae3f2ff4e..9586e49a7e 100644 --- a/__fixtures__/v-next/outputv2/evmos/claims/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/claims/v1/genesis.ts @@ -180,7 +180,7 @@ export const GenesisState = { if (message.claimsRecords) { obj.claims_records = message.claimsRecords.map(e => e ? ClaimsRecordAddress.toAmino(e) : undefined); } else { - obj.claims_records = []; + obj.claims_records = message.claimsRecords; } return obj; }, @@ -370,20 +370,20 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_claims = message.enableClaims; + obj.enable_claims = message.enableClaims === false ? undefined : message.enableClaims; obj.airdrop_start_time = message.airdropStartTime ? Timestamp.toAmino(toTimestamp(message.airdropStartTime)) : undefined; 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; + obj.claims_denom = message.claimsDenom === "" ? undefined : message.claimsDenom; if (message.authorizedChannels) { obj.authorized_channels = message.authorizedChannels.map(e => e); } else { - obj.authorized_channels = []; + obj.authorized_channels = message.authorizedChannels; } if (message.evmChannels) { obj.evm_channels = message.evmChannels.map(e => e); } else { - obj.evm_channels = []; + obj.evm_channels = message.evmChannels; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/evmos/claims/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/claims/v1/query.ts index c71e15473c..ab3b4a0e62 100644 --- a/__fixtures__/v-next/outputv2/evmos/claims/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/claims/v1/query.ts @@ -367,7 +367,7 @@ export const QueryTotalUnclaimedResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -712,7 +712,7 @@ export const QueryClaimsRecordsResponse = { if (message.claims) { obj.claims = message.claims.map(e => e ? ClaimsRecordAddress.toAmino(e) : undefined); } else { - obj.claims = []; + obj.claims = message.claims; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -797,7 +797,7 @@ export const QueryClaimsRecordRequest = { }, toAmino(message: QueryClaimsRecordRequest): QueryClaimsRecordRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryClaimsRecordRequestAminoMsg): QueryClaimsRecordRequest { @@ -901,11 +901,11 @@ export const QueryClaimsRecordResponse = { }, toAmino(message: QueryClaimsRecordResponse): QueryClaimsRecordResponseAmino { const obj: any = {}; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.claims) { obj.claims = message.claims.map(e => e ? Claim.toAmino(e) : undefined); } else { - obj.claims = []; + obj.claims = message.claims; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/evmos/epochs/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/epochs/v1/genesis.ts index d8e6f58c9a..1a891aea0f 100644 --- a/__fixtures__/v-next/outputv2/evmos/epochs/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/epochs/v1/genesis.ts @@ -218,13 +218,13 @@ export const EpochInfo = { }, toAmino(message: EpochInfo): EpochInfoAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; obj.current_epoch_start_time = message.currentEpochStartTime ? Timestamp.toAmino(toTimestamp(message.currentEpochStartTime)) : undefined; - obj.epoch_counting_started = message.epochCountingStarted; - obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + obj.epoch_counting_started = message.epochCountingStarted === false ? undefined : message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight !== BigInt(0) ? message.currentEpochStartHeight.toString() : undefined; return obj; }, fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo { @@ -316,7 +316,7 @@ export const GenesisState = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/evmos/epochs/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/epochs/v1/query.ts index a9dc17c242..c3739ab17f 100644 --- a/__fixtures__/v-next/outputv2/evmos/epochs/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/epochs/v1/query.ts @@ -249,7 +249,7 @@ export const QueryEpochsInfoResponse = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -334,7 +334,7 @@ export const QueryCurrentEpochRequest = { }, toAmino(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; return obj; }, fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest { @@ -419,7 +419,7 @@ export const QueryCurrentEpochResponse = { }, toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { const obj: any = {}; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse { diff --git a/__fixtures__/v-next/outputv2/evmos/erc20/v1/erc20.ts b/__fixtures__/v-next/outputv2/evmos/erc20/v1/erc20.ts index 4645df90e7..20cb294eb0 100644 --- a/__fixtures__/v-next/outputv2/evmos/erc20/v1/erc20.ts +++ b/__fixtures__/v-next/outputv2/evmos/erc20/v1/erc20.ts @@ -322,16 +322,16 @@ export const TokenPair = { message.enabled = object.enabled; } if (object.contract_owner !== undefined && object.contract_owner !== null) { - message.contractOwner = ownerFromJSON(object.contract_owner); + message.contractOwner = object.contract_owner; } return message; }, 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; + obj.erc20_address = message.erc20Address === "" ? undefined : message.erc20Address; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.enabled = message.enabled === false ? undefined : message.enabled; + obj.contract_owner = message.contractOwner === 0 ? undefined : message.contractOwner; return obj; }, fromAminoMsg(object: TokenPairAminoMsg): TokenPair { @@ -446,8 +446,8 @@ export const RegisterCoinProposal = { }, toAmino(message: RegisterCoinProposal): RegisterCoinProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; }, @@ -561,9 +561,9 @@ export const RegisterERC20Proposal = { }, toAmino(message: RegisterERC20Proposal): RegisterERC20ProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.erc20address = message.erc20address; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.erc20address = message.erc20address === "" ? undefined : message.erc20address; return obj; }, fromAminoMsg(object: RegisterERC20ProposalAminoMsg): RegisterERC20Proposal { @@ -676,9 +676,9 @@ export const ToggleTokenConversionProposal = { }, toAmino(message: ToggleTokenConversionProposal): ToggleTokenConversionProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.token = message.token; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.token = message.token === "" ? undefined : message.token; return obj; }, fromAminoMsg(object: ToggleTokenConversionProposalAminoMsg): ToggleTokenConversionProposal { diff --git a/__fixtures__/v-next/outputv2/evmos/erc20/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/erc20/v1/genesis.ts index d2bed28455..107a248a43 100644 --- a/__fixtures__/v-next/outputv2/evmos/erc20/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/erc20/v1/genesis.ts @@ -155,7 +155,7 @@ export const GenesisState = { if (message.tokenPairs) { obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e) : undefined); } else { - obj.token_pairs = []; + obj.token_pairs = message.tokenPairs; } return obj; }, @@ -254,8 +254,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_erc20 = message.enableErc20; - obj.enable_evm_hook = message.enableEvmHook; + obj.enable_erc20 = message.enableErc20 === false ? undefined : message.enableErc20; + obj.enable_evm_hook = message.enableEvmHook === false ? undefined : message.enableEvmHook; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/evmos/erc20/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/erc20/v1/query.ts index 6982f5f5e5..aa118c5437 100644 --- a/__fixtures__/v-next/outputv2/evmos/erc20/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/erc20/v1/query.ts @@ -344,7 +344,7 @@ export const QueryTokenPairsResponse = { if (message.tokenPairs) { obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e) : undefined); } else { - obj.token_pairs = []; + obj.token_pairs = message.tokenPairs; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -429,7 +429,7 @@ export const QueryTokenPairRequest = { }, toAmino(message: QueryTokenPairRequest): QueryTokenPairRequestAmino { const obj: any = {}; - obj.token = message.token; + obj.token = message.token === "" ? undefined : message.token; return obj; }, fromAminoMsg(object: QueryTokenPairRequestAminoMsg): QueryTokenPairRequest { diff --git a/__fixtures__/v-next/outputv2/evmos/erc20/v1/tx.ts b/__fixtures__/v-next/outputv2/evmos/erc20/v1/tx.ts index dc899425cb..9554d5e0d9 100644 --- a/__fixtures__/v-next/outputv2/evmos/erc20/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/evmos/erc20/v1/tx.ts @@ -211,8 +211,8 @@ export const MsgConvertCoin = { toAmino(message: MsgConvertCoin): MsgConvertCoinAmino { const obj: any = {}; obj.coin = message.coin ? Coin.toAmino(message.coin) : undefined; - obj.receiver = message.receiver; - obj.sender = message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgConvertCoinAminoMsg): MsgConvertCoin { @@ -405,10 +405,10 @@ export const MsgConvertERC20 = { }, toAmino(message: MsgConvertERC20): MsgConvertERC20Amino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.amount = message.amount; - obj.receiver = message.receiver; - obj.sender = message.sender; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.receiver = message.receiver === "" ? undefined : message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgConvertERC20AminoMsg): MsgConvertERC20 { diff --git a/__fixtures__/v-next/outputv2/evmos/fees/v1/fees.ts b/__fixtures__/v-next/outputv2/evmos/fees/v1/fees.ts index 78efc5429f..6e2cd57f25 100644 --- a/__fixtures__/v-next/outputv2/evmos/fees/v1/fees.ts +++ b/__fixtures__/v-next/outputv2/evmos/fees/v1/fees.ts @@ -142,9 +142,9 @@ export const DevFeeInfo = { }, toAmino(message: DevFeeInfo): DevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: DevFeeInfoAminoMsg): DevFeeInfo { diff --git a/__fixtures__/v-next/outputv2/evmos/fees/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/fees/v1/genesis.ts index 779f81ae58..66321a80d1 100644 --- a/__fixtures__/v-next/outputv2/evmos/fees/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/fees/v1/genesis.ts @@ -181,7 +181,7 @@ export const GenesisState = { if (message.devFeeInfos) { obj.dev_fee_infos = message.devFeeInfos.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.dev_fee_infos = []; + obj.dev_fee_infos = message.devFeeInfos; } return obj; }, @@ -327,11 +327,11 @@ export const Params = { }, 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; + obj.enable_fees = message.enableFees === false ? undefined : message.enableFees; + obj.developer_shares = message.developerShares === "" ? undefined : message.developerShares; + obj.validator_shares = message.validatorShares === "" ? undefined : message.validatorShares; + obj.addr_derivation_cost_create = message.addrDerivationCostCreate !== BigInt(0) ? message.addrDerivationCostCreate.toString() : undefined; + obj.min_gas_price = message.minGasPrice === "" ? undefined : message.minGasPrice; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/evmos/fees/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/fees/v1/query.ts index b0eb10eafd..1874097e0b 100644 --- a/__fixtures__/v-next/outputv2/evmos/fees/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/fees/v1/query.ts @@ -417,7 +417,7 @@ export const QueryDevFeeInfosResponse = { if (message.fees) { obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.fees = []; + obj.fees = message.fees; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -502,7 +502,7 @@ export const QueryDevFeeInfoRequest = { }, toAmino(message: QueryDevFeeInfoRequest): QueryDevFeeInfoRequestAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; return obj; }, fromAminoMsg(object: QueryDevFeeInfoRequestAminoMsg): QueryDevFeeInfoRequest { @@ -837,7 +837,7 @@ export const QueryDevFeeInfosPerDeployerRequest = { }, toAmino(message: QueryDevFeeInfosPerDeployerRequest): QueryDevFeeInfosPerDeployerRequestAmino { const obj: any = {}; - obj.deployer_address = message.deployerAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -947,7 +947,7 @@ export const QueryDevFeeInfosPerDeployerResponse = { if (message.fees) { obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.fees = []; + obj.fees = message.fees; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/evmos/fees/v1/tx.ts b/__fixtures__/v-next/outputv2/evmos/fees/v1/tx.ts index 432e53b5b5..84b4c6d85a 100644 --- a/__fixtures__/v-next/outputv2/evmos/fees/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/evmos/fees/v1/tx.ts @@ -304,13 +304,13 @@ export const MsgRegisterDevFeeInfo = { }, toAmino(message: MsgRegisterDevFeeInfo): MsgRegisterDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; if (message.nonces) { obj.nonces = message.nonces.map(e => e.toString()); } else { - obj.nonces = []; + obj.nonces = message.nonces; } return obj; }, @@ -474,8 +474,8 @@ export const MsgCancelDevFeeInfo = { }, toAmino(message: MsgCancelDevFeeInfo): MsgCancelDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; return obj; }, fromAminoMsg(object: MsgCancelDevFeeInfoAminoMsg): MsgCancelDevFeeInfo { @@ -653,9 +653,9 @@ export const MsgUpdateDevFeeInfo = { }, toAmino(message: MsgUpdateDevFeeInfo): MsgUpdateDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: MsgUpdateDevFeeInfoAminoMsg): MsgUpdateDevFeeInfo { diff --git a/__fixtures__/v-next/outputv2/evmos/incentives/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/incentives/v1/genesis.ts index a655d549cc..9119333fd2 100644 --- a/__fixtures__/v-next/outputv2/evmos/incentives/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/incentives/v1/genesis.ts @@ -184,12 +184,12 @@ export const GenesisState = { if (message.incentives) { obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e) : undefined); } else { - obj.incentives = []; + obj.incentives = message.incentives; } if (message.gasMeters) { obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e) : undefined); } else { - obj.gas_meters = []; + obj.gas_meters = message.gasMeters; } return obj; }, @@ -318,10 +318,10 @@ export const Params = { }, 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; + obj.enable_incentives = message.enableIncentives === false ? undefined : message.enableIncentives; + obj.allocation_limit = message.allocationLimit === "" ? undefined : message.allocationLimit; + obj.incentives_epoch_identifier = message.incentivesEpochIdentifier === "" ? undefined : message.incentivesEpochIdentifier; + obj.reward_scaler = message.rewardScaler === "" ? undefined : message.rewardScaler; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/evmos/incentives/v1/incentives.ts b/__fixtures__/v-next/outputv2/evmos/incentives/v1/incentives.ts index ce0e501365..c60abe6554 100644 --- a/__fixtures__/v-next/outputv2/evmos/incentives/v1/incentives.ts +++ b/__fixtures__/v-next/outputv2/evmos/incentives/v1/incentives.ts @@ -294,15 +294,15 @@ export const Incentive = { }, toAmino(message: Incentive): IncentiveAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; if (message.allocations) { obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } - obj.epochs = message.epochs; + obj.epochs = message.epochs === 0 ? undefined : message.epochs; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.total_gas = message.totalGas ? message.totalGas.toString() : undefined; + obj.total_gas = message.totalGas !== BigInt(0) ? message.totalGas.toString() : undefined; return obj; }, fromAminoMsg(object: IncentiveAminoMsg): Incentive { @@ -417,9 +417,9 @@ export const GasMeter = { }, toAmino(message: GasMeter): GasMeterAmino { const obj: any = {}; - obj.contract = message.contract; - obj.participant = message.participant; - obj.cumulative_gas = message.cumulativeGas ? message.cumulativeGas.toString() : undefined; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.participant = message.participant === "" ? undefined : message.participant; + obj.cumulative_gas = message.cumulativeGas !== BigInt(0) ? message.cumulativeGas.toString() : undefined; return obj; }, fromAminoMsg(object: GasMeterAminoMsg): GasMeter { @@ -569,15 +569,15 @@ export const RegisterIncentiveProposal = { }, toAmino(message: RegisterIncentiveProposal): RegisterIncentiveProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; if (message.allocations) { obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } - obj.epochs = message.epochs; + obj.epochs = message.epochs === 0 ? undefined : message.epochs; return obj; }, fromAminoMsg(object: RegisterIncentiveProposalAminoMsg): RegisterIncentiveProposal { @@ -690,9 +690,9 @@ export const CancelIncentiveProposal = { }, toAmino(message: CancelIncentiveProposal): CancelIncentiveProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: CancelIncentiveProposalAminoMsg): CancelIncentiveProposal { diff --git a/__fixtures__/v-next/outputv2/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/incentives/v1/query.ts index ff84af4e53..68acf0c089 100644 --- a/__fixtures__/v-next/outputv2/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/incentives/v1/query.ts @@ -598,7 +598,7 @@ export const QueryIncentivesResponse = { if (message.incentives) { obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e) : undefined); } else { - obj.incentives = []; + obj.incentives = message.incentives; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -683,7 +683,7 @@ export const QueryIncentiveRequest = { }, toAmino(message: QueryIncentiveRequest): QueryIncentiveRequestAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: QueryIncentiveRequestAminoMsg): QueryIncentiveRequest { @@ -868,7 +868,7 @@ export const QueryGasMetersRequest = { }, toAmino(message: QueryGasMetersRequest): QueryGasMetersRequestAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -978,7 +978,7 @@ export const QueryGasMetersResponse = { if (message.gasMeters) { obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e) : undefined); } else { - obj.gas_meters = []; + obj.gas_meters = message.gasMeters; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1078,8 +1078,8 @@ export const QueryGasMeterRequest = { }, toAmino(message: QueryGasMeterRequest): QueryGasMeterRequestAmino { const obj: any = {}; - obj.contract = message.contract; - obj.participant = message.participant; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.participant = message.participant === "" ? undefined : message.participant; return obj; }, fromAminoMsg(object: QueryGasMeterRequestAminoMsg): QueryGasMeterRequest { @@ -1164,7 +1164,7 @@ export const QueryGasMeterResponse = { }, toAmino(message: QueryGasMeterResponse): QueryGasMeterResponseAmino { const obj: any = {}; - obj.gas_meter = message.gasMeter ? message.gasMeter.toString() : undefined; + obj.gas_meter = message.gasMeter !== BigInt(0) ? message.gasMeter.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGasMeterResponseAminoMsg): QueryGasMeterResponse { @@ -1358,7 +1358,7 @@ export const QueryAllocationMetersResponse = { if (message.allocationMeters) { obj.allocation_meters = message.allocationMeters.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocation_meters = []; + obj.allocation_meters = message.allocationMeters; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1443,7 +1443,7 @@ export const QueryAllocationMeterRequest = { }, toAmino(message: QueryAllocationMeterRequest): QueryAllocationMeterRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryAllocationMeterRequestAminoMsg): QueryAllocationMeterRequest { diff --git a/__fixtures__/v-next/outputv2/evmos/inflation/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/inflation/v1/genesis.ts index a1045679e6..dbde7cc429 100644 --- a/__fixtures__/v-next/outputv2/evmos/inflation/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/inflation/v1/genesis.ts @@ -214,10 +214,10 @@ export const GenesisState = { 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; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; + obj.epoch_identifier = message.epochIdentifier === "" ? undefined : message.epochIdentifier; + obj.epochs_per_period = message.epochsPerPeriod !== BigInt(0) ? message.epochsPerPeriod.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs !== BigInt(0) ? message.skippedEpochs.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -349,10 +349,10 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.mint_denom = message.mintDenom; + obj.mint_denom = message.mintDenom === "" ? undefined : 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; + obj.enable_inflation = message.enableInflation === false ? undefined : message.enableInflation; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/evmos/inflation/v1/inflation.ts b/__fixtures__/v-next/outputv2/evmos/inflation/v1/inflation.ts index a938090b48..4ebc1e4403 100644 --- a/__fixtures__/v-next/outputv2/evmos/inflation/v1/inflation.ts +++ b/__fixtures__/v-next/outputv2/evmos/inflation/v1/inflation.ts @@ -230,9 +230,9 @@ export const InflationDistribution = { }, toAmino(message: InflationDistribution): InflationDistributionAmino { const obj: any = {}; - obj.staking_rewards = message.stakingRewards; - obj.usage_incentives = message.usageIncentives; - obj.community_pool = message.communityPool; + obj.staking_rewards = message.stakingRewards === "" ? undefined : message.stakingRewards; + obj.usage_incentives = message.usageIncentives === "" ? undefined : message.usageIncentives; + obj.community_pool = message.communityPool === "" ? undefined : message.communityPool; return obj; }, fromAminoMsg(object: InflationDistributionAminoMsg): InflationDistribution { @@ -375,11 +375,11 @@ export const ExponentialCalculation = { }, 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; + obj.a = message.a === "" ? undefined : message.a; + obj.r = message.r === "" ? undefined : message.r; + obj.c = message.c === "" ? undefined : message.c; + obj.bonding_target = message.bondingTarget === "" ? undefined : message.bondingTarget; + obj.max_variance = message.maxVariance === "" ? undefined : message.maxVariance; return obj; }, fromAminoMsg(object: ExponentialCalculationAminoMsg): ExponentialCalculation { diff --git a/__fixtures__/v-next/outputv2/evmos/inflation/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/inflation/v1/query.ts index 36ebb0b9f4..8af6baec92 100644 --- a/__fixtures__/v-next/outputv2/evmos/inflation/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/inflation/v1/query.ts @@ -423,7 +423,7 @@ export const QueryPeriodResponse = { }, toAmino(message: QueryPeriodResponse): QueryPeriodResponseAmino { const obj: any = {}; - obj.period = message.period ? message.period.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPeriodResponseAminoMsg): QueryPeriodResponse { @@ -723,7 +723,7 @@ export const QuerySkippedEpochsResponse = { }, toAmino(message: QuerySkippedEpochsResponse): QuerySkippedEpochsResponseAmino { const obj: any = {}; - obj.skipped_epochs = message.skippedEpochs ? message.skippedEpochs.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs !== BigInt(0) ? message.skippedEpochs.toString() : undefined; return obj; }, fromAminoMsg(object: QuerySkippedEpochsResponseAminoMsg): QuerySkippedEpochsResponse { @@ -1021,7 +1021,7 @@ export const QueryInflationRateResponse = { }, toAmino(message: QueryInflationRateResponse): QueryInflationRateResponseAmino { const obj: any = {}; - obj.inflation_rate = message.inflationRate; + obj.inflation_rate = message.inflationRate === "" ? undefined : message.inflationRate; return obj; }, fromAminoMsg(object: QueryInflationRateResponseAminoMsg): QueryInflationRateResponse { diff --git a/__fixtures__/v-next/outputv2/evmos/recovery/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/recovery/v1/genesis.ts index 18480caca0..b33780129c 100644 --- a/__fixtures__/v-next/outputv2/evmos/recovery/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/recovery/v1/genesis.ts @@ -217,7 +217,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_recovery = message.enableRecovery; + obj.enable_recovery = message.enableRecovery === false ? undefined : message.enableRecovery; obj.packet_timeout_duration = message.packetTimeoutDuration ? Duration.toAmino(message.packetTimeoutDuration) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv2/evmos/vesting/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/vesting/v1/query.ts index 10eec89dbd..29121d546c 100644 --- a/__fixtures__/v-next/outputv2/evmos/vesting/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/vesting/v1/query.ts @@ -129,7 +129,7 @@ export const QueryBalancesRequest = { }, toAmino(message: QueryBalancesRequest): QueryBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryBalancesRequestAminoMsg): QueryBalancesRequest { @@ -263,17 +263,17 @@ export const QueryBalancesResponse = { if (message.locked) { obj.locked = message.locked.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.locked = []; + obj.locked = message.locked; } if (message.unvested) { obj.unvested = message.unvested.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.unvested = []; + obj.unvested = message.unvested; } if (message.vested) { obj.vested = message.vested.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.vested = []; + obj.vested = message.vested; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/evmos/vesting/v1/tx.ts b/__fixtures__/v-next/outputv2/evmos/vesting/v1/tx.ts index b30d093b68..1b1289e8de 100644 --- a/__fixtures__/v-next/outputv2/evmos/vesting/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/evmos/vesting/v1/tx.ts @@ -305,20 +305,20 @@ export const MsgCreateClawbackVestingAccount = { }, toAmino(message: MsgCreateClawbackVestingAccount): MsgCreateClawbackVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; if (message.lockupPeriods) { obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.lockup_periods = []; + obj.lockup_periods = message.lockupPeriods; } if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } - obj.merge = message.merge; + obj.merge = message.merge === false ? undefined : message.merge; return obj; }, fromAminoMsg(object: MsgCreateClawbackVestingAccountAminoMsg): MsgCreateClawbackVestingAccount { @@ -496,9 +496,9 @@ export const MsgClawback = { }, toAmino(message: MsgClawback): MsgClawbackAmino { const obj: any = {}; - obj.funder_address = message.funderAddress; - obj.account_address = message.accountAddress; - obj.dest_address = message.destAddress; + obj.funder_address = message.funderAddress === "" ? undefined : message.funderAddress; + obj.account_address = message.accountAddress === "" ? undefined : message.accountAddress; + obj.dest_address = message.destAddress === "" ? undefined : message.destAddress; return obj; }, fromAminoMsg(object: MsgClawbackAminoMsg): MsgClawback { diff --git a/__fixtures__/v-next/outputv2/evmos/vesting/v1/vesting.ts b/__fixtures__/v-next/outputv2/evmos/vesting/v1/vesting.ts index ff06859150..adc9dd265f 100644 --- a/__fixtures__/v-next/outputv2/evmos/vesting/v1/vesting.ts +++ b/__fixtures__/v-next/outputv2/evmos/vesting/v1/vesting.ts @@ -205,17 +205,17 @@ export const ClawbackVestingAccount = { toAmino(message: ClawbackVestingAccount): ClawbackVestingAccountAmino { const obj: any = {}; obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined; - obj.funder_address = message.funderAddress; + obj.funder_address = message.funderAddress === "" ? undefined : message.funderAddress; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; if (message.lockupPeriods) { obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.lockup_periods = []; + obj.lockup_periods = message.lockupPeriods; } if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/api/auth.ts b/__fixtures__/v-next/outputv2/google/api/auth.ts index a4638279cd..1c884a5e4b 100644 --- a/__fixtures__/v-next/outputv2/google/api/auth.ts +++ b/__fixtures__/v-next/outputv2/google/api/auth.ts @@ -685,12 +685,12 @@ export const Authentication = { if (message.rules) { obj.rules = message.rules.map(e => e ? AuthenticationRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } if (message.providers) { obj.providers = message.providers.map(e => e ? AuthProvider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } return obj; }, @@ -827,13 +827,13 @@ export const AuthenticationRule = { }, toAmino(message: AuthenticationRule): AuthenticationRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.oauth = message.oauth ? OAuthRequirements.toAmino(message.oauth) : undefined; - obj.allow_without_credential = message.allowWithoutCredential; + obj.allow_without_credential = message.allowWithoutCredential === false ? undefined : message.allowWithoutCredential; if (message.requirements) { obj.requirements = message.requirements.map(e => e ? AuthRequirement.toAmino(e) : undefined); } else { - obj.requirements = []; + obj.requirements = message.requirements; } return obj; }, @@ -947,9 +947,9 @@ export const JwtLocation = { }, toAmino(message: JwtLocation): JwtLocationAmino { const obj: any = {}; - obj.header = message.header; - obj.query = message.query; - obj.value_prefix = message.valuePrefix; + obj.header = message.header === null ? undefined : message.header; + obj.query = message.query === null ? undefined : message.query; + obj.value_prefix = message.valuePrefix === "" ? undefined : message.valuePrefix; return obj; }, fromAminoMsg(object: JwtLocationAminoMsg): JwtLocation { @@ -1113,15 +1113,15 @@ export const AuthProvider = { }, 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; + obj.id = message.id === "" ? undefined : message.id; + obj.issuer = message.issuer === "" ? undefined : message.issuer; + obj.jwks_uri = message.jwksUri === "" ? undefined : message.jwksUri; + obj.audiences = message.audiences === "" ? undefined : message.audiences; + obj.authorization_url = message.authorizationUrl === "" ? undefined : message.authorizationUrl; if (message.jwtLocations) { obj.jwt_locations = message.jwtLocations.map(e => e ? JwtLocation.toAmino(e) : undefined); } else { - obj.jwt_locations = []; + obj.jwt_locations = message.jwtLocations; } return obj; }, @@ -1205,7 +1205,7 @@ export const OAuthRequirements = { }, toAmino(message: OAuthRequirements): OAuthRequirementsAmino { const obj: any = {}; - obj.canonical_scopes = message.canonicalScopes; + obj.canonical_scopes = message.canonicalScopes === "" ? undefined : message.canonicalScopes; return obj; }, fromAminoMsg(object: OAuthRequirementsAminoMsg): OAuthRequirements { @@ -1303,8 +1303,8 @@ export const AuthRequirement = { }, toAmino(message: AuthRequirement): AuthRequirementAmino { const obj: any = {}; - obj.provider_id = message.providerId; - obj.audiences = message.audiences; + obj.provider_id = message.providerId === "" ? undefined : message.providerId; + obj.audiences = message.audiences === "" ? undefined : message.audiences; return obj; }, fromAminoMsg(object: AuthRequirementAminoMsg): AuthRequirement { diff --git a/__fixtures__/v-next/outputv2/google/api/backend.ts b/__fixtures__/v-next/outputv2/google/api/backend.ts index 19fabb83c8..a224ddfaaa 100644 --- a/__fixtures__/v-next/outputv2/google/api/backend.ts +++ b/__fixtures__/v-next/outputv2/google/api/backend.ts @@ -387,7 +387,7 @@ export const Backend = { if (message.rules) { obj.rules = message.rules.map(e => e ? BackendRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -576,7 +576,7 @@ export const BackendRule = { message.operationDeadline = object.operation_deadline; } if (object.path_translation !== undefined && object.path_translation !== null) { - message.pathTranslation = backendRule_PathTranslationFromJSON(object.path_translation); + message.pathTranslation = object.path_translation; } if (object.jwt_audience !== undefined && object.jwt_audience !== null) { message.jwtAudience = object.jwt_audience; @@ -591,15 +591,15 @@ export const BackendRule = { }, 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; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.address = message.address === "" ? undefined : message.address; + obj.deadline = message.deadline === 0 ? undefined : message.deadline; + obj.min_deadline = message.minDeadline === 0 ? undefined : message.minDeadline; + obj.operation_deadline = message.operationDeadline === 0 ? undefined : message.operationDeadline; + obj.path_translation = message.pathTranslation === 0 ? undefined : message.pathTranslation; + obj.jwt_audience = message.jwtAudience === null ? undefined : message.jwtAudience; + obj.disable_auth = message.disableAuth === null ? undefined : message.disableAuth; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: BackendRuleAminoMsg): BackendRule { diff --git a/__fixtures__/v-next/outputv2/google/api/billing.ts b/__fixtures__/v-next/outputv2/google/api/billing.ts index c9f9ea7cd4..eb87d747e8 100644 --- a/__fixtures__/v-next/outputv2/google/api/billing.ts +++ b/__fixtures__/v-next/outputv2/google/api/billing.ts @@ -253,7 +253,7 @@ export const Billing = { if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Billing_BillingDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -358,11 +358,11 @@ export const Billing_BillingDestination = { }, toAmino(message: Billing_BillingDestination): Billing_BillingDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.metrics) { obj.metrics = message.metrics.map(e => e); } else { - obj.metrics = []; + obj.metrics = message.metrics; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/api/config_change.ts b/__fixtures__/v-next/outputv2/google/api/config_change.ts index f0256558c2..8b64e582d4 100644 --- a/__fixtures__/v-next/outputv2/google/api/config_change.ts +++ b/__fixtures__/v-next/outputv2/google/api/config_change.ts @@ -323,21 +323,21 @@ export const ConfigChange = { message.newValue = object.new_value; } if (object.change_type !== undefined && object.change_type !== null) { - message.changeType = changeTypeFromJSON(object.change_type); + message.changeType = object.change_type; } message.advices = object.advices?.map(e => Advice.fromAmino(e)) || []; return message; }, 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; + obj.element = message.element === "" ? undefined : message.element; + obj.old_value = message.oldValue === "" ? undefined : message.oldValue; + obj.new_value = message.newValue === "" ? undefined : message.newValue; + obj.change_type = message.changeType === 0 ? undefined : message.changeType; if (message.advices) { obj.advices = message.advices.map(e => e ? Advice.toAmino(e) : undefined); } else { - obj.advices = []; + obj.advices = message.advices; } return obj; }, @@ -421,7 +421,7 @@ export const Advice = { }, toAmino(message: Advice): AdviceAmino { const obj: any = {}; - obj.description = message.description; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: AdviceAminoMsg): Advice { diff --git a/__fixtures__/v-next/outputv2/google/api/consumer.ts b/__fixtures__/v-next/outputv2/google/api/consumer.ts index 07585d027d..0bb95079bc 100644 --- a/__fixtures__/v-next/outputv2/google/api/consumer.ts +++ b/__fixtures__/v-next/outputv2/google/api/consumer.ts @@ -268,7 +268,7 @@ export const ProjectProperties = { if (message.properties) { obj.properties = message.properties.map(e => e ? Property.toAmino(e) : undefined); } else { - obj.properties = []; + obj.properties = message.properties; } return obj; }, @@ -373,7 +373,7 @@ export const Property = { message.name = object.name; } if (object.type !== undefined && object.type !== null) { - message.type = property_PropertyTypeFromJSON(object.type); + message.type = object.type; } if (object.description !== undefined && object.description !== null) { message.description = object.description; @@ -382,9 +382,9 @@ export const Property = { }, toAmino(message: Property): PropertyAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === 0 ? undefined : message.type; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: PropertyAminoMsg): Property { diff --git a/__fixtures__/v-next/outputv2/google/api/context.ts b/__fixtures__/v-next/outputv2/google/api/context.ts index 9465456742..b69e1b1baa 100644 --- a/__fixtures__/v-next/outputv2/google/api/context.ts +++ b/__fixtures__/v-next/outputv2/google/api/context.ts @@ -286,7 +286,7 @@ export const Context = { if (message.rules) { obj.rules = message.rules.map(e => e ? ContextRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -454,26 +454,26 @@ export const ContextRule = { }, toAmino(message: ContextRule): ContextRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; if (message.requested) { obj.requested = message.requested.map(e => e); } else { - obj.requested = []; + obj.requested = message.requested; } if (message.provided) { obj.provided = message.provided.map(e => e); } else { - obj.provided = []; + obj.provided = message.provided; } if (message.allowedRequestExtensions) { obj.allowed_request_extensions = message.allowedRequestExtensions.map(e => e); } else { - obj.allowed_request_extensions = []; + obj.allowed_request_extensions = message.allowedRequestExtensions; } if (message.allowedResponseExtensions) { obj.allowed_response_extensions = message.allowedResponseExtensions.map(e => e); } else { - obj.allowed_response_extensions = []; + obj.allowed_response_extensions = message.allowedResponseExtensions; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/api/control.ts b/__fixtures__/v-next/outputv2/google/api/control.ts index 1f4324da1f..b5f920ac04 100644 --- a/__fixtures__/v-next/outputv2/google/api/control.ts +++ b/__fixtures__/v-next/outputv2/google/api/control.ts @@ -105,7 +105,7 @@ export const Control = { }, toAmino(message: Control): ControlAmino { const obj: any = {}; - obj.environment = message.environment; + obj.environment = message.environment === "" ? undefined : message.environment; return obj; }, fromAminoMsg(object: ControlAminoMsg): Control { diff --git a/__fixtures__/v-next/outputv2/google/api/distribution.ts b/__fixtures__/v-next/outputv2/google/api/distribution.ts index 4112cbd951..c6a0f58c50 100644 --- a/__fixtures__/v-next/outputv2/google/api/distribution.ts +++ b/__fixtures__/v-next/outputv2/google/api/distribution.ts @@ -728,20 +728,20 @@ export const Distribution = { }, 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.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.mean = message.mean === 0 ? undefined : message.mean; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation === 0 ? undefined : 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 = []; + obj.bucket_counts = message.bucketCounts; } if (message.exemplars) { obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e) : undefined); } else { - obj.exemplars = []; + obj.exemplars = message.exemplars; } return obj; }, @@ -840,8 +840,8 @@ export const Distribution_Range = { }, toAmino(message: Distribution_Range): Distribution_RangeAmino { const obj: any = {}; - obj.min = message.min; - obj.max = message.max; + obj.min = message.min === 0 ? undefined : message.min; + obj.max = message.max === 0 ? undefined : message.max; return obj; }, fromAminoMsg(object: Distribution_RangeAminoMsg): Distribution_Range { @@ -1075,9 +1075,9 @@ export const Distribution_BucketOptions_Linear = { }, 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; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.width = message.width === 0 ? undefined : message.width; + obj.offset = message.offset === 0 ? undefined : message.offset; return obj; }, fromAminoMsg(object: Distribution_BucketOptions_LinearAminoMsg): Distribution_BucketOptions_Linear { @@ -1190,9 +1190,9 @@ export const Distribution_BucketOptions_Exponential = { }, 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; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.growth_factor = message.growthFactor === 0 ? undefined : message.growthFactor; + obj.scale = message.scale === 0 ? undefined : message.scale; return obj; }, fromAminoMsg(object: Distribution_BucketOptions_ExponentialAminoMsg): Distribution_BucketOptions_Exponential { @@ -1293,7 +1293,7 @@ export const Distribution_BucketOptions_Explicit = { if (message.bounds) { obj.bounds = message.bounds.map(e => e); } else { - obj.bounds = []; + obj.bounds = message.bounds; } return obj; }, @@ -1413,12 +1413,12 @@ export const Distribution_Exemplar = { }, toAmino(message: Distribution_Exemplar): Distribution_ExemplarAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; if (message.attachments) { obj.attachments = message.attachments.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.attachments = []; + obj.attachments = message.attachments; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/api/documentation.ts b/__fixtures__/v-next/outputv2/google/api/documentation.ts index ae7e32a44d..eec5516213 100644 --- a/__fixtures__/v-next/outputv2/google/api/documentation.ts +++ b/__fixtures__/v-next/outputv2/google/api/documentation.ts @@ -554,20 +554,20 @@ export const Documentation = { }, toAmino(message: Documentation): DocumentationAmino { const obj: any = {}; - obj.summary = message.summary; + obj.summary = message.summary === "" ? undefined : message.summary; if (message.pages) { obj.pages = message.pages.map(e => e ? Page.toAmino(e) : undefined); } else { - obj.pages = []; + obj.pages = message.pages; } if (message.rules) { obj.rules = message.rules.map(e => e ? DocumentationRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.documentation_root_url = message.documentationRootUrl; - obj.service_root_url = message.serviceRootUrl; - obj.overview = message.overview; + obj.documentation_root_url = message.documentationRootUrl === "" ? undefined : message.documentationRootUrl; + obj.service_root_url = message.serviceRootUrl === "" ? undefined : message.serviceRootUrl; + obj.overview = message.overview === "" ? undefined : message.overview; return obj; }, fromAminoMsg(object: DocumentationAminoMsg): Documentation { @@ -680,9 +680,9 @@ export const DocumentationRule = { }, toAmino(message: DocumentationRule): DocumentationRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.description = message.description; - obj.deprecation_description = message.deprecationDescription; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.description = message.description === "" ? undefined : message.description; + obj.deprecation_description = message.deprecationDescription === "" ? undefined : message.deprecationDescription; return obj; }, fromAminoMsg(object: DocumentationRuleAminoMsg): DocumentationRule { @@ -801,12 +801,12 @@ export const Page = { }, toAmino(message: Page): PageAmino { const obj: any = {}; - obj.name = message.name; - obj.content = message.content; + obj.name = message.name === "" ? undefined : message.name; + obj.content = message.content === "" ? undefined : message.content; if (message.subpages) { obj.subpages = message.subpages.map(e => e ? Page.toAmino(e) : undefined); } else { - obj.subpages = []; + obj.subpages = message.subpages; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/api/endpoint.ts b/__fixtures__/v-next/outputv2/google/api/endpoint.ts index cf46e69dd6..ae0081c3cb 100644 --- a/__fixtures__/v-next/outputv2/google/api/endpoint.ts +++ b/__fixtures__/v-next/outputv2/google/api/endpoint.ts @@ -249,14 +249,14 @@ export const Endpoint = { }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.aliases) { obj.aliases = message.aliases.map(e => e); } else { - obj.aliases = []; + obj.aliases = message.aliases; } - obj.target = message.target; - obj.allow_cors = message.allowCors; + obj.target = message.target === "" ? undefined : message.target; + obj.allow_cors = message.allowCors === false ? undefined : message.allowCors; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { 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 6345d34a1b..02dacb84c5 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 @@ -466,10 +466,10 @@ export const ParseRequest = { }, 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; + obj.cel_source = message.celSource === "" ? undefined : message.celSource; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.source_location = message.sourceLocation === "" ? undefined : message.sourceLocation; + obj.disable_macros = message.disableMacros === false ? undefined : message.disableMacros; return obj; }, fromAminoMsg(object: ParseRequestAminoMsg): ParseRequest { @@ -579,7 +579,7 @@ export const ParseResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -720,10 +720,10 @@ export const CheckRequest = { if (message.typeEnv) { obj.type_env = message.typeEnv.map(e => e ? Decl.toAmino(e) : undefined); } else { - obj.type_env = []; + obj.type_env = message.typeEnv; } - obj.container = message.container; - obj.no_std_env = message.noStdEnv; + obj.container = message.container === "" ? undefined : message.container; + obj.no_std_env = message.noStdEnv === false ? undefined : message.noStdEnv; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -833,7 +833,7 @@ export const CheckResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -933,7 +933,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -1106,7 +1106,7 @@ export const EvalRequest = { obj.bindings[k] = ExprValue.toAmino(v); }); } - obj.container = message.container; + obj.container = message.container === "" ? undefined : message.container; return obj; }, fromAminoMsg(object: EvalRequestAminoMsg): EvalRequest { @@ -1216,7 +1216,7 @@ export const EvalResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -1322,7 +1322,7 @@ export const IssueDetails = { fromAmino(object: IssueDetailsAmino): IssueDetails { const message = createBaseIssueDetails(); if (object.severity !== undefined && object.severity !== null) { - message.severity = issueDetails_SeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.position !== undefined && object.position !== null) { message.position = SourcePosition.fromAmino(object.position); @@ -1334,9 +1334,9 @@ export const IssueDetails = { }, toAmino(message: IssueDetails): IssueDetailsAmino { const obj: any = {}; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.position = message.position ? SourcePosition.toAmino(message.position) : undefined; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; return obj; }, fromAminoMsg(object: IssueDetailsAminoMsg): IssueDetails { 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 b72411b0bb..855ae6ef7a 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/checked.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/checked.ts @@ -980,7 +980,7 @@ export const CheckedExpr_ReferenceMapEntry = { }, toAmino(message: CheckedExpr_ReferenceMapEntry): CheckedExpr_ReferenceMapEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Reference.toAmino(message.value) : undefined; return obj; }, @@ -1076,7 +1076,7 @@ export const CheckedExpr_TypeMapEntry = { }, toAmino(message: CheckedExpr_TypeMapEntry): CheckedExpr_TypeMapEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Type.toAmino(message.value) : undefined; return obj; }, @@ -1307,7 +1307,7 @@ export const CheckedExpr = { }); } obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined; - obj.expr_version = message.exprVersion; + obj.expr_version = message.exprVersion === "" ? undefined : message.exprVersion; obj.expr = message.expr ? Expr.toAmino(message.expr) : undefined; return obj; }, @@ -1546,16 +1546,16 @@ export const Type = { message.dyn = Empty.fromAmino(object.dyn); } if (object.null !== undefined && object.null !== null) { - message.null = nullValueFromJSON(object.null); + message.null = object.null; } if (object.primitive !== undefined && object.primitive !== null) { - message.primitive = type_PrimitiveTypeFromJSON(object.primitive); + message.primitive = object.primitive; } if (object.wrapper !== undefined && object.wrapper !== null) { - message.wrapper = type_PrimitiveTypeFromJSON(object.wrapper); + message.wrapper = object.wrapper; } if (object.well_known !== undefined && object.well_known !== null) { - message.wellKnown = type_WellKnownTypeFromJSON(object.well_known); + message.wellKnown = object.well_known; } if (object.list_type !== undefined && object.list_type !== null) { message.listType = Type_ListType.fromAmino(object.list_type); @@ -1586,15 +1586,15 @@ export const Type = { 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.null = message.null === null ? undefined : message.null; + obj.primitive = message.primitive === null ? undefined : message.primitive; + obj.wrapper = message.wrapper === null ? undefined : message.wrapper; + obj.well_known = message.wellKnown === null ? undefined : 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.message_type = message.messageType === null ? undefined : message.messageType; + obj.type_param = message.typeParam === null ? undefined : 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; @@ -1895,7 +1895,7 @@ export const Type_FunctionType = { if (message.argTypes) { obj.arg_types = message.argTypes.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.arg_types = []; + obj.arg_types = message.argTypes; } return obj; }, @@ -2000,11 +2000,11 @@ export const Type_AbstractType = { }, toAmino(message: Type_AbstractType): Type_AbstractTypeAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.parameterTypes) { obj.parameter_types = message.parameterTypes.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.parameter_types = []; + obj.parameter_types = message.parameterTypes; } return obj; }, @@ -2122,7 +2122,7 @@ export const Decl = { }, toAmino(message: Decl): DeclAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.ident = message.ident ? Decl_IdentDecl.toAmino(message.ident) : undefined; obj.function = message.function ? Decl_FunctionDecl.toAmino(message.function) : undefined; return obj; @@ -2243,7 +2243,7 @@ export const Decl_IdentDecl = { 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; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromAminoMsg(object: Decl_IdentDeclAminoMsg): Decl_IdentDecl { @@ -2335,7 +2335,7 @@ export const Decl_FunctionDecl = { if (message.overloads) { obj.overloads = message.overloads.map(e => e ? Decl_FunctionDecl_Overload.toAmino(e) : undefined); } else { - obj.overloads = []; + obj.overloads = message.overloads; } return obj; }, @@ -2508,20 +2508,20 @@ export const Decl_FunctionDecl_Overload = { }, toAmino(message: Decl_FunctionDecl_Overload): Decl_FunctionDecl_OverloadAmino { const obj: any = {}; - obj.overload_id = message.overloadId; + obj.overload_id = message.overloadId === "" ? undefined : message.overloadId; if (message.params) { obj.params = message.params.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.params = []; + obj.params = message.params; } if (message.typeParams) { obj.type_params = message.typeParams.map(e => e); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } obj.result_type = message.resultType ? Type.toAmino(message.resultType) : undefined; - obj.is_instance_function = message.isInstanceFunction; - obj.doc = message.doc; + obj.is_instance_function = message.isInstanceFunction === false ? undefined : message.isInstanceFunction; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromAminoMsg(object: Decl_FunctionDecl_OverloadAminoMsg): Decl_FunctionDecl_Overload { @@ -2642,11 +2642,11 @@ export const Reference = { }, toAmino(message: Reference): ReferenceAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.overloadId) { obj.overload_id = message.overloadId.map(e => e); } else { - obj.overload_id = []; + obj.overload_id = message.overloadId; } obj.value = message.value ? Constant.toAmino(message.value) : undefined; return obj; 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 00d8473143..bafb00f608 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/eval.ts @@ -357,12 +357,12 @@ export const EvalState = { if (message.values) { obj.values = message.values.map(e => e ? ExprValue.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.results) { obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e) : undefined); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -465,8 +465,8 @@ export const EvalState_Result = { }, 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; + obj.expr = message.expr !== BigInt(0) ? message.expr.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result { @@ -679,7 +679,7 @@ export const ErrorSet = { if (message.errors) { obj.errors = message.errors.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.errors = []; + obj.errors = message.errors; } return obj; }, @@ -781,7 +781,7 @@ export const UnknownSet = { if (message.exprs) { obj.exprs = message.exprs.map(e => e.toString()); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, 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 aac21f1665..f74e21a5a8 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/explain.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/explain.ts @@ -184,12 +184,12 @@ export const Explain = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.exprSteps) { obj.expr_steps = message.exprSteps.map(e => e ? Explain_ExprStep.toAmino(e) : undefined); } else { - obj.expr_steps = []; + obj.expr_steps = message.exprSteps; } return obj; }, @@ -290,8 +290,8 @@ export const Explain_ExprStep = { }, toAmino(message: Explain_ExprStep): Explain_ExprStepAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.value_index = message.valueIndex; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.value_index = message.valueIndex === 0 ? undefined : message.valueIndex; return obj; }, fromAminoMsg(object: Explain_ExprStepAminoMsg): Explain_ExprStep { 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 837a709718..52826c4b29 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/syntax.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/syntax.ts @@ -1185,7 +1185,7 @@ export const Expr = { }, toAmino(message: Expr): ExprAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? 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; @@ -1275,7 +1275,7 @@ export const Expr_Ident = { }, toAmino(message: Expr_Ident): Expr_IdentAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident { @@ -1391,8 +1391,8 @@ export const Expr_Select = { 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; + obj.field = message.field === "" ? undefined : message.field; + obj.test_only = message.testOnly === false ? undefined : message.testOnly; return obj; }, fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select { @@ -1514,11 +1514,11 @@ export const Expr_Call = { toAmino(message: Expr_Call): Expr_CallAmino { const obj: any = {}; obj.target = message.target ? Expr.toAmino(message.target) : undefined; - obj.function = message.function; + obj.function = message.function === "" ? undefined : message.function; if (message.args) { obj.args = message.args.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } return obj; }, @@ -1611,7 +1611,7 @@ export const Expr_CreateList = { if (message.elements) { obj.elements = message.elements.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.elements = []; + obj.elements = message.elements; } return obj; }, @@ -1716,11 +1716,11 @@ export const Expr_CreateStruct = { }, toAmino(message: Expr_CreateStruct): Expr_CreateStructAmino { const obj: any = {}; - obj.message_name = message.messageName; + obj.message_name = message.messageName === "" ? undefined : message.messageName; if (message.entries) { obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1855,8 +1855,8 @@ export const Expr_CreateStruct_Entry = { }, 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.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.field_key = message.fieldKey === null ? undefined : message.fieldKey; obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; @@ -2041,9 +2041,9 @@ export const Expr_Comprehension = { }, toAmino(message: Expr_Comprehension): Expr_ComprehensionAmino { const obj: any = {}; - obj.iter_var = message.iterVar; + obj.iter_var = message.iterVar === "" ? undefined : message.iterVar; obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange) : undefined; - obj.accu_var = message.accuVar; + obj.accu_var = message.accuVar === "" ? undefined : 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; @@ -2230,7 +2230,7 @@ export const Constant = { fromAmino(object: ConstantAmino): Constant { const message = createBaseConstant(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -2260,12 +2260,12 @@ export const Constant = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; obj.duration_value = message.durationValue ? Duration.toAmino(message.durationValue) : undefined; obj.timestamp_value = message.timestampValue ? Timestamp.toAmino(toTimestamp(message.timestampValue)) : undefined; @@ -2367,8 +2367,8 @@ export const SourceInfo_PositionsEntry = { }, toAmino(message: SourceInfo_PositionsEntry): SourceInfo_PositionsEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; - obj.value = message.value; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry { @@ -2463,7 +2463,7 @@ export const SourceInfo_MacroCallsEntry = { }, toAmino(message: SourceInfo_MacroCallsEntry): SourceInfo_MacroCallsEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; }, @@ -2692,12 +2692,12 @@ export const SourceInfo = { }, toAmino(message: SourceInfo): SourceInfoAmino { const obj: any = {}; - obj.syntax_version = message.syntaxVersion; - obj.location = message.location; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -2838,10 +2838,10 @@ export const SourcePosition = { }, toAmino(message: SourcePosition): SourcePositionAmino { const obj: any = {}; - obj.location = message.location; - obj.offset = message.offset; - obj.line = message.line; - obj.column = message.column; + obj.location = message.location === "" ? undefined : message.location; + obj.offset = message.offset === 0 ? undefined : message.offset; + obj.line = message.line === 0 ? undefined : message.line; + obj.column = message.column === 0 ? undefined : message.column; return obj; }, fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition { 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 d29bd94835..dd048bf2ae 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/value.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/value.ts @@ -449,7 +449,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -488,18 +488,18 @@ export const 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; 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; + obj.type_value = message.typeValue === null ? undefined : message.typeValue; return obj; }, fromAminoMsg(object: ValueAminoMsg): Value { @@ -597,8 +597,8 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.type = message.type; - obj.value = message.value; + obj.type = message.type === "" ? undefined : message.type; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EnumValueAminoMsg): EnumValue { @@ -690,7 +690,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, @@ -783,7 +783,7 @@ export const MapValue = { if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, 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 bded2b0d10..266275bb30 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/decl.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/decl.ts @@ -284,9 +284,9 @@ export const Decl = { }, toAmino(message: Decl): DeclAmino { const obj: any = {}; - obj.id = message.id; - obj.name = message.name; - obj.doc = message.doc; + obj.id = message.id === 0 ? undefined : message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.doc = message.doc === "" ? undefined : message.doc; obj.ident = message.ident ? IdentDecl.toAmino(message.ident) : undefined; obj.function = message.function ? FunctionDecl.toAmino(message.function) : undefined; return obj; @@ -407,12 +407,12 @@ export const DeclType = { }, toAmino(message: DeclType): DeclTypeAmino { const obj: any = {}; - obj.id = message.id; - obj.type = message.type; + obj.id = message.id === 0 ? undefined : message.id; + obj.type = message.type === "" ? undefined : message.type; if (message.typeParams) { obj.type_params = message.typeParams.map(e => e ? DeclType.toAmino(e) : undefined); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } return obj; }, @@ -640,10 +640,10 @@ export const FunctionDecl = { if (message.args) { obj.args = message.args.map(e => e ? IdentDecl.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } obj.return_type = message.returnType ? DeclType.toAmino(message.returnType) : undefined; - obj.receiver_function = message.receiverFunction; + obj.receiver_function = message.receiverFunction === false ? undefined : message.receiverFunction; return obj; }, fromAminoMsg(object: FunctionDeclAminoMsg): FunctionDecl { 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 fa98fdb0ed..b68ee7a82e 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/eval.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/eval.ts @@ -379,12 +379,12 @@ export const EvalState = { if (message.values) { obj.values = message.values.map(e => e ? ExprValue.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.results) { obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e) : undefined); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -486,7 +486,7 @@ export const EvalState_Result = { toAmino(message: EvalState_Result): EvalState_ResultAmino { const obj: any = {}; obj.expr = message.expr ? IdRef.toAmino(message.expr) : undefined; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result { @@ -699,7 +699,7 @@ export const ErrorSet = { if (message.errors) { obj.errors = message.errors.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.errors = []; + obj.errors = message.errors; } return obj; }, @@ -792,7 +792,7 @@ export const UnknownSet = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -876,7 +876,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { 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 949dd6c1b0..f81d2d06a9 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/expr.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/expr.ts @@ -770,7 +770,7 @@ export const ParsedExpr = { 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; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; return obj; }, fromAminoMsg(object: ParsedExprAminoMsg): ParsedExpr { @@ -972,7 +972,7 @@ export const Expr = { }, toAmino(message: Expr): ExprAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : 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; @@ -1062,7 +1062,7 @@ export const Expr_Ident = { }, toAmino(message: Expr_Ident): Expr_IdentAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident { @@ -1178,8 +1178,8 @@ export const Expr_Select = { 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; + obj.field = message.field === "" ? undefined : message.field; + obj.test_only = message.testOnly === false ? undefined : message.testOnly; return obj; }, fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select { @@ -1301,11 +1301,11 @@ export const Expr_Call = { toAmino(message: Expr_Call): Expr_CallAmino { const obj: any = {}; obj.target = message.target ? Expr.toAmino(message.target) : undefined; - obj.function = message.function; + obj.function = message.function === "" ? undefined : message.function; if (message.args) { obj.args = message.args.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } return obj; }, @@ -1398,7 +1398,7 @@ export const Expr_CreateList = { if (message.elements) { obj.elements = message.elements.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.elements = []; + obj.elements = message.elements; } return obj; }, @@ -1503,11 +1503,11 @@ export const Expr_CreateStruct = { }, toAmino(message: Expr_CreateStruct): Expr_CreateStructAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.entries) { obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1640,8 +1640,8 @@ export const Expr_CreateStruct_Entry = { }, toAmino(message: Expr_CreateStruct_Entry): Expr_CreateStruct_EntryAmino { const obj: any = {}; - obj.id = message.id; - obj.field_key = message.fieldKey; + obj.id = message.id === 0 ? undefined : message.id; + obj.field_key = message.fieldKey === null ? undefined : message.fieldKey; obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; @@ -1826,9 +1826,9 @@ export const Expr_Comprehension = { }, toAmino(message: Expr_Comprehension): Expr_ComprehensionAmino { const obj: any = {}; - obj.iter_var = message.iterVar; + obj.iter_var = message.iterVar === "" ? undefined : message.iterVar; obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange) : undefined; - obj.accu_var = message.accuVar; + obj.accu_var = message.accuVar === "" ? undefined : 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; @@ -1989,7 +1989,7 @@ export const Literal = { fromAmino(object: LiteralAmino): Literal { const message = createBaseLiteral(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -2013,12 +2013,12 @@ export const Literal = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; return obj; }, 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 2cc6bf097c..3ed503ee7f 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/source.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/source.ts @@ -216,8 +216,8 @@ export const SourceInfo_PositionsEntry = { }, toAmino(message: SourceInfo_PositionsEntry): SourceInfo_PositionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === 0 ? undefined : message.key; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry { @@ -377,11 +377,11 @@ export const SourceInfo = { }, toAmino(message: SourceInfo): SourceInfoAmino { const obj: any = {}; - obj.location = message.location; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -516,10 +516,10 @@ export const SourcePosition = { }, toAmino(message: SourcePosition): SourcePositionAmino { const obj: any = {}; - obj.location = message.location; - obj.offset = message.offset; - obj.line = message.line; - obj.column = message.column; + obj.location = message.location === "" ? undefined : message.location; + obj.offset = message.offset === 0 ? undefined : message.offset; + obj.line = message.line === 0 ? undefined : message.line; + obj.column = message.column === 0 ? undefined : message.column; return obj; }, fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition { 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 0c9d8b877a..3bf3a9e655 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/value.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/value.ts @@ -449,7 +449,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -488,18 +488,18 @@ export const 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; 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; + obj.type_value = message.typeValue === null ? undefined : message.typeValue; return obj; }, fromAminoMsg(object: ValueAminoMsg): Value { @@ -597,8 +597,8 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.type = message.type; - obj.value = message.value; + obj.type = message.type === "" ? undefined : message.type; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EnumValueAminoMsg): EnumValue { @@ -690,7 +690,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, @@ -783,7 +783,7 @@ export const MapValue = { if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/api/http.ts b/__fixtures__/v-next/outputv2/google/api/http.ts index 3056017e6b..8f57c8271c 100644 --- a/__fixtures__/v-next/outputv2/google/api/http.ts +++ b/__fixtures__/v-next/outputv2/google/api/http.ts @@ -1114,9 +1114,9 @@ export const Http = { if (message.rules) { obj.rules = message.rules.map(e => e ? HttpRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion; + obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion === false ? undefined : message.fullyDecodeReservedExpansion; return obj; }, fromAminoMsg(object: HttpAminoMsg): Http { @@ -1342,19 +1342,19 @@ export const HttpRule = { }, 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.selector = message.selector === "" ? undefined : message.selector; + obj.get = message.get === null ? undefined : message.get; + obj.put = message.put === null ? undefined : message.put; + obj.post = message.post === null ? undefined : message.post; + obj.delete = message.delete === null ? undefined : message.delete; + obj.patch = message.patch === null ? undefined : message.patch; obj.custom = message.custom ? CustomHttpPattern.toAmino(message.custom) : undefined; - obj.body = message.body; - obj.response_body = message.responseBody; + obj.body = message.body === "" ? undefined : message.body; + obj.response_body = message.responseBody === "" ? undefined : message.responseBody; if (message.additionalBindings) { obj.additional_bindings = message.additionalBindings.map(e => e ? HttpRule.toAmino(e) : undefined); } else { - obj.additional_bindings = []; + obj.additional_bindings = message.additionalBindings; } return obj; }, @@ -1453,8 +1453,8 @@ export const CustomHttpPattern = { }, toAmino(message: CustomHttpPattern): CustomHttpPatternAmino { const obj: any = {}; - obj.kind = message.kind; - obj.path = message.path; + obj.kind = message.kind === "" ? undefined : message.kind; + obj.path = message.path === "" ? undefined : message.path; return obj; }, fromAminoMsg(object: CustomHttpPatternAminoMsg): CustomHttpPattern { diff --git a/__fixtures__/v-next/outputv2/google/api/httpbody.ts b/__fixtures__/v-next/outputv2/google/api/httpbody.ts index 17df108f65..593bce9a59 100644 --- a/__fixtures__/v-next/outputv2/google/api/httpbody.ts +++ b/__fixtures__/v-next/outputv2/google/api/httpbody.ts @@ -272,12 +272,12 @@ export const HttpBody = { }, toAmino(message: HttpBody): HttpBodyAmino { const obj: any = {}; - obj.content_type = message.contentType; + obj.content_type = message.contentType === "" ? undefined : message.contentType; obj.data = message.data ? base64FromBytes(message.data) : undefined; if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/api/label.ts b/__fixtures__/v-next/outputv2/google/api/label.ts index 45cbfc5569..abc4ce89cf 100644 --- a/__fixtures__/v-next/outputv2/google/api/label.ts +++ b/__fixtures__/v-next/outputv2/google/api/label.ts @@ -160,7 +160,7 @@ export const LabelDescriptor = { message.key = object.key; } if (object.value_type !== undefined && object.value_type !== null) { - message.valueType = labelDescriptor_ValueTypeFromJSON(object.value_type); + message.valueType = object.value_type; } if (object.description !== undefined && object.description !== null) { message.description = object.description; @@ -169,9 +169,9 @@ export const LabelDescriptor = { }, toAmino(message: LabelDescriptor): LabelDescriptorAmino { const obj: any = {}; - obj.key = message.key; - obj.value_type = message.valueType; - obj.description = message.description; + obj.key = message.key === "" ? undefined : message.key; + obj.value_type = message.valueType === 0 ? undefined : message.valueType; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: LabelDescriptorAminoMsg): LabelDescriptor { diff --git a/__fixtures__/v-next/outputv2/google/api/log.ts b/__fixtures__/v-next/outputv2/google/api/log.ts index 695e5a4755..824760a552 100644 --- a/__fixtures__/v-next/outputv2/google/api/log.ts +++ b/__fixtures__/v-next/outputv2/google/api/log.ts @@ -211,14 +211,14 @@ export const LogDescriptor = { }, toAmino(message: LogDescriptor): LogDescriptorAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.labels; } - obj.description = message.description; - obj.display_name = message.displayName; + obj.description = message.description === "" ? undefined : message.description; + obj.display_name = message.displayName === "" ? undefined : message.displayName; return obj; }, fromAminoMsg(object: LogDescriptorAminoMsg): LogDescriptor { diff --git a/__fixtures__/v-next/outputv2/google/api/logging.ts b/__fixtures__/v-next/outputv2/google/api/logging.ts index adeff6aed6..13a9b26981 100644 --- a/__fixtures__/v-next/outputv2/google/api/logging.ts +++ b/__fixtures__/v-next/outputv2/google/api/logging.ts @@ -284,12 +284,12 @@ export const Logging = { if (message.producerDestinations) { obj.producer_destinations = message.producerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e) : undefined); } else { - obj.producer_destinations = []; + obj.producer_destinations = message.producerDestinations; } if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -394,11 +394,11 @@ export const Logging_LoggingDestination = { }, toAmino(message: Logging_LoggingDestination): Logging_LoggingDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.logs) { obj.logs = message.logs.map(e => e); } else { - obj.logs = []; + obj.logs = message.logs; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/api/metric.ts b/__fixtures__/v-next/outputv2/google/api/metric.ts index 5cced3c178..1de3496f0c 100644 --- a/__fixtures__/v-next/outputv2/google/api/metric.ts +++ b/__fixtures__/v-next/outputv2/google/api/metric.ts @@ -825,10 +825,10 @@ export const MetricDescriptor = { } message.labels = object.labels?.map(e => LabelDescriptor.fromAmino(e)) || []; if (object.metric_kind !== undefined && object.metric_kind !== null) { - message.metricKind = metricDescriptor_MetricKindFromJSON(object.metric_kind); + message.metricKind = object.metric_kind; } if (object.value_type !== undefined && object.value_type !== null) { - message.valueType = metricDescriptor_ValueTypeFromJSON(object.value_type); + message.valueType = object.value_type; } if (object.unit !== undefined && object.unit !== null) { message.unit = object.unit; @@ -843,31 +843,31 @@ export const MetricDescriptor = { message.metadata = MetricDescriptor_MetricDescriptorMetadata.fromAmino(object.metadata); } if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } message.monitoredResourceTypes = object.monitored_resource_types?.map(e => e) || []; return message; }, toAmino(message: MetricDescriptor): MetricDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.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.metric_kind = message.metricKind === 0 ? undefined : message.metricKind; + obj.value_type = message.valueType === 0 ? undefined : message.valueType; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.description = message.description === "" ? undefined : message.description; + obj.display_name = message.displayName === "" ? undefined : message.displayName; obj.metadata = message.metadata ? MetricDescriptor_MetricDescriptorMetadata.toAmino(message.metadata) : undefined; - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; if (message.monitoredResourceTypes) { obj.monitored_resource_types = message.monitoredResourceTypes.map(e => e); } else { - obj.monitored_resource_types = []; + obj.monitored_resource_types = message.monitoredResourceTypes; } return obj; }, @@ -973,7 +973,7 @@ export const MetricDescriptor_MetricDescriptorMetadata = { fromAmino(object: MetricDescriptor_MetricDescriptorMetadataAmino): MetricDescriptor_MetricDescriptorMetadata { const message = createBaseMetricDescriptor_MetricDescriptorMetadata(); if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } if (object.sample_period !== undefined && object.sample_period !== null) { message.samplePeriod = Duration.fromAmino(object.sample_period); @@ -985,7 +985,7 @@ export const MetricDescriptor_MetricDescriptorMetadata = { }, toAmino(message: MetricDescriptor_MetricDescriptorMetadata): MetricDescriptor_MetricDescriptorMetadataAmino { const obj: any = {}; - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; obj.sample_period = message.samplePeriod ? Duration.toAmino(message.samplePeriod) : undefined; obj.ingest_delay = message.ingestDelay ? Duration.toAmino(message.ingestDelay) : undefined; return obj; @@ -1084,8 +1084,8 @@ export const Metric_LabelsEntry = { }, toAmino(message: Metric_LabelsEntry): Metric_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: Metric_LabelsEntryAminoMsg): Metric_LabelsEntry { @@ -1215,7 +1215,7 @@ export const Metric = { }, toAmino(message: Metric): MetricAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { diff --git a/__fixtures__/v-next/outputv2/google/api/monitored_resource.ts b/__fixtures__/v-next/outputv2/google/api/monitored_resource.ts index 3bd06ce883..8ca342961c 100644 --- a/__fixtures__/v-next/outputv2/google/api/monitored_resource.ts +++ b/__fixtures__/v-next/outputv2/google/api/monitored_resource.ts @@ -471,22 +471,22 @@ export const MonitoredResourceDescriptor = { } message.labels = object.labels?.map(e => LabelDescriptor.fromAmino(e)) || []; if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } return message; }, toAmino(message: MonitoredResourceDescriptor): MonitoredResourceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.display_name = message.displayName; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; + obj.display_name = message.displayName === "" ? undefined : message.displayName; + obj.description = message.description === "" ? undefined : message.description; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.labels; } - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; return obj; }, fromAminoMsg(object: MonitoredResourceDescriptorAminoMsg): MonitoredResourceDescriptor { @@ -583,8 +583,8 @@ export const MonitoredResource_LabelsEntry = { }, toAmino(message: MonitoredResource_LabelsEntry): MonitoredResource_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MonitoredResource_LabelsEntryAminoMsg): MonitoredResource_LabelsEntry { @@ -714,7 +714,7 @@ export const MonitoredResource = { }, toAmino(message: MonitoredResource): MonitoredResourceAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -817,8 +817,8 @@ export const MonitoredResourceMetadata_UserLabelsEntry = { }, toAmino(message: MonitoredResourceMetadata_UserLabelsEntry): MonitoredResourceMetadata_UserLabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MonitoredResourceMetadata_UserLabelsEntryAminoMsg): MonitoredResourceMetadata_UserLabelsEntry { diff --git a/__fixtures__/v-next/outputv2/google/api/monitoring.ts b/__fixtures__/v-next/outputv2/google/api/monitoring.ts index 3769435e31..d9cecb3dd1 100644 --- a/__fixtures__/v-next/outputv2/google/api/monitoring.ts +++ b/__fixtures__/v-next/outputv2/google/api/monitoring.ts @@ -357,12 +357,12 @@ export const Monitoring = { if (message.producerDestinations) { obj.producer_destinations = message.producerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e) : undefined); } else { - obj.producer_destinations = []; + obj.producer_destinations = message.producerDestinations; } if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -467,11 +467,11 @@ export const Monitoring_MonitoringDestination = { }, toAmino(message: Monitoring_MonitoringDestination): Monitoring_MonitoringDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.metrics) { obj.metrics = message.metrics.map(e => e); } else { - obj.metrics = []; + obj.metrics = message.metrics; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/api/quota.ts b/__fixtures__/v-next/outputv2/google/api/quota.ts index adc47f9b0b..1b475f18c8 100644 --- a/__fixtures__/v-next/outputv2/google/api/quota.ts +++ b/__fixtures__/v-next/outputv2/google/api/quota.ts @@ -603,12 +603,12 @@ export const Quota = { if (message.limits) { obj.limits = message.limits.map(e => e ? QuotaLimit.toAmino(e) : undefined); } else { - obj.limits = []; + obj.limits = message.limits; } if (message.metricRules) { obj.metric_rules = message.metricRules.map(e => e ? MetricRule.toAmino(e) : undefined); } else { - obj.metric_rules = []; + obj.metric_rules = message.metricRules; } return obj; }, @@ -708,8 +708,8 @@ export const MetricRule_MetricCostsEntry = { }, toAmino(message: MetricRule_MetricCostsEntry): MetricRule_MetricCostsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value ? message.value.toString() : undefined; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: MetricRule_MetricCostsEntryAminoMsg): MetricRule_MetricCostsEntry { @@ -839,7 +839,7 @@ export const MetricRule = { }, toAmino(message: MetricRule): MetricRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.metric_costs = {}; if (message.metricCosts) { Object.entries(message.metricCosts).forEach(([k, v]) => { @@ -944,8 +944,8 @@ export const QuotaLimit_ValuesEntry = { }, toAmino(message: QuotaLimit_ValuesEntry): QuotaLimit_ValuesEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value ? message.value.toString() : undefined; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: QuotaLimit_ValuesEntryAminoMsg): QuotaLimit_ValuesEntry { @@ -1201,21 +1201,21 @@ export const QuotaLimit = { }, 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.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.default_limit = message.defaultLimit !== BigInt(0) ? message.defaultLimit.toString() : undefined; + obj.max_limit = message.maxLimit !== BigInt(0) ? message.maxLimit.toString() : undefined; + obj.free_tier = message.freeTier !== BigInt(0) ? message.freeTier.toString() : undefined; + obj.duration = message.duration === "" ? undefined : message.duration; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; obj.values = {}; if (message.values) { Object.entries(message.values).forEach(([k, v]) => { obj.values[k] = v.toString(); }); } - obj.display_name = message.displayName; + obj.display_name = message.displayName === "" ? undefined : message.displayName; return obj; }, fromAminoMsg(object: QuotaLimitAminoMsg): QuotaLimit { diff --git a/__fixtures__/v-next/outputv2/google/api/resource.ts b/__fixtures__/v-next/outputv2/google/api/resource.ts index c2c9f57ff4..b4ae56439b 100644 --- a/__fixtures__/v-next/outputv2/google/api/resource.ts +++ b/__fixtures__/v-next/outputv2/google/api/resource.ts @@ -691,7 +691,7 @@ export const ResourceDescriptor = { message.nameField = object.name_field; } if (object.history !== undefined && object.history !== null) { - message.history = resourceDescriptor_HistoryFromJSON(object.history); + message.history = object.history; } if (object.plural !== undefined && object.plural !== null) { message.plural = object.plural; @@ -699,25 +699,25 @@ export const ResourceDescriptor = { if (object.singular !== undefined && object.singular !== null) { message.singular = object.singular; } - message.style = object.style?.map(e => resourceDescriptor_StyleFromJSON(e)) || []; + message.style = object.style?.map(e => e) || []; return message; }, toAmino(message: ResourceDescriptor): ResourceDescriptorAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.pattern) { obj.pattern = message.pattern.map(e => e); } else { - obj.pattern = []; + obj.pattern = message.pattern; } - obj.name_field = message.nameField; - obj.history = message.history; - obj.plural = message.plural; - obj.singular = message.singular; + obj.name_field = message.nameField === "" ? undefined : message.nameField; + obj.history = message.history === 0 ? undefined : message.history; + obj.plural = message.plural === "" ? undefined : message.plural; + obj.singular = message.singular === "" ? undefined : message.singular; if (message.style) { obj.style = message.style.map(e => e); } else { - obj.style = []; + obj.style = message.style; } return obj; }, @@ -816,8 +816,8 @@ export const ResourceReference = { }, toAmino(message: ResourceReference): ResourceReferenceAmino { const obj: any = {}; - obj.type = message.type; - obj.child_type = message.childType; + obj.type = message.type === "" ? undefined : message.type; + obj.child_type = message.childType === "" ? undefined : message.childType; return obj; }, fromAminoMsg(object: ResourceReferenceAminoMsg): ResourceReference { diff --git a/__fixtures__/v-next/outputv2/google/api/routing.ts b/__fixtures__/v-next/outputv2/google/api/routing.ts index b0689bb492..70ba596532 100644 --- a/__fixtures__/v-next/outputv2/google/api/routing.ts +++ b/__fixtures__/v-next/outputv2/google/api/routing.ts @@ -1327,7 +1327,7 @@ export const RoutingRule = { if (message.routingParameters) { obj.routing_parameters = message.routingParameters.map(e => e ? RoutingParameter.toAmino(e) : undefined); } else { - obj.routing_parameters = []; + obj.routing_parameters = message.routingParameters; } return obj; }, @@ -1426,8 +1426,8 @@ export const RoutingParameter = { }, toAmino(message: RoutingParameter): RoutingParameterAmino { const obj: any = {}; - obj.field = message.field; - obj.path_template = message.pathTemplate; + obj.field = message.field === "" ? undefined : message.field; + obj.path_template = message.pathTemplate === "" ? undefined : message.pathTemplate; return obj; }, fromAminoMsg(object: RoutingParameterAminoMsg): RoutingParameter { diff --git a/__fixtures__/v-next/outputv2/google/api/service.ts b/__fixtures__/v-next/outputv2/google/api/service.ts index 9efd3dcba9..abb7aafc14 100644 --- a/__fixtures__/v-next/outputv2/google/api/service.ts +++ b/__fixtures__/v-next/outputv2/google/api/service.ts @@ -819,24 +819,24 @@ export const Service = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; + obj.id = message.id === "" ? undefined : message.id; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } if (message.types) { obj.types = message.types.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.types = []; + obj.types = message.types; } if (message.enums) { obj.enums = message.enums.map(e => e ? Enum.toAmino(e) : undefined); } else { - obj.enums = []; + obj.enums = message.enums; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.backend = message.backend ? Backend.toAmino(message.backend) : undefined; @@ -848,23 +848,23 @@ export const Service = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.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 = []; + obj.logs = message.logs; } if (message.metrics) { obj.metrics = message.metrics.map(e => e ? MetricDescriptor.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.billing = message.billing ? Billing.toAmino(message.billing) : undefined; obj.logging = message.logging ? Logging.toAmino(message.logging) : undefined; 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 c730e4dc14..bc834d55a2 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 @@ -355,7 +355,7 @@ export const CheckError = { fromAmino(object: CheckErrorAmino): CheckError { const message = createBaseCheckError(); if (object.code !== undefined && object.code !== null) { - message.code = checkError_CodeFromJSON(object.code); + message.code = object.code; } if (object.subject !== undefined && object.subject !== null) { message.subject = object.subject; @@ -370,9 +370,9 @@ export const CheckError = { }, toAmino(message: CheckError): CheckErrorAmino { const obj: any = {}; - obj.code = message.code; - obj.subject = message.subject; - obj.detail = message.detail; + obj.code = message.code === 0 ? undefined : message.code; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.detail = message.detail === "" ? undefined : message.detail; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, 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 800e9775c2..8192f0ef58 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/distribution.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/distribution.ts @@ -536,15 +536,15 @@ export const Distribution = { }, 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; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.mean = message.mean === 0 ? undefined : message.mean; + obj.minimum = message.minimum === 0 ? undefined : message.minimum; + obj.maximum = message.maximum === 0 ? undefined : message.maximum; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation === 0 ? undefined : message.sumOfSquaredDeviation; if (message.bucketCounts) { obj.bucket_counts = message.bucketCounts.map(e => e.toString()); } else { - obj.bucket_counts = []; + obj.bucket_counts = message.bucketCounts; } obj.linear_buckets = message.linearBuckets ? Distribution_LinearBuckets.toAmino(message.linearBuckets) : undefined; obj.exponential_buckets = message.exponentialBuckets ? Distribution_ExponentialBuckets.toAmino(message.exponentialBuckets) : undefined; @@ -552,7 +552,7 @@ export const Distribution = { if (message.exemplars) { obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e) : undefined); } else { - obj.exemplars = []; + obj.exemplars = message.exemplars; } return obj; }, @@ -666,9 +666,9 @@ export const Distribution_LinearBuckets = { }, toAmino(message: Distribution_LinearBuckets): Distribution_LinearBucketsAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.width = message.width; - obj.offset = message.offset; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.width = message.width === 0 ? undefined : message.width; + obj.offset = message.offset === 0 ? undefined : message.offset; return obj; }, fromAminoMsg(object: Distribution_LinearBucketsAminoMsg): Distribution_LinearBuckets { @@ -781,9 +781,9 @@ export const Distribution_ExponentialBuckets = { }, toAmino(message: Distribution_ExponentialBuckets): Distribution_ExponentialBucketsAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.growth_factor = message.growthFactor; - obj.scale = message.scale; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.growth_factor = message.growthFactor === 0 ? undefined : message.growthFactor; + obj.scale = message.scale === 0 ? undefined : message.scale; return obj; }, fromAminoMsg(object: Distribution_ExponentialBucketsAminoMsg): Distribution_ExponentialBuckets { @@ -884,7 +884,7 @@ export const Distribution_ExplicitBuckets = { if (message.bounds) { obj.bounds = message.bounds.map(e => e); } else { - obj.bounds = []; + obj.bounds = message.bounds; } return obj; }, 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 16a7e0e35c..f3f33bacd8 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 @@ -468,21 +468,21 @@ export const HttpRequest = { }, 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.request_method = message.requestMethod === "" ? undefined : message.requestMethod; + obj.request_url = message.requestUrl === "" ? undefined : message.requestUrl; + obj.request_size = message.requestSize !== BigInt(0) ? message.requestSize.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.response_size = message.responseSize !== BigInt(0) ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent === "" ? undefined : message.userAgent; + obj.remote_ip = message.remoteIp === "" ? undefined : message.remoteIp; + obj.server_ip = message.serverIp === "" ? undefined : message.serverIp; + obj.referer = message.referer === "" ? undefined : 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; + obj.cache_lookup = message.cacheLookup === false ? undefined : message.cacheLookup; + obj.cache_hit = message.cacheHit === false ? undefined : message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer === false ? undefined : message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes !== BigInt(0) ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest { 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 6207bbe6eb..023e5b0223 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 @@ -386,8 +386,8 @@ export const LogEntry_LabelsEntry = { }, toAmino(message: LogEntry_LabelsEntry): LogEntry_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry { @@ -639,7 +639,7 @@ export const LogEntry = { message.timestamp = fromTimestamp(Timestamp.fromAmino(object.timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.http_request !== undefined && object.http_request !== null) { message.httpRequest = HttpRequest.fromAmino(object.http_request); @@ -677,12 +677,12 @@ export const LogEntry = { }, toAmino(message: LogEntry): LogEntryAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; - obj.trace = message.trace; - obj.insert_id = message.insertId; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -690,7 +690,7 @@ export const LogEntry = { }); } obj.proto_payload = message.protoPayload ? Any.toAmino(message.protoPayload) : undefined; - obj.text_payload = message.textPayload; + obj.text_payload = message.textPayload === null ? undefined : 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; @@ -821,10 +821,10 @@ export const LogEntryOperation = { }, toAmino(message: LogEntryOperation): LogEntryOperationAmino { const obj: any = {}; - obj.id = message.id; - obj.producer = message.producer; - obj.first = message.first; - obj.last = message.last; + obj.id = message.id === "" ? undefined : message.id; + obj.producer = message.producer === "" ? undefined : message.producer; + obj.first = message.first === false ? undefined : message.first; + obj.last = message.last === false ? undefined : message.last; return obj; }, fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation { @@ -939,9 +939,9 @@ export const LogEntrySourceLocation = { }, toAmino(message: LogEntrySourceLocation): LogEntrySourceLocationAmino { const obj: any = {}; - obj.file = message.file; - obj.line = message.line ? message.line.toString() : undefined; - obj.function = message.function; + obj.file = message.file === "" ? undefined : message.file; + obj.line = message.line !== BigInt(0) ? message.line.toString() : undefined; + obj.function = message.function === "" ? undefined : message.function; return obj; }, fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation { 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 49d15135e7..ea9653ab0e 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 @@ -233,8 +233,8 @@ export const MetricValue_LabelsEntry = { }, toAmino(message: MetricValue_LabelsEntry): MetricValue_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MetricValue_LabelsEntryAminoMsg): MetricValue_LabelsEntry { @@ -468,10 +468,10 @@ export const MetricValue = { } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; - 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.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.distribution_value = message.distributionValue ? Distribution.toAmino(message.distributionValue) : undefined; return obj; }, @@ -576,11 +576,11 @@ export const MetricValueSet = { }, toAmino(message: MetricValueSet): MetricValueSetAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; if (message.metricValues) { obj.metric_values = message.metricValues.map(e => e ? MetricValue.toAmino(e) : undefined); } else { - obj.metric_values = []; + obj.metric_values = message.metricValues; } return obj; }, 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 b1fd65824b..76197c6659 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/operation.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/operation.ts @@ -332,8 +332,8 @@ export const Operation_LabelsEntry = { }, toAmino(message: Operation_LabelsEntry): Operation_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: Operation_LabelsEntryAminoMsg): Operation_LabelsEntry { @@ -594,16 +594,16 @@ export const Operation = { message.metricValueSets = object.metric_value_sets?.map(e => MetricValueSet.fromAmino(e)) || []; message.logEntries = object.log_entries?.map(e => LogEntry.fromAmino(e)) || []; if (object.importance !== undefined && object.importance !== null) { - message.importance = operation_ImportanceFromJSON(object.importance); + message.importance = object.importance; } message.extensions = object.extensions?.map(e => Any.fromAmino(e)) || []; return message; }, toAmino(message: Operation): OperationAmino { const obj: any = {}; - obj.operation_id = message.operationId; - obj.operation_name = message.operationName; - obj.consumer_id = message.consumerId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; + obj.operation_name = message.operationName === "" ? undefined : message.operationName; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; obj.labels = {}; @@ -615,18 +615,18 @@ export const Operation = { if (message.metricValueSets) { obj.metric_value_sets = message.metricValueSets.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.metric_value_sets = []; + obj.metric_value_sets = message.metricValueSets; } if (message.logEntries) { obj.log_entries = message.logEntries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.log_entries = []; + obj.log_entries = message.logEntries; } - obj.importance = message.importance; + obj.importance = message.importance === 0 ? undefined : message.importance; if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, 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 b71b78d97d..e85ab2a660 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 @@ -592,9 +592,9 @@ export const AllocateQuotaRequest = { }, toAmino(message: AllocateQuotaRequest): AllocateQuotaRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.allocate_operation = message.allocateOperation ? QuotaOperation.toAmino(message.allocateOperation) : undefined; - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: AllocateQuotaRequestAminoMsg): AllocateQuotaRequest { @@ -691,8 +691,8 @@ export const QuotaOperation_LabelsEntry = { }, toAmino(message: QuotaOperation_LabelsEntry): QuotaOperation_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaOperation_LabelsEntryAminoMsg): QuotaOperation_LabelsEntry { @@ -882,15 +882,15 @@ export const QuotaOperation = { }, {}); message.quotaMetrics = object.quota_metrics?.map(e => MetricValueSet.fromAmino(e)) || []; if (object.quota_mode !== undefined && object.quota_mode !== null) { - message.quotaMode = quotaOperation_QuotaModeFromJSON(object.quota_mode); + message.quotaMode = object.quota_mode; } return message; }, toAmino(message: QuotaOperation): QuotaOperationAmino { const obj: any = {}; - obj.operation_id = message.operationId; - obj.method_name = message.methodName; - obj.consumer_id = message.consumerId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; + obj.method_name = message.methodName === "" ? undefined : message.methodName; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -900,9 +900,9 @@ export const QuotaOperation = { if (message.quotaMetrics) { obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.quota_metrics = []; + obj.quota_metrics = message.quotaMetrics; } - obj.quota_mode = message.quotaMode; + obj.quota_mode = message.quotaMode === 0 ? undefined : message.quotaMode; return obj; }, fromAminoMsg(object: QuotaOperationAminoMsg): QuotaOperation { @@ -1042,18 +1042,18 @@ export const AllocateQuotaResponse = { }, toAmino(message: AllocateQuotaResponse): AllocateQuotaResponseAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; if (message.allocateErrors) { obj.allocate_errors = message.allocateErrors.map(e => e ? QuotaError.toAmino(e) : undefined); } else { - obj.allocate_errors = []; + obj.allocate_errors = message.allocateErrors; } if (message.quotaMetrics) { obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.quota_metrics = []; + obj.quota_metrics = message.quotaMetrics; } - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: AllocateQuotaResponseAminoMsg): AllocateQuotaResponse { @@ -1168,7 +1168,7 @@ export const QuotaError = { fromAmino(object: QuotaErrorAmino): QuotaError { const message = createBaseQuotaError(); if (object.code !== undefined && object.code !== null) { - message.code = quotaError_CodeFromJSON(object.code); + message.code = object.code; } if (object.subject !== undefined && object.subject !== null) { message.subject = object.subject; @@ -1183,9 +1183,9 @@ export const QuotaError = { }, toAmino(message: QuotaError): QuotaErrorAmino { const obj: any = {}; - obj.code = message.code; - obj.subject = message.subject; - obj.description = message.description; + obj.code = message.code === 0 ? undefined : message.code; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, 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 34ab251d66..63def361f5 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 @@ -570,9 +570,9 @@ export const CheckRequest = { }, toAmino(message: CheckRequest): CheckRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.operation = message.operation ? Operation.toAmino(message.operation) : undefined; - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -723,14 +723,14 @@ export const CheckResponse = { }, toAmino(message: CheckResponse): CheckResponseAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; if (message.checkErrors) { obj.check_errors = message.checkErrors.map(e => e ? CheckError.toAmino(e) : undefined); } else { - obj.check_errors = []; + obj.check_errors = message.checkErrors; } - obj.service_config_id = message.serviceConfigId; - obj.service_rollout_id = message.serviceRolloutId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId === "" ? undefined : message.serviceRolloutId; obj.check_info = message.checkInfo ? CheckResponse_CheckInfo.toAmino(message.checkInfo) : undefined; return obj; }, @@ -840,7 +840,7 @@ export const CheckResponse_CheckInfo = { if (message.unusedArguments) { obj.unused_arguments = message.unusedArguments.map(e => e); } else { - obj.unused_arguments = []; + obj.unused_arguments = message.unusedArguments; } obj.consumer_info = message.consumerInfo ? CheckResponse_ConsumerInfo.toAmino(message.consumerInfo) : undefined; return obj; @@ -950,7 +950,7 @@ export const CheckResponse_ConsumerInfo = { message.projectNumber = BigInt(object.project_number); } if (object.type !== undefined && object.type !== null) { - message.type = checkResponse_ConsumerInfo_ConsumerTypeFromJSON(object.type); + message.type = object.type; } if (object.consumer_number !== undefined && object.consumer_number !== null) { message.consumerNumber = BigInt(object.consumer_number); @@ -959,9 +959,9 @@ export const CheckResponse_ConsumerInfo = { }, 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; + obj.project_number = message.projectNumber !== BigInt(0) ? message.projectNumber.toString() : undefined; + obj.type = message.type === 0 ? undefined : message.type; + obj.consumer_number = message.consumerNumber !== BigInt(0) ? message.consumerNumber.toString() : undefined; return obj; }, fromAminoMsg(object: CheckResponse_ConsumerInfoAminoMsg): CheckResponse_ConsumerInfo { @@ -1080,13 +1080,13 @@ export const ReportRequest = { }, toAmino(message: ReportRequest): ReportRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; if (message.operations) { obj.operations = message.operations.map(e => e ? Operation.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: ReportRequestAminoMsg): ReportRequest { @@ -1208,10 +1208,10 @@ export const ReportResponse = { if (message.reportErrors) { obj.report_errors = message.reportErrors.map(e => e ? ReportResponse_ReportError.toAmino(e) : undefined); } else { - obj.report_errors = []; + obj.report_errors = message.reportErrors; } - obj.service_config_id = message.serviceConfigId; - obj.service_rollout_id = message.serviceRolloutId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId === "" ? undefined : message.serviceRolloutId; return obj; }, fromAminoMsg(object: ReportResponseAminoMsg): ReportResponse { @@ -1311,7 +1311,7 @@ export const ReportResponse_ReportError = { }, toAmino(message: ReportResponse_ReportError): ReportResponse_ReportErrorAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, 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 145661a58d..27a42fdd9f 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 @@ -419,15 +419,15 @@ export const CheckRequest = { }, toAmino(message: CheckRequest): CheckRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.service_config_id = message.serviceConfigId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.service_config_id = message.serviceConfigId === "" ? undefined : 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.resources = message.resources; } - obj.flags = message.flags; + obj.flags = message.flags === "" ? undefined : message.flags; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -570,11 +570,11 @@ export const ResourceInfo = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; + obj.permission = message.permission === "" ? undefined : message.permission; + obj.container = message.container === "" ? undefined : message.container; + obj.location = message.location === "" ? undefined : message.location; return obj; }, fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo { @@ -671,8 +671,8 @@ export const CheckResponse_HeadersEntry = { }, toAmino(message: CheckResponse_HeadersEntry): CheckResponse_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: CheckResponse_HeadersEntryAminoMsg): CheckResponse_HeadersEntry { @@ -929,12 +929,12 @@ export const ReportRequest = { }, toAmino(message: ReportRequest): ReportRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.service_config_id = message.serviceConfigId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; if (message.operations) { obj.operations = message.operations.map(e => e ? AttributeContext.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } return obj; }, 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 4c1be1381c..a6418a4ec5 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicemanagement/v1/resources.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicemanagement/v1/resources.ts @@ -912,8 +912,8 @@ export const ManagedService = { }, toAmino(message: ManagedService): ManagedServiceAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.producer_project_id = message.producerProjectId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; return obj; }, fromAminoMsg(object: ManagedServiceAminoMsg): ManagedService { @@ -1056,14 +1056,14 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } if (message.steps) { obj.steps = message.steps.map(e => e ? OperationMetadata_Step.toAmino(e) : undefined); } else { - obj.steps = []; + obj.steps = message.steps; } - obj.progress_percentage = message.progressPercentage; + obj.progress_percentage = message.progressPercentage === 0 ? undefined : message.progressPercentage; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, @@ -1156,14 +1156,14 @@ export const OperationMetadata_Step = { message.description = object.description; } if (object.status !== undefined && object.status !== null) { - message.status = operationMetadata_StatusFromJSON(object.status); + message.status = object.status; } return message; }, toAmino(message: OperationMetadata_Step): OperationMetadata_StepAmino { const obj: any = {}; - obj.description = message.description; - obj.status = message.status; + obj.description = message.description === "" ? undefined : message.description; + obj.status = message.status === 0 ? undefined : message.status; return obj; }, fromAminoMsg(object: OperationMetadata_StepAminoMsg): OperationMetadata_Step { @@ -1267,7 +1267,7 @@ export const Diagnostic = { message.location = object.location; } if (object.kind !== undefined && object.kind !== null) { - message.kind = diagnostic_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.message !== undefined && object.message !== null) { message.message = object.message; @@ -1276,9 +1276,9 @@ export const Diagnostic = { }, toAmino(message: Diagnostic): DiagnosticAmino { const obj: any = {}; - obj.location = message.location; - obj.kind = message.kind; - obj.message = message.message; + obj.location = message.location === "" ? undefined : message.location; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: DiagnosticAminoMsg): Diagnostic { @@ -1382,11 +1382,11 @@ export const ConfigSource = { }, toAmino(message: ConfigSource): ConfigSourceAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; if (message.files) { obj.files = message.files.map(e => e ? ConfigFile.toAmino(e) : undefined); } else { - obj.files = []; + obj.files = message.files; } return obj; }, @@ -1494,15 +1494,15 @@ export const ConfigFile = { message.fileContents = bytesFromBase64(object.file_contents); } if (object.file_type !== undefined && object.file_type !== null) { - message.fileType = configFile_FileTypeFromJSON(object.file_type); + message.fileType = object.file_type; } return message; }, toAmino(message: ConfigFile): ConfigFileAmino { const obj: any = {}; - obj.file_path = message.filePath; + obj.file_path = message.filePath === "" ? undefined : message.filePath; obj.file_contents = message.fileContents ? base64FromBytes(message.fileContents) : undefined; - obj.file_type = message.fileType; + obj.file_type = message.fileType === 0 ? undefined : message.fileType; return obj; }, fromAminoMsg(object: ConfigFileAminoMsg): ConfigFile { @@ -1585,7 +1585,7 @@ export const ConfigRef = { }, toAmino(message: ConfigRef): ConfigRefAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: ConfigRefAminoMsg): ConfigRef { @@ -1677,7 +1677,7 @@ export const ChangeReport = { if (message.configChanges) { obj.config_changes = message.configChanges.map(e => e ? ConfigChange.toAmino(e) : undefined); } else { - obj.config_changes = []; + obj.config_changes = message.configChanges; } return obj; }, @@ -1840,7 +1840,7 @@ export const Rollout = { message.createdBy = object.created_by; } if (object.status !== undefined && object.status !== null) { - message.status = rollout_RolloutStatusFromJSON(object.status); + message.status = object.status; } if (object.traffic_percent_strategy !== undefined && object.traffic_percent_strategy !== null) { message.trafficPercentStrategy = Rollout_TrafficPercentStrategy.fromAmino(object.traffic_percent_strategy); @@ -1855,13 +1855,13 @@ export const Rollout = { }, toAmino(message: Rollout): RolloutAmino { const obj: any = {}; - obj.rollout_id = message.rolloutId; + obj.rollout_id = message.rolloutId === "" ? undefined : message.rolloutId; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; - obj.created_by = message.createdBy; - obj.status = message.status; + obj.created_by = message.createdBy === "" ? undefined : message.createdBy; + obj.status = message.status === 0 ? undefined : 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; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: RolloutAminoMsg): Rollout { @@ -1958,8 +1958,8 @@ export const Rollout_TrafficPercentStrategy_PercentagesEntry = { }, toAmino(message: Rollout_TrafficPercentStrategy_PercentagesEntry): Rollout_TrafficPercentStrategy_PercentagesEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: Rollout_TrafficPercentStrategy_PercentagesEntryAminoMsg): Rollout_TrafficPercentStrategy_PercentagesEntry { 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 f8c3aeb5d0..70d1b40cec 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicemanagement/v1/servicemanager.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicemanagement/v1/servicemanager.ts @@ -859,10 +859,10 @@ export const ListServicesRequest = { }, 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; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -969,9 +969,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? ManagedService.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -1054,7 +1054,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -1222,7 +1222,7 @@ export const DeleteServiceRequest = { }, toAmino(message: DeleteServiceRequest): DeleteServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: DeleteServiceRequestAminoMsg): DeleteServiceRequest { @@ -1305,7 +1305,7 @@ export const UndeleteServiceRequest = { }, toAmino(message: UndeleteServiceRequest): UndeleteServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: UndeleteServiceRequestAminoMsg): UndeleteServiceRequest { @@ -1497,15 +1497,15 @@ export const GetServiceConfigRequest = { message.configId = object.config_id; } if (object.view !== undefined && object.view !== null) { - message.view = getServiceConfigRequest_ConfigViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetServiceConfigRequest): GetServiceConfigRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.config_id = message.configId; - obj.view = message.view; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.config_id = message.configId === "" ? undefined : message.configId; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetServiceConfigRequestAminoMsg): GetServiceConfigRequest { @@ -1618,9 +1618,9 @@ export const ListServiceConfigsRequest = { }, toAmino(message: ListServiceConfigsRequest): ListServiceConfigsRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListServiceConfigsRequestAminoMsg): ListServiceConfigsRequest { @@ -1727,9 +1727,9 @@ export const ListServiceConfigsResponse = { if (message.serviceConfigs) { obj.service_configs = message.serviceConfigs.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.service_configs = []; + obj.service_configs = message.serviceConfigs; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServiceConfigsResponseAminoMsg): ListServiceConfigsResponse { @@ -1829,7 +1829,7 @@ export const CreateServiceConfigRequest = { }, toAmino(message: CreateServiceConfigRequest): CreateServiceConfigRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.service_config = message.serviceConfig ? Service.toAmino(message.serviceConfig) : undefined; return obj; }, @@ -1945,9 +1945,9 @@ export const SubmitConfigSourceRequest = { }, toAmino(message: SubmitConfigSourceRequest): SubmitConfigSourceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.config_source = message.configSource ? ConfigSource.toAmino(message.configSource) : undefined; - obj.validate_only = message.validateOnly; + obj.validate_only = message.validateOnly === false ? undefined : message.validateOnly; return obj; }, fromAminoMsg(object: SubmitConfigSourceRequestAminoMsg): SubmitConfigSourceRequest { @@ -2132,7 +2132,7 @@ export const CreateServiceRolloutRequest = { }, toAmino(message: CreateServiceRolloutRequest): CreateServiceRolloutRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.rollout = message.rollout ? Rollout.toAmino(message.rollout) : undefined; return obj; }, @@ -2261,10 +2261,10 @@ export const ListServiceRolloutsRequest = { }, 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; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServiceRolloutsRequestAminoMsg): ListServiceRolloutsRequest { @@ -2371,9 +2371,9 @@ export const ListServiceRolloutsResponse = { if (message.rollouts) { obj.rollouts = message.rollouts.map(e => e ? Rollout.toAmino(e) : undefined); } else { - obj.rollouts = []; + obj.rollouts = message.rollouts; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServiceRolloutsResponseAminoMsg): ListServiceRolloutsResponse { @@ -2471,8 +2471,8 @@ export const GetServiceRolloutRequest = { }, toAmino(message: GetServiceRolloutRequest): GetServiceRolloutRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.rollout_id = message.rolloutId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.rollout_id = message.rolloutId === "" ? undefined : message.rolloutId; return obj; }, fromAminoMsg(object: GetServiceRolloutRequestAminoMsg): GetServiceRolloutRequest { @@ -2715,17 +2715,17 @@ export const GenerateConfigReportResponse = { }, toAmino(message: GenerateConfigReportResponse): GenerateConfigReportResponseAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.id = message.id; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.id = message.id === "" ? undefined : message.id; if (message.changeReports) { obj.change_reports = message.changeReports.map(e => e ? ChangeReport.toAmino(e) : undefined); } else { - obj.change_reports = []; + obj.change_reports = message.changeReports; } if (message.diagnostics) { obj.diagnostics = message.diagnostics.map(e => e ? Diagnostic.toAmino(e) : undefined); } else { - obj.diagnostics = []; + obj.diagnostics = message.diagnostics; } return obj; }, 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 e6ca91278e..1a21c7e3ef 100644 --- a/__fixtures__/v-next/outputv2/google/api/serviceusage/v1/resources.ts +++ b/__fixtures__/v-next/outputv2/google/api/serviceusage/v1/resources.ts @@ -365,16 +365,16 @@ export const Service = { message.config = ServiceConfig.fromAmino(object.config); } if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: Service): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.parent = message.parent; + obj.name = message.name === "" ? undefined : message.name; + obj.parent = message.parent === "" ? undefined : message.parent; obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: ServiceAminoMsg): Service { @@ -620,12 +620,12 @@ export const ServiceConfig = { }, toAmino(message: ServiceConfig): ServiceConfigAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; @@ -634,12 +634,12 @@ export const ServiceConfig = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; return obj; @@ -733,7 +733,7 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, 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 93ae4012dd..59bfb563bf 100644 --- a/__fixtures__/v-next/outputv2/google/api/serviceusage/v1/serviceusage.ts +++ b/__fixtures__/v-next/outputv2/google/api/serviceusage/v1/serviceusage.ts @@ -635,7 +635,7 @@ export const EnableServiceRequest = { }, toAmino(message: EnableServiceRequest): EnableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest { @@ -827,15 +827,15 @@ export const DisableServiceRequest = { message.disableDependentServices = object.disable_dependent_services; } if (object.check_if_service_has_usage !== undefined && object.check_if_service_has_usage !== null) { - message.checkIfServiceHasUsage = disableServiceRequest_CheckIfServiceHasUsageFromJSON(object.check_if_service_has_usage); + message.checkIfServiceHasUsage = object.check_if_service_has_usage; } return message; }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.disable_dependent_services = message.disableDependentServices === false ? undefined : message.disableDependentServices; + obj.check_if_service_has_usage = message.checkIfServiceHasUsage === 0 ? undefined : message.checkIfServiceHasUsage; return obj; }, fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest { @@ -1003,7 +1003,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -1131,10 +1131,10 @@ export const ListServicesRequest = { }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -1241,9 +1241,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -1347,11 +1347,11 @@ export const BatchEnableServicesRequest = { }, toAmino(message: BatchEnableServicesRequest): BatchEnableServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.serviceIds) { obj.service_ids = message.serviceIds.map(e => e); } else { - obj.service_ids = []; + obj.service_ids = message.serviceIds; } return obj; }, @@ -1465,12 +1465,12 @@ export const BatchEnableServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } if (message.failures) { obj.failures = message.failures.map(e => e ? BatchEnableServicesResponse_EnableFailure.toAmino(e) : undefined); } else { - obj.failures = []; + obj.failures = message.failures; } return obj; }, @@ -1569,8 +1569,8 @@ export const BatchEnableServicesResponse_EnableFailure = { }, toAmino(message: BatchEnableServicesResponse_EnableFailure): BatchEnableServicesResponse_EnableFailureAmino { const obj: any = {}; - obj.service_id = message.serviceId; - obj.error_message = message.errorMessage; + obj.service_id = message.serviceId === "" ? undefined : message.serviceId; + obj.error_message = message.errorMessage === "" ? undefined : message.errorMessage; return obj; }, fromAminoMsg(object: BatchEnableServicesResponse_EnableFailureAminoMsg): BatchEnableServicesResponse_EnableFailure { @@ -1674,11 +1674,11 @@ export const BatchGetServicesRequest = { }, toAmino(message: BatchGetServicesRequest): BatchGetServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.names) { obj.names = message.names.map(e => e); } else { - obj.names = []; + obj.names = message.names; } return obj; }, @@ -1771,7 +1771,7 @@ export const BatchGetServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } return obj; }, 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 bcc6423309..441210ad4a 100644 --- a/__fixtures__/v-next/outputv2/google/api/serviceusage/v1beta1/resources.ts +++ b/__fixtures__/v-next/outputv2/google/api/serviceusage/v1beta1/resources.ts @@ -1179,16 +1179,16 @@ export const Service = { message.config = ServiceConfig.fromAmino(object.config); } if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: Service): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.parent = message.parent; + obj.name = message.name === "" ? undefined : message.name; + obj.parent = message.parent === "" ? undefined : message.parent; obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: ServiceAminoMsg): Service { @@ -1434,12 +1434,12 @@ export const ServiceConfig = { }, toAmino(message: ServiceConfig): ServiceConfigAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; @@ -1448,12 +1448,12 @@ export const ServiceConfig = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; return obj; @@ -1547,7 +1547,7 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, @@ -1718,20 +1718,20 @@ export const ConsumerQuotaMetric = { }, toAmino(message: ConsumerQuotaMetric): ConsumerQuotaMetricAmino { const obj: any = {}; - obj.name = message.name; - obj.metric = message.metric; - obj.display_name = message.displayName; + obj.name = message.name === "" ? undefined : message.name; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.display_name = message.displayName === "" ? undefined : message.displayName; if (message.consumerQuotaLimits) { obj.consumer_quota_limits = message.consumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e) : undefined); } else { - obj.consumer_quota_limits = []; + obj.consumer_quota_limits = message.consumerQuotaLimits; } if (message.descendantConsumerQuotaLimits) { obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e) : undefined); } else { - obj.descendant_consumer_quota_limits = []; + obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits; } - obj.unit = message.unit; + obj.unit = message.unit === "" ? undefined : message.unit; return obj; }, fromAminoMsg(object: ConsumerQuotaMetricAminoMsg): ConsumerQuotaMetric { @@ -1895,15 +1895,15 @@ export const ConsumerQuotaLimit = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.is_precise = message.isPrecise === false ? undefined : message.isPrecise; + obj.allows_admin_overrides = message.allowsAdminOverrides === false ? undefined : message.allowsAdminOverrides; if (message.quotaBuckets) { obj.quota_buckets = message.quotaBuckets.map(e => e ? QuotaBucket.toAmino(e) : undefined); } else { - obj.quota_buckets = []; + obj.quota_buckets = message.quotaBuckets; } return obj; }, @@ -2001,8 +2001,8 @@ export const QuotaBucket_DimensionsEntry = { }, toAmino(message: QuotaBucket_DimensionsEntry): QuotaBucket_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaBucket_DimensionsEntryAminoMsg): QuotaBucket_DimensionsEntry { @@ -2202,8 +2202,8 @@ export const QuotaBucket = { }, 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.effective_limit = message.effectiveLimit !== BigInt(0) ? message.effectiveLimit.toString() : undefined; + obj.default_limit = message.defaultLimit !== BigInt(0) ? 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; @@ -2309,8 +2309,8 @@ export const QuotaOverride_DimensionsEntry = { }, toAmino(message: QuotaOverride_DimensionsEntry): QuotaOverride_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaOverride_DimensionsEntryAminoMsg): QuotaOverride_DimensionsEntry { @@ -2502,17 +2502,17 @@ export const QuotaOverride = { }, toAmino(message: QuotaOverride): QuotaOverrideAmino { const obj: any = {}; - obj.name = message.name; - obj.override_value = message.overrideValue ? message.overrideValue.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.override_value = message.overrideValue !== BigInt(0) ? 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; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.admin_override_ancestor = message.adminOverrideAncestor === "" ? undefined : message.adminOverrideAncestor; return obj; }, fromAminoMsg(object: QuotaOverrideAminoMsg): QuotaOverride { @@ -2604,7 +2604,7 @@ export const OverrideInlineSource = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -2702,8 +2702,8 @@ export const AdminQuotaPolicy_DimensionsEntry = { }, toAmino(message: AdminQuotaPolicy_DimensionsEntry): AdminQuotaPolicy_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AdminQuotaPolicy_DimensionsEntryAminoMsg): AdminQuotaPolicy_DimensionsEntry { @@ -2895,17 +2895,17 @@ export const AdminQuotaPolicy = { }, toAmino(message: AdminQuotaPolicy): AdminQuotaPolicyAmino { const obj: any = {}; - obj.name = message.name; - obj.policy_value = message.policyValue ? message.policyValue.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.policy_value = message.policyValue !== BigInt(0) ? 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; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.container = message.container === "" ? undefined : message.container; return obj; }, fromAminoMsg(object: AdminQuotaPolicyAminoMsg): AdminQuotaPolicy { @@ -3003,8 +3003,8 @@ export const ServiceIdentity = { }, toAmino(message: ServiceIdentity): ServiceIdentityAmino { const obj: any = {}; - obj.email = message.email; - obj.unique_id = message.uniqueId; + obj.email = message.email === "" ? undefined : message.email; + obj.unique_id = message.uniqueId === "" ? undefined : message.uniqueId; return obj; }, fromAminoMsg(object: ServiceIdentityAminoMsg): ServiceIdentity { 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 791ba42542..2d7dc6d708 100644 --- a/__fixtures__/v-next/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts +++ b/__fixtures__/v-next/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts @@ -1629,7 +1629,7 @@ export const EnableServiceRequest = { }, toAmino(message: EnableServiceRequest): EnableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest { @@ -1712,7 +1712,7 @@ export const DisableServiceRequest = { }, toAmino(message: DisableServiceRequest): DisableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest { @@ -1795,7 +1795,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -1923,10 +1923,10 @@ export const ListServicesRequest = { }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -2033,9 +2033,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -2139,11 +2139,11 @@ export const BatchEnableServicesRequest = { }, toAmino(message: BatchEnableServicesRequest): BatchEnableServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.serviceIds) { obj.service_ids = message.serviceIds.map(e => e); } else { - obj.service_ids = []; + obj.service_ids = message.serviceIds; } return obj; }, @@ -2266,16 +2266,16 @@ export const ListConsumerQuotaMetricsRequest = { message.pageToken = object.page_token; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: ListConsumerQuotaMetricsRequestAminoMsg): ListConsumerQuotaMetricsRequest { @@ -2382,9 +2382,9 @@ export const ListConsumerQuotaMetricsResponse = { if (message.metrics) { obj.metrics = message.metrics.map(e => e ? ConsumerQuotaMetric.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListConsumerQuotaMetricsResponseAminoMsg): ListConsumerQuotaMetricsResponse { @@ -2476,14 +2476,14 @@ export const GetConsumerQuotaMetricRequest = { message.name = object.name; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetConsumerQuotaMetricRequest): GetConsumerQuotaMetricRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.view = message.view; + obj.name = message.name === "" ? undefined : message.name; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetConsumerQuotaMetricRequestAminoMsg): GetConsumerQuotaMetricRequest { @@ -2575,14 +2575,14 @@ export const GetConsumerQuotaLimitRequest = { message.name = object.name; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetConsumerQuotaLimitRequest): GetConsumerQuotaLimitRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.view = message.view; + obj.name = message.name === "" ? undefined : message.name; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetConsumerQuotaLimitRequestAminoMsg): GetConsumerQuotaLimitRequest { @@ -2722,18 +2722,18 @@ export const CreateAdminOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: CreateAdminOverrideRequest): CreateAdminOverrideRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2891,19 +2891,19 @@ export const UpdateAdminOverrideRequest = { if (object.update_mask !== undefined && object.update_mask !== null) { message.updateMask = FieldMask.fromAmino(object.update_mask); } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: UpdateAdminOverrideRequest): UpdateAdminOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3027,17 +3027,17 @@ export const DeleteAdminOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: DeleteAdminOverrideRequest): DeleteAdminOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.force = message.force; + obj.name = message.name === "" ? undefined : message.name; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3151,9 +3151,9 @@ export const ListAdminOverridesRequest = { }, toAmino(message: ListAdminOverridesRequest): ListAdminOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListAdminOverridesRequestAminoMsg): ListAdminOverridesRequest { @@ -3260,9 +3260,9 @@ export const ListAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListAdminOverridesResponseAminoMsg): ListAdminOverridesResponse { @@ -3354,7 +3354,7 @@ export const BatchCreateAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -3495,18 +3495,18 @@ export const ImportAdminOverridesRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: ImportAdminOverridesRequest): ImportAdminOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3599,7 +3599,7 @@ export const ImportAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -3805,18 +3805,18 @@ export const CreateConsumerOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: CreateConsumerOverrideRequest): CreateConsumerOverrideRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3974,19 +3974,19 @@ export const UpdateConsumerOverrideRequest = { if (object.update_mask !== undefined && object.update_mask !== null) { message.updateMask = FieldMask.fromAmino(object.update_mask); } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: UpdateConsumerOverrideRequest): UpdateConsumerOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -4110,17 +4110,17 @@ export const DeleteConsumerOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: DeleteConsumerOverrideRequest): DeleteConsumerOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.force = message.force; + obj.name = message.name === "" ? undefined : message.name; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -4234,9 +4234,9 @@ export const ListConsumerOverridesRequest = { }, toAmino(message: ListConsumerOverridesRequest): ListConsumerOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListConsumerOverridesRequestAminoMsg): ListConsumerOverridesRequest { @@ -4343,9 +4343,9 @@ export const ListConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListConsumerOverridesResponseAminoMsg): ListConsumerOverridesResponse { @@ -4437,7 +4437,7 @@ export const BatchCreateConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -4578,18 +4578,18 @@ export const ImportConsumerOverridesRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: ImportConsumerOverridesRequest): ImportConsumerOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -4682,7 +4682,7 @@ export const ImportConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -4840,7 +4840,7 @@ export const ImportAdminQuotaPoliciesResponse = { if (message.policies) { obj.policies = message.policies.map(e => e ? AdminQuotaPolicy.toAmino(e) : undefined); } else { - obj.policies = []; + obj.policies = message.policies; } return obj; }, @@ -5184,7 +5184,7 @@ export const GenerateServiceIdentityRequest = { }, toAmino(message: GenerateServiceIdentityRequest): GenerateServiceIdentityRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; return obj; }, fromAminoMsg(object: GenerateServiceIdentityRequestAminoMsg): GenerateServiceIdentityRequest { @@ -5278,14 +5278,14 @@ export const GetServiceIdentityResponse = { message.identity = ServiceIdentity.fromAmino(object.identity); } if (object.state !== undefined && object.state !== null) { - message.state = getServiceIdentityResponse_IdentityStateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: GetServiceIdentityResponse): GetServiceIdentityResponseAmino { const obj: any = {}; obj.identity = message.identity ? ServiceIdentity.toAmino(message.identity) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: GetServiceIdentityResponseAminoMsg): GetServiceIdentityResponse { diff --git a/__fixtures__/v-next/outputv2/google/api/source_info.ts b/__fixtures__/v-next/outputv2/google/api/source_info.ts index bb3d340233..721c15b580 100644 --- a/__fixtures__/v-next/outputv2/google/api/source_info.ts +++ b/__fixtures__/v-next/outputv2/google/api/source_info.ts @@ -97,7 +97,7 @@ export const SourceInfo = { if (message.sourceFiles) { obj.source_files = message.sourceFiles.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.source_files = []; + obj.source_files = message.sourceFiles; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/api/system_parameter.ts b/__fixtures__/v-next/outputv2/google/api/system_parameter.ts index 206c2b3fa0..5b120210f4 100644 --- a/__fixtures__/v-next/outputv2/google/api/system_parameter.ts +++ b/__fixtures__/v-next/outputv2/google/api/system_parameter.ts @@ -291,7 +291,7 @@ export const SystemParameters = { if (message.rules) { obj.rules = message.rules.map(e => e ? SystemParameterRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -396,11 +396,11 @@ export const SystemParameterRule = { }, toAmino(message: SystemParameterRule): SystemParameterRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; if (message.parameters) { obj.parameters = message.parameters.map(e => e ? SystemParameter.toAmino(e) : undefined); } else { - obj.parameters = []; + obj.parameters = message.parameters; } return obj; }, @@ -514,9 +514,9 @@ export const SystemParameter = { }, toAmino(message: SystemParameter): SystemParameterAmino { const obj: any = {}; - obj.name = message.name; - obj.http_header = message.httpHeader; - obj.url_query_parameter = message.urlQueryParameter; + obj.name = message.name === "" ? undefined : message.name; + obj.http_header = message.httpHeader === "" ? undefined : message.httpHeader; + obj.url_query_parameter = message.urlQueryParameter === "" ? undefined : message.urlQueryParameter; return obj; }, fromAminoMsg(object: SystemParameterAminoMsg): SystemParameter { diff --git a/__fixtures__/v-next/outputv2/google/api/usage.ts b/__fixtures__/v-next/outputv2/google/api/usage.ts index f15ae8250c..867d3c2e9c 100644 --- a/__fixtures__/v-next/outputv2/google/api/usage.ts +++ b/__fixtures__/v-next/outputv2/google/api/usage.ts @@ -324,14 +324,14 @@ export const Usage = { if (message.requirements) { obj.requirements = message.requirements.map(e => e); } else { - obj.requirements = []; + obj.requirements = message.requirements; } if (message.rules) { obj.rules = message.rules.map(e => e ? UsageRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.producer_notification_channel = message.producerNotificationChannel; + obj.producer_notification_channel = message.producerNotificationChannel === "" ? undefined : message.producerNotificationChannel; return obj; }, fromAminoMsg(object: UsageAminoMsg): Usage { @@ -444,9 +444,9 @@ export const UsageRule = { }, toAmino(message: UsageRule): UsageRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.allow_unregistered_calls = message.allowUnregisteredCalls; - obj.skip_service_control = message.skipServiceControl; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.allow_unregistered_calls = message.allowUnregisteredCalls === false ? undefined : message.allowUnregisteredCalls; + obj.skip_service_control = message.skipServiceControl === false ? undefined : message.skipServiceControl; return obj; }, fromAminoMsg(object: UsageRuleAminoMsg): UsageRule { diff --git a/__fixtures__/v-next/outputv2/google/api/visibility.ts b/__fixtures__/v-next/outputv2/google/api/visibility.ts index ccd4ec1869..2a1cf53888 100644 --- a/__fixtures__/v-next/outputv2/google/api/visibility.ts +++ b/__fixtures__/v-next/outputv2/google/api/visibility.ts @@ -249,7 +249,7 @@ export const Visibility = { if (message.rules) { obj.rules = message.rules.map(e => e ? VisibilityRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -348,8 +348,8 @@ export const VisibilityRule = { }, toAmino(message: VisibilityRule): VisibilityRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.restriction = message.restriction; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.restriction = message.restriction === "" ? undefined : message.restriction; return obj; }, fromAminoMsg(object: VisibilityRuleAminoMsg): VisibilityRule { 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 d445eb6f6b..b610aef4cb 100644 --- a/__fixtures__/v-next/outputv2/google/logging/type/http_request.ts +++ b/__fixtures__/v-next/outputv2/google/logging/type/http_request.ts @@ -472,21 +472,21 @@ export const HttpRequest = { }, 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.request_method = message.requestMethod === "" ? undefined : message.requestMethod; + obj.request_url = message.requestUrl === "" ? undefined : message.requestUrl; + obj.request_size = message.requestSize !== BigInt(0) ? message.requestSize.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.response_size = message.responseSize !== BigInt(0) ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent === "" ? undefined : message.userAgent; + obj.remote_ip = message.remoteIp === "" ? undefined : message.remoteIp; + obj.server_ip = message.serverIp === "" ? undefined : message.serverIp; + obj.referer = message.referer === "" ? undefined : 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; + obj.cache_lookup = message.cacheLookup === false ? undefined : message.cacheLookup; + obj.cache_hit = message.cacheHit === false ? undefined : message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer === false ? undefined : message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes !== BigInt(0) ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest { 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 f8ba3ceba8..d3fe621eb7 100644 --- a/__fixtures__/v-next/outputv2/google/logging/v2/log_entry.ts +++ b/__fixtures__/v-next/outputv2/google/logging/v2/log_entry.ts @@ -618,8 +618,8 @@ export const LogEntry_LabelsEntry = { }, toAmino(message: LogEntry_LabelsEntry): LogEntry_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry { @@ -950,7 +950,7 @@ export const LogEntry = { message.receiveTimestamp = fromTimestamp(Timestamp.fromAmino(object.receive_timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.insert_id !== undefined && object.insert_id !== null) { message.insertId = object.insert_id; @@ -988,15 +988,15 @@ export const LogEntry = { }, toAmino(message: LogEntry): LogEntryAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : 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.text_payload = message.textPayload === null ? undefined : message.textPayload; obj.json_payload = message.jsonPayload ? Struct.toAmino(message.jsonPayload) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.receive_timestamp = message.receiveTimestamp ? Timestamp.toAmino(toTimestamp(message.receiveTimestamp)) : undefined; - obj.severity = message.severity; - obj.insert_id = message.insertId; + obj.severity = message.severity === 0 ? undefined : message.severity; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; obj.labels = {}; if (message.labels) { @@ -1005,9 +1005,9 @@ export const LogEntry = { }); } obj.operation = message.operation ? LogEntryOperation.toAmino(message.operation) : undefined; - obj.trace = message.trace; - obj.span_id = message.spanId; - obj.trace_sampled = message.traceSampled; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.span_id = message.spanId === "" ? undefined : message.spanId; + obj.trace_sampled = message.traceSampled === false ? undefined : message.traceSampled; obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toAmino(message.sourceLocation) : undefined; obj.split = message.split ? LogSplit.toAmino(message.split) : undefined; return obj; @@ -1137,10 +1137,10 @@ export const LogEntryOperation = { }, toAmino(message: LogEntryOperation): LogEntryOperationAmino { const obj: any = {}; - obj.id = message.id; - obj.producer = message.producer; - obj.first = message.first; - obj.last = message.last; + obj.id = message.id === "" ? undefined : message.id; + obj.producer = message.producer === "" ? undefined : message.producer; + obj.first = message.first === false ? undefined : message.first; + obj.last = message.last === false ? undefined : message.last; return obj; }, fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation { @@ -1255,9 +1255,9 @@ export const LogEntrySourceLocation = { }, toAmino(message: LogEntrySourceLocation): LogEntrySourceLocationAmino { const obj: any = {}; - obj.file = message.file; - obj.line = message.line ? message.line.toString() : undefined; - obj.function = message.function; + obj.file = message.file === "" ? undefined : message.file; + obj.line = message.line !== BigInt(0) ? message.line.toString() : undefined; + obj.function = message.function === "" ? undefined : message.function; return obj; }, fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation { @@ -1370,9 +1370,9 @@ export const LogSplit = { }, toAmino(message: LogSplit): LogSplitAmino { const obj: any = {}; - obj.uid = message.uid; - obj.index = message.index; - obj.total_splits = message.totalSplits; + obj.uid = message.uid === "" ? undefined : message.uid; + obj.index = message.index === 0 ? undefined : message.index; + obj.total_splits = message.totalSplits === 0 ? undefined : message.totalSplits; return obj; }, fromAminoMsg(object: LogSplitAminoMsg): LogSplit { diff --git a/__fixtures__/v-next/outputv2/google/logging/v2/logging.ts b/__fixtures__/v-next/outputv2/google/logging/v2/logging.ts index dd305599b2..8a57884024 100644 --- a/__fixtures__/v-next/outputv2/google/logging/v2/logging.ts +++ b/__fixtures__/v-next/outputv2/google/logging/v2/logging.ts @@ -1015,7 +1015,7 @@ export const DeleteLogRequest = { }, toAmino(message: DeleteLogRequest): DeleteLogRequestAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; return obj; }, fromAminoMsg(object: DeleteLogRequestAminoMsg): DeleteLogRequest { @@ -1112,8 +1112,8 @@ export const WriteLogEntriesRequest_LabelsEntry = { }, toAmino(message: WriteLogEntriesRequest_LabelsEntry): WriteLogEntriesRequest_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: WriteLogEntriesRequest_LabelsEntryAminoMsg): WriteLogEntriesRequest_LabelsEntry { @@ -1311,7 +1311,7 @@ export const WriteLogEntriesRequest = { }, toAmino(message: WriteLogEntriesRequest): WriteLogEntriesRequestAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; obj.resource = message.resource ? MonitoredResource.toAmino(message.resource) : undefined; obj.labels = {}; if (message.labels) { @@ -1322,10 +1322,10 @@ export const WriteLogEntriesRequest = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } - obj.partial_success = message.partialSuccess; - obj.dry_run = message.dryRun; + obj.partial_success = message.partialSuccess === false ? undefined : message.partialSuccess; + obj.dry_run = message.dryRun === false ? undefined : message.dryRun; return obj; }, fromAminoMsg(object: WriteLogEntriesRequestAminoMsg): WriteLogEntriesRequest { @@ -1489,7 +1489,7 @@ export const WriteLogEntriesPartialErrors_LogEntryErrorsEntry = { }, toAmino(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntry): WriteLogEntriesPartialErrors_LogEntryErrorsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === 0 ? undefined : message.key; obj.value = message.value ? Status.toAmino(message.value) : undefined; return obj; }, @@ -1762,12 +1762,12 @@ export const ListLogEntriesRequest = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } - obj.filter = message.filter; - obj.order_by = message.orderBy; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.order_by = message.orderBy === "" ? undefined : message.orderBy; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListLogEntriesRequestAminoMsg): ListLogEntriesRequest { @@ -1874,9 +1874,9 @@ export const ListLogEntriesResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogEntriesResponseAminoMsg): ListLogEntriesResponse { @@ -1974,8 +1974,8 @@ export const ListMonitoredResourceDescriptorsRequest = { }, toAmino(message: ListMonitoredResourceDescriptorsRequest): ListMonitoredResourceDescriptorsRequestAmino { const obj: any = {}; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListMonitoredResourceDescriptorsRequestAminoMsg): ListMonitoredResourceDescriptorsRequest { @@ -2082,9 +2082,9 @@ export const ListMonitoredResourceDescriptorsResponse = { if (message.resourceDescriptors) { obj.resource_descriptors = message.resourceDescriptors.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.resource_descriptors = []; + obj.resource_descriptors = message.resourceDescriptors; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListMonitoredResourceDescriptorsResponseAminoMsg): ListMonitoredResourceDescriptorsResponse { @@ -2218,13 +2218,13 @@ export const ListLogsRequest = { }, toAmino(message: ListLogsRequest): ListLogsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, @@ -2332,9 +2332,9 @@ export const ListLogsResponse = { if (message.logNames) { obj.log_names = message.logNames.map(e => e); } else { - obj.log_names = []; + obj.log_names = message.logNames; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogsResponseAminoMsg): ListLogsResponse { @@ -2458,9 +2458,9 @@ export const TailLogEntriesRequest = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } - obj.filter = message.filter; + obj.filter = message.filter === "" ? undefined : message.filter; obj.buffer_window = message.bufferWindow ? Duration.toAmino(message.bufferWindow) : undefined; return obj; }, @@ -2574,12 +2574,12 @@ export const TailLogEntriesResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.suppressionInfo) { obj.suppression_info = message.suppressionInfo.map(e => e ? TailLogEntriesResponse_SuppressionInfo.toAmino(e) : undefined); } else { - obj.suppression_info = []; + obj.suppression_info = message.suppressionInfo; } return obj; }, @@ -2669,7 +2669,7 @@ export const TailLogEntriesResponse_SuppressionInfo = { fromAmino(object: TailLogEntriesResponse_SuppressionInfoAmino): TailLogEntriesResponse_SuppressionInfo { const message = createBaseTailLogEntriesResponse_SuppressionInfo(); if (object.reason !== undefined && object.reason !== null) { - message.reason = tailLogEntriesResponse_SuppressionInfo_ReasonFromJSON(object.reason); + message.reason = object.reason; } if (object.suppressed_count !== undefined && object.suppressed_count !== null) { message.suppressedCount = object.suppressed_count; @@ -2678,8 +2678,8 @@ export const TailLogEntriesResponse_SuppressionInfo = { }, toAmino(message: TailLogEntriesResponse_SuppressionInfo): TailLogEntriesResponse_SuppressionInfoAmino { const obj: any = {}; - obj.reason = message.reason; - obj.suppressed_count = message.suppressedCount; + obj.reason = message.reason === 0 ? undefined : message.reason; + obj.suppressed_count = message.suppressedCount === 0 ? undefined : message.suppressedCount; return obj; }, fromAminoMsg(object: TailLogEntriesResponse_SuppressionInfoAminoMsg): TailLogEntriesResponse_SuppressionInfo { 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 757b5c8482..dd6d139cfa 100644 --- a/__fixtures__/v-next/outputv2/google/logging/v2/logging_config.ts +++ b/__fixtures__/v-next/outputv2/google/logging/v2/logging_config.ts @@ -3215,7 +3215,7 @@ export const LogBucket = { message.locked = object.locked; } if (object.lifecycle_state !== undefined && object.lifecycle_state !== null) { - message.lifecycleState = lifecycleStateFromJSON(object.lifecycle_state); + message.lifecycleState = object.lifecycle_state; } message.restrictedFields = object.restricted_fields?.map(e => e) || []; if (object.cmek_settings !== undefined && object.cmek_settings !== null) { @@ -3225,17 +3225,17 @@ export const LogBucket = { }, toAmino(message: LogBucket): LogBucketAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.retention_days = message.retentionDays; - obj.locked = message.locked; - obj.lifecycle_state = message.lifecycleState; + obj.retention_days = message.retentionDays === 0 ? undefined : message.retentionDays; + obj.locked = message.locked === false ? undefined : message.locked; + obj.lifecycle_state = message.lifecycleState === 0 ? undefined : message.lifecycleState; if (message.restrictedFields) { obj.restricted_fields = message.restrictedFields.map(e => e); } else { - obj.restricted_fields = []; + obj.restricted_fields = message.restrictedFields; } obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined; return obj; @@ -3380,11 +3380,11 @@ export const LogView = { }, toAmino(message: LogView): LogViewAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.filter = message.filter; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: LogViewAminoMsg): LogView { @@ -3619,7 +3619,7 @@ export const LogSink = { } message.exclusions = object.exclusions?.map(e => LogExclusion.fromAmino(e)) || []; if (object.output_version_format !== undefined && object.output_version_format !== null) { - message.outputVersionFormat = logSink_VersionFormatFromJSON(object.output_version_format); + message.outputVersionFormat = object.output_version_format; } if (object.writer_identity !== undefined && object.writer_identity !== null) { message.writerIdentity = object.writer_identity; @@ -3640,19 +3640,19 @@ export const LogSink = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.destination = message.destination === "" ? undefined : message.destination; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.description = message.description === "" ? undefined : message.description; + obj.disabled = message.disabled === false ? undefined : message.disabled; if (message.exclusions) { obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e) : undefined); } else { - obj.exclusions = []; + obj.exclusions = message.exclusions; } - obj.output_version_format = message.outputVersionFormat; - obj.writer_identity = message.writerIdentity; - obj.include_children = message.includeChildren; + obj.output_version_format = message.outputVersionFormat === 0 ? undefined : message.outputVersionFormat; + obj.writer_identity = message.writerIdentity === "" ? undefined : message.writerIdentity; + obj.include_children = message.includeChildren === false ? undefined : message.includeChildren; obj.bigquery_options = message.bigqueryOptions ? BigQueryOptions.toAmino(message.bigqueryOptions) : undefined; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; @@ -3753,8 +3753,8 @@ export const BigQueryOptions = { }, toAmino(message: BigQueryOptions): BigQueryOptionsAmino { const obj: any = {}; - obj.use_partitioned_tables = message.usePartitionedTables; - obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning; + obj.use_partitioned_tables = message.usePartitionedTables === false ? undefined : message.usePartitionedTables; + obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning === false ? undefined : message.usesTimestampColumnPartitioning; return obj; }, fromAminoMsg(object: BigQueryOptionsAminoMsg): BigQueryOptions { @@ -3867,9 +3867,9 @@ export const ListBucketsRequest = { }, toAmino(message: ListBucketsRequest): ListBucketsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListBucketsRequestAminoMsg): ListBucketsRequest { @@ -3976,9 +3976,9 @@ export const ListBucketsResponse = { if (message.buckets) { obj.buckets = message.buckets.map(e => e ? LogBucket.toAmino(e) : undefined); } else { - obj.buckets = []; + obj.buckets = message.buckets; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListBucketsResponseAminoMsg): ListBucketsResponse { @@ -4093,8 +4093,8 @@ export const CreateBucketRequest = { }, toAmino(message: CreateBucketRequest): CreateBucketRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.bucket_id = message.bucketId; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.bucket_id = message.bucketId === "" ? undefined : message.bucketId; obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined; return obj; }, @@ -4212,7 +4212,7 @@ export const UpdateBucketRequest = { }, toAmino(message: UpdateBucketRequest): UpdateBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -4297,7 +4297,7 @@ export const GetBucketRequest = { }, toAmino(message: GetBucketRequest): GetBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetBucketRequestAminoMsg): GetBucketRequest { @@ -4380,7 +4380,7 @@ export const DeleteBucketRequest = { }, toAmino(message: DeleteBucketRequest): DeleteBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteBucketRequestAminoMsg): DeleteBucketRequest { @@ -4463,7 +4463,7 @@ export const UndeleteBucketRequest = { }, toAmino(message: UndeleteBucketRequest): UndeleteBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: UndeleteBucketRequestAminoMsg): UndeleteBucketRequest { @@ -4576,9 +4576,9 @@ export const ListViewsRequest = { }, toAmino(message: ListViewsRequest): ListViewsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListViewsRequestAminoMsg): ListViewsRequest { @@ -4685,9 +4685,9 @@ export const ListViewsResponse = { if (message.views) { obj.views = message.views.map(e => e ? LogView.toAmino(e) : undefined); } else { - obj.views = []; + obj.views = message.views; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListViewsResponseAminoMsg): ListViewsResponse { @@ -4802,8 +4802,8 @@ export const CreateViewRequest = { }, toAmino(message: CreateViewRequest): CreateViewRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.view_id = message.viewId; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.view_id = message.viewId === "" ? undefined : message.viewId; obj.view = message.view ? LogView.toAmino(message.view) : undefined; return obj; }, @@ -4921,7 +4921,7 @@ export const UpdateViewRequest = { }, toAmino(message: UpdateViewRequest): UpdateViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.view = message.view ? LogView.toAmino(message.view) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -5006,7 +5006,7 @@ export const GetViewRequest = { }, toAmino(message: GetViewRequest): GetViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetViewRequestAminoMsg): GetViewRequest { @@ -5089,7 +5089,7 @@ export const DeleteViewRequest = { }, toAmino(message: DeleteViewRequest): DeleteViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteViewRequestAminoMsg): DeleteViewRequest { @@ -5202,9 +5202,9 @@ export const ListSinksRequest = { }, toAmino(message: ListSinksRequest): ListSinksRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListSinksRequestAminoMsg): ListSinksRequest { @@ -5311,9 +5311,9 @@ export const ListSinksResponse = { if (message.sinks) { obj.sinks = message.sinks.map(e => e ? LogSink.toAmino(e) : undefined); } else { - obj.sinks = []; + obj.sinks = message.sinks; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListSinksResponseAminoMsg): ListSinksResponse { @@ -5396,7 +5396,7 @@ export const GetSinkRequest = { }, toAmino(message: GetSinkRequest): GetSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; return obj; }, fromAminoMsg(object: GetSinkRequestAminoMsg): GetSinkRequest { @@ -5511,9 +5511,9 @@ export const CreateSinkRequest = { }, toAmino(message: CreateSinkRequest): CreateSinkRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined; - obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.unique_writer_identity = message.uniqueWriterIdentity === false ? undefined : message.uniqueWriterIdentity; return obj; }, fromAminoMsg(object: CreateSinkRequestAminoMsg): CreateSinkRequest { @@ -5645,9 +5645,9 @@ export const UpdateSinkRequest = { }, toAmino(message: UpdateSinkRequest): UpdateSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined; - obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.unique_writer_identity = message.uniqueWriterIdentity === false ? undefined : message.uniqueWriterIdentity; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; }, @@ -5731,7 +5731,7 @@ export const DeleteSinkRequest = { }, toAmino(message: DeleteSinkRequest): DeleteSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; return obj; }, fromAminoMsg(object: DeleteSinkRequestAminoMsg): DeleteSinkRequest { @@ -5889,10 +5889,10 @@ export const LogExclusion = { }, toAmino(message: LogExclusion): LogExclusionAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; - obj.filter = message.filter; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.disabled = message.disabled === false ? undefined : message.disabled; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; return obj; @@ -6007,9 +6007,9 @@ export const ListExclusionsRequest = { }, toAmino(message: ListExclusionsRequest): ListExclusionsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListExclusionsRequestAminoMsg): ListExclusionsRequest { @@ -6116,9 +6116,9 @@ export const ListExclusionsResponse = { if (message.exclusions) { obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e) : undefined); } else { - obj.exclusions = []; + obj.exclusions = message.exclusions; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListExclusionsResponseAminoMsg): ListExclusionsResponse { @@ -6201,7 +6201,7 @@ export const GetExclusionRequest = { }, toAmino(message: GetExclusionRequest): GetExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetExclusionRequestAminoMsg): GetExclusionRequest { @@ -6301,7 +6301,7 @@ export const CreateExclusionRequest = { }, toAmino(message: CreateExclusionRequest): CreateExclusionRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined; return obj; }, @@ -6419,7 +6419,7 @@ export const UpdateExclusionRequest = { }, toAmino(message: UpdateExclusionRequest): UpdateExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -6504,7 +6504,7 @@ export const DeleteExclusionRequest = { }, toAmino(message: DeleteExclusionRequest): DeleteExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteExclusionRequestAminoMsg): DeleteExclusionRequest { @@ -6587,7 +6587,7 @@ export const GetCmekSettingsRequest = { }, toAmino(message: GetCmekSettingsRequest): GetCmekSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetCmekSettingsRequestAminoMsg): GetCmekSettingsRequest { @@ -6704,7 +6704,7 @@ export const UpdateCmekSettingsRequest = { }, toAmino(message: UpdateCmekSettingsRequest): UpdateCmekSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -6819,9 +6819,9 @@ export const CmekSettings = { }, toAmino(message: CmekSettings): CmekSettingsAmino { const obj: any = {}; - obj.name = message.name; - obj.kms_key_name = message.kmsKeyName; - obj.service_account_id = message.serviceAccountId; + obj.name = message.name === "" ? undefined : message.name; + obj.kms_key_name = message.kmsKeyName === "" ? undefined : message.kmsKeyName; + obj.service_account_id = message.serviceAccountId === "" ? undefined : message.serviceAccountId; return obj; }, fromAminoMsg(object: CmekSettingsAminoMsg): CmekSettings { @@ -6904,7 +6904,7 @@ export const GetSettingsRequest = { }, toAmino(message: GetSettingsRequest): GetSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetSettingsRequestAminoMsg): GetSettingsRequest { @@ -7021,7 +7021,7 @@ export const UpdateSettingsRequest = { }, toAmino(message: UpdateSettingsRequest): UpdateSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.settings = message.settings ? Settings.toAmino(message.settings) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -7166,11 +7166,11 @@ export const Settings = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.kms_key_name = message.kmsKeyName === "" ? undefined : message.kmsKeyName; + obj.kms_service_account_id = message.kmsServiceAccountId === "" ? undefined : message.kmsServiceAccountId; + obj.storage_location = message.storageLocation === "" ? undefined : message.storageLocation; + obj.disable_default_sink = message.disableDefaultSink === false ? undefined : message.disableDefaultSink; return obj; }, fromAminoMsg(object: SettingsAminoMsg): Settings { @@ -7283,9 +7283,9 @@ export const CopyLogEntriesRequest = { }, toAmino(message: CopyLogEntriesRequest): CopyLogEntriesRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.filter = message.filter; - obj.destination = message.destination; + obj.name = message.name === "" ? undefined : message.name; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.destination = message.destination === "" ? undefined : message.destination; return obj; }, fromAminoMsg(object: CopyLogEntriesRequestAminoMsg): CopyLogEntriesRequest { @@ -7442,7 +7442,7 @@ export const CopyLogEntriesMetadata = { message.endTime = fromTimestamp(Timestamp.fromAmino(object.end_time)); } if (object.state !== undefined && object.state !== null) { - message.state = operationStateFromJSON(object.state); + message.state = object.state; } if (object.cancellation_requested !== undefined && object.cancellation_requested !== null) { message.cancellationRequested = object.cancellation_requested; @@ -7462,11 +7462,11 @@ export const CopyLogEntriesMetadata = { const obj: any = {}; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; - obj.state = message.state; - obj.cancellation_requested = message.cancellationRequested; + obj.state = message.state === 0 ? undefined : message.state; + obj.cancellation_requested = message.cancellationRequested === false ? undefined : message.cancellationRequested; obj.request = message.request ? CopyLogEntriesRequest.toAmino(message.request) : undefined; - obj.progress = message.progress; - obj.writer_identity = message.writerIdentity; + obj.progress = message.progress === 0 ? undefined : message.progress; + obj.writer_identity = message.writerIdentity === "" ? undefined : message.writerIdentity; return obj; }, fromAminoMsg(object: CopyLogEntriesMetadataAminoMsg): CopyLogEntriesMetadata { @@ -7551,7 +7551,7 @@ export const CopyLogEntriesResponse = { }, toAmino(message: CopyLogEntriesResponse): CopyLogEntriesResponseAmino { const obj: any = {}; - obj.log_entries_copied_count = message.logEntriesCopiedCount ? message.logEntriesCopiedCount.toString() : undefined; + obj.log_entries_copied_count = message.logEntriesCopiedCount !== BigInt(0) ? message.logEntriesCopiedCount.toString() : undefined; return obj; }, fromAminoMsg(object: CopyLogEntriesResponseAminoMsg): CopyLogEntriesResponse { 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 8f51b4fc8a..8234c80079 100644 --- a/__fixtures__/v-next/outputv2/google/logging/v2/logging_metrics.ts +++ b/__fixtures__/v-next/outputv2/google/logging/v2/logging_metrics.ts @@ -683,8 +683,8 @@ export const LogMetric_LabelExtractorsEntry = { }, toAmino(message: LogMetric_LabelExtractorsEntry): LogMetric_LabelExtractorsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogMetric_LabelExtractorsEntryAminoMsg): LogMetric_LabelExtractorsEntry { @@ -947,18 +947,18 @@ export const LogMetric = { message.updateTime = fromTimestamp(Timestamp.fromAmino(object.update_time)); } if (object.version !== undefined && object.version !== null) { - message.version = logMetric_ApiVersionFromJSON(object.version); + message.version = object.version; } return message; }, toAmino(message: LogMetric): LogMetricAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; - obj.filter = message.filter; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.disabled = message.disabled === false ? undefined : message.disabled; obj.metric_descriptor = message.metricDescriptor ? MetricDescriptor.toAmino(message.metricDescriptor) : undefined; - obj.value_extractor = message.valueExtractor; + obj.value_extractor = message.valueExtractor === "" ? undefined : message.valueExtractor; obj.label_extractors = {}; if (message.labelExtractors) { Object.entries(message.labelExtractors).forEach(([k, v]) => { @@ -968,7 +968,7 @@ export const LogMetric = { obj.bucket_options = message.bucketOptions ? Distribution_BucketOptions.toAmino(message.bucketOptions) : undefined; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.version = message.version; + obj.version = message.version === 0 ? undefined : message.version; return obj; }, fromAminoMsg(object: LogMetricAminoMsg): LogMetric { @@ -1081,9 +1081,9 @@ export const ListLogMetricsRequest = { }, toAmino(message: ListLogMetricsRequest): ListLogMetricsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListLogMetricsRequestAminoMsg): ListLogMetricsRequest { @@ -1190,9 +1190,9 @@ export const ListLogMetricsResponse = { if (message.metrics) { obj.metrics = message.metrics.map(e => e ? LogMetric.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogMetricsResponseAminoMsg): ListLogMetricsResponse { @@ -1275,7 +1275,7 @@ export const GetLogMetricRequest = { }, toAmino(message: GetLogMetricRequest): GetLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; return obj; }, fromAminoMsg(object: GetLogMetricRequestAminoMsg): GetLogMetricRequest { @@ -1375,7 +1375,7 @@ export const CreateLogMetricRequest = { }, toAmino(message: CreateLogMetricRequest): CreateLogMetricRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined; return obj; }, @@ -1476,7 +1476,7 @@ export const UpdateLogMetricRequest = { }, toAmino(message: UpdateLogMetricRequest): UpdateLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined; return obj; }, @@ -1560,7 +1560,7 @@ export const DeleteLogMetricRequest = { }, toAmino(message: DeleteLogMetricRequest): DeleteLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; return obj; }, fromAminoMsg(object: DeleteLogMetricRequestAminoMsg): DeleteLogMetricRequest { diff --git a/__fixtures__/v-next/outputv2/google/longrunning/operations.ts b/__fixtures__/v-next/outputv2/google/longrunning/operations.ts index 09c2c6a8af..c0ba07b598 100644 --- a/__fixtures__/v-next/outputv2/google/longrunning/operations.ts +++ b/__fixtures__/v-next/outputv2/google/longrunning/operations.ts @@ -491,9 +491,9 @@ export const Operation = { }, toAmino(message: Operation): OperationAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.metadata = message.metadata ? Any.toAmino(message.metadata) : undefined; - obj.done = message.done; + obj.done = message.done === false ? undefined : message.done; obj.error = message.error ? Status.toAmino(message.error) : undefined; obj.response = message.response ? Any.toAmino(message.response) : undefined; return obj; @@ -578,7 +578,7 @@ export const GetOperationRequest = { }, toAmino(message: GetOperationRequest): GetOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetOperationRequestAminoMsg): GetOperationRequest { @@ -706,10 +706,10 @@ export const ListOperationsRequest = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListOperationsRequestAminoMsg): ListOperationsRequest { @@ -816,9 +816,9 @@ export const ListOperationsResponse = { if (message.operations) { obj.operations = message.operations.map(e => e ? Operation.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListOperationsResponseAminoMsg): ListOperationsResponse { @@ -901,7 +901,7 @@ export const CancelOperationRequest = { }, toAmino(message: CancelOperationRequest): CancelOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: CancelOperationRequestAminoMsg): CancelOperationRequest { @@ -984,7 +984,7 @@ export const DeleteOperationRequest = { }, toAmino(message: DeleteOperationRequest): DeleteOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteOperationRequestAminoMsg): DeleteOperationRequest { @@ -1084,7 +1084,7 @@ export const WaitOperationRequest = { }, toAmino(message: WaitOperationRequest): WaitOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timeout = message.timeout ? Duration.toAmino(message.timeout) : undefined; return obj; }, @@ -1183,8 +1183,8 @@ export const OperationInfo = { }, toAmino(message: OperationInfo): OperationInfoAmino { const obj: any = {}; - obj.response_type = message.responseType; - obj.metadata_type = message.metadataType; + obj.response_type = message.responseType === "" ? undefined : message.responseType; + obj.metadata_type = message.metadataType === "" ? undefined : message.metadataType; return obj; }, fromAminoMsg(object: OperationInfoAminoMsg): OperationInfo { diff --git a/__fixtures__/v-next/outputv2/google/protobuf/api.ts b/__fixtures__/v-next/outputv2/google/protobuf/api.ts index 3a706c19ce..f607d612a3 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/api.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/api.ts @@ -627,31 +627,31 @@ export const Api = { } message.mixins = object.mixins?.map(e => Mixin.fromAmino(e)) || []; if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Api): ApiAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.methods) { obj.methods = message.methods.map(e => e ? Method.toAmino(e) : undefined); } else { - obj.methods = []; + obj.methods = message.methods; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.version = message.version; + obj.version = message.version === "" ? undefined : 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.mixins = message.mixins; } - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: ApiAminoMsg): Api { @@ -824,23 +824,23 @@ export const Method = { } message.options = object.options?.map(e => Option.fromAmino(e)) || []; if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.request_type_url = message.requestTypeUrl === "" ? undefined : message.requestTypeUrl; + obj.request_streaming = message.requestStreaming === false ? undefined : message.requestStreaming; + obj.response_type_url = message.responseTypeUrl === "" ? undefined : message.responseTypeUrl; + obj.response_streaming = message.responseStreaming === false ? undefined : message.responseStreaming; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: MethodAminoMsg): Method { @@ -938,8 +938,8 @@ export const Mixin = { }, toAmino(message: Mixin): MixinAmino { const obj: any = {}; - obj.name = message.name; - obj.root = message.root; + obj.name = message.name === "" ? undefined : message.name; + obj.root = message.root === "" ? undefined : message.root; return obj; }, fromAminoMsg(object: MixinAminoMsg): Mixin { diff --git a/__fixtures__/v-next/outputv2/google/protobuf/compiler/plugin.ts b/__fixtures__/v-next/outputv2/google/protobuf/compiler/plugin.ts index 92bf4f24a6..442f7f0f55 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/compiler/plugin.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/compiler/plugin.ts @@ -398,10 +398,10 @@ export const Version = { }, toAmino(message: Version): VersionAmino { const obj: any = {}; - obj.major = message.major; - obj.minor = message.minor; - obj.patch = message.patch; - obj.suffix = message.suffix; + obj.major = message.major === 0 ? undefined : message.major; + obj.minor = message.minor === 0 ? undefined : message.minor; + obj.patch = message.patch === 0 ? undefined : message.patch; + obj.suffix = message.suffix === "" ? undefined : message.suffix; return obj; }, fromAminoMsg(object: VersionAminoMsg): Version { @@ -546,13 +546,13 @@ export const CodeGeneratorRequest = { if (message.fileToGenerate) { obj.file_to_generate = message.fileToGenerate.map(e => e); } else { - obj.file_to_generate = []; + obj.file_to_generate = message.fileToGenerate; } - obj.parameter = message.parameter; + obj.parameter = message.parameter === "" ? undefined : message.parameter; if (message.protoFile) { obj.proto_file = message.protoFile.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.proto_file = []; + obj.proto_file = message.protoFile; } obj.compiler_version = message.compilerVersion ? Version.toAmino(message.compilerVersion) : undefined; return obj; @@ -658,11 +658,11 @@ export const CodeGeneratorResponse = { }, toAmino(message: CodeGeneratorResponse): CodeGeneratorResponseAmino { const obj: any = {}; - obj.error = message.error; + obj.error = message.error === "" ? undefined : message.error; if (message.file) { obj.file = message.file.map(e => e ? CodeGeneratorResponse_File.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -776,9 +776,9 @@ export const CodeGeneratorResponse_File = { }, toAmino(message: CodeGeneratorResponse_File): CodeGeneratorResponse_FileAmino { const obj: any = {}; - obj.name = message.name; - obj.insertion_point = message.insertionPoint; - obj.content = message.content; + obj.name = message.name === "" ? undefined : message.name; + obj.insertion_point = message.insertionPoint === "" ? undefined : message.insertionPoint; + obj.content = message.content === "" ? undefined : message.content; return obj; }, fromAminoMsg(object: CodeGeneratorResponse_FileAminoMsg): CodeGeneratorResponse_File { diff --git a/__fixtures__/v-next/outputv2/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputv2/google/protobuf/descriptor.ts index f5adfe995c..39e1d2e5ee 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/descriptor.ts @@ -2270,7 +2270,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -2583,46 +2583,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2890,47 +2890,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3046,8 +3046,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -3146,8 +3146,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -3239,7 +3239,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -3433,10 +3433,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -3460,15 +3460,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -3569,7 +3569,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3733,22 +3733,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3847,8 +3847,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -3963,8 +3963,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -4086,11 +4086,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -4252,12 +4252,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -4597,7 +4597,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -4646,30 +4646,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4819,14 +4819,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4984,13 +4984,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -5006,16 +5006,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5108,7 +5108,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5228,12 +5228,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5338,11 +5338,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5447,11 +5447,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5564,19 +5564,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5763,14 +5763,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -5868,8 +5868,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -5961,7 +5961,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -6144,19 +6144,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -6249,7 +6249,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -6396,11 +6396,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/v-next/outputv2/google/protobuf/field_mask.ts b/__fixtures__/v-next/outputv2/google/protobuf/field_mask.ts index 552bd78d10..193508e16b 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/field_mask.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/field_mask.ts @@ -696,7 +696,7 @@ export const FieldMask = { if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/protobuf/source_context.ts b/__fixtures__/v-next/outputv2/google/protobuf/source_context.ts index dcd4394d96..c4b4953f5e 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/source_context.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/source_context.ts @@ -102,7 +102,7 @@ export const SourceContext = { }, toAmino(message: SourceContext): SourceContextAmino { const obj: any = {}; - obj.file_name = message.fileName; + obj.file_name = message.fileName === "" ? undefined : message.fileName; return obj; }, fromAminoMsg(object: SourceContextAminoMsg): SourceContext { diff --git a/__fixtures__/v-next/outputv2/google/protobuf/struct.ts b/__fixtures__/v-next/outputv2/google/protobuf/struct.ts index f85be53a9e..440468d65a 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/struct.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/struct.ts @@ -291,7 +291,7 @@ export const Struct_FieldsEntry = { }, toAmino(message: Struct_FieldsEntry): Struct_FieldsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? Value.toAmino(message.value) : undefined; return obj; }, @@ -553,7 +553,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.number_value !== undefined && object.number_value !== null) { message.numberValue = object.number_value; @@ -574,10 +574,10 @@ export const Value = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.number_value = message.numberValue === null ? undefined : message.numberValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; obj.struct_value = message.structValue ? Struct.toAmino(message.structValue) : undefined; obj.list_value = message.listValue ? ListValue.toAmino(message.listValue) : undefined; return obj; @@ -671,7 +671,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/protobuf/type.ts b/__fixtures__/v-next/outputv2/google/protobuf/type.ts index 2db845eeae..d35f3c810e 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/type.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/type.ts @@ -650,30 +650,30 @@ export const Type = { message.sourceContext = SourceContext.fromAmino(object.source_context); } if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Type): TypeAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.fields) { obj.fields = message.fields.map(e => e ? Field.toAmino(e) : undefined); } else { - obj.fields = []; + obj.fields = message.fields; } if (message.oneofs) { obj.oneofs = message.oneofs.map(e => e); } else { - obj.oneofs = []; + obj.oneofs = message.oneofs; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: TypeAminoMsg): Type { @@ -866,10 +866,10 @@ export const Field = { fromAmino(object: FieldAmino): Field { const message = createBaseField(); if (object.kind !== undefined && object.kind !== null) { - message.kind = field_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.cardinality !== undefined && object.cardinality !== null) { - message.cardinality = field_CardinalityFromJSON(object.cardinality); + message.cardinality = object.cardinality; } if (object.number !== undefined && object.number !== null) { message.number = object.number; @@ -897,20 +897,20 @@ export const Field = { }, 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; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.cardinality = message.cardinality === 0 ? undefined : message.cardinality; + obj.number = message.number === 0 ? undefined : message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.type_url = message.typeUrl === "" ? undefined : message.typeUrl; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.packed = message.packed === false ? undefined : message.packed; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.json_name = message.jsonName; - obj.default_value = message.defaultValue; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; return obj; }, fromAminoMsg(object: FieldAminoMsg): Field { @@ -1061,25 +1061,25 @@ export const Enum = { message.sourceContext = SourceContext.fromAmino(object.source_context); } if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Enum): EnumAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.enumvalue) { obj.enumvalue = message.enumvalue.map(e => e ? EnumValue.toAmino(e) : undefined); } else { - obj.enumvalue = []; + obj.enumvalue = message.enumvalue; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: EnumAminoMsg): Enum { @@ -1198,12 +1198,12 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -1304,7 +1304,7 @@ export const Option = { }, toAmino(message: Option): OptionAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.value = message.value ? Any.toAmino(message.value) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv2/google/protobuf/wrappers.ts b/__fixtures__/v-next/outputv2/google/protobuf/wrappers.ts index 2c7a3d0114..3556997715 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/wrappers.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/wrappers.ts @@ -371,7 +371,7 @@ export const DoubleValue = { }, toAmino(message: DoubleValue): DoubleValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: DoubleValueAminoMsg): DoubleValue { @@ -454,7 +454,7 @@ export const FloatValue = { }, toAmino(message: FloatValue): FloatValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: FloatValueAminoMsg): FloatValue { @@ -539,7 +539,7 @@ export const Int64Value = { }, toAmino(message: Int64Value): Int64ValueAmino { const obj: any = {}; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: Int64ValueAminoMsg): Int64Value { @@ -624,7 +624,7 @@ export const UInt64Value = { }, toAmino(message: UInt64Value): UInt64ValueAmino { const obj: any = {}; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: UInt64ValueAminoMsg): UInt64Value { @@ -707,7 +707,7 @@ export const Int32Value = { }, toAmino(message: Int32Value): Int32ValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: Int32ValueAminoMsg): Int32Value { @@ -790,7 +790,7 @@ export const UInt32Value = { }, toAmino(message: UInt32Value): UInt32ValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: UInt32ValueAminoMsg): UInt32Value { @@ -873,7 +873,7 @@ export const BoolValue = { }, toAmino(message: BoolValue): BoolValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === false ? undefined : message.value; return obj; }, fromAminoMsg(object: BoolValueAminoMsg): BoolValue { @@ -956,7 +956,7 @@ export const StringValue = { }, toAmino(message: StringValue): StringValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: StringValueAminoMsg): StringValue { diff --git a/__fixtures__/v-next/outputv2/google/rpc/context/attribute_context.ts b/__fixtures__/v-next/outputv2/google/rpc/context/attribute_context.ts index a0d740db7c..5560942348 100644 --- a/__fixtures__/v-next/outputv2/google/rpc/context/attribute_context.ts +++ b/__fixtures__/v-next/outputv2/google/rpc/context/attribute_context.ts @@ -1204,7 +1204,7 @@ export const AttributeContext = { if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, @@ -1302,8 +1302,8 @@ export const AttributeContext_Peer_LabelsEntry = { }, toAmino(message: AttributeContext_Peer_LabelsEntry): AttributeContext_Peer_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Peer_LabelsEntryAminoMsg): AttributeContext_Peer_LabelsEntry { @@ -1480,16 +1480,16 @@ export const AttributeContext_Peer = { }, toAmino(message: AttributeContext_Peer): AttributeContext_PeerAmino { const obj: any = {}; - obj.ip = message.ip; - obj.port = message.port ? message.port.toString() : undefined; + obj.ip = message.ip === "" ? undefined : message.ip; + obj.port = message.port !== BigInt(0) ? 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; + obj.principal = message.principal === "" ? undefined : message.principal; + obj.region_code = message.regionCode === "" ? undefined : message.regionCode; return obj; }, fromAminoMsg(object: AttributeContext_PeerAminoMsg): AttributeContext_Peer { @@ -1617,10 +1617,10 @@ export const AttributeContext_Api = { }, 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; + obj.service = message.service === "" ? undefined : message.service; + obj.operation = message.operation === "" ? undefined : message.operation; + obj.protocol = message.protocol === "" ? undefined : message.protocol; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: AttributeContext_ApiAminoMsg): AttributeContext_Api { @@ -1777,18 +1777,18 @@ export const AttributeContext_Auth = { }, toAmino(message: AttributeContext_Auth): AttributeContext_AuthAmino { const obj: any = {}; - obj.principal = message.principal; + obj.principal = message.principal === "" ? undefined : message.principal; if (message.audiences) { obj.audiences = message.audiences.map(e => e); } else { - obj.audiences = []; + obj.audiences = message.audiences; } - obj.presenter = message.presenter; + obj.presenter = message.presenter === "" ? undefined : 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 = []; + obj.access_levels = message.accessLevels; } return obj; }, @@ -1886,8 +1886,8 @@ export const AttributeContext_Request_HeadersEntry = { }, toAmino(message: AttributeContext_Request_HeadersEntry): AttributeContext_Request_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Request_HeadersEntryAminoMsg): AttributeContext_Request_HeadersEntry { @@ -2171,22 +2171,22 @@ export const AttributeContext_Request = { }, toAmino(message: AttributeContext_Request): AttributeContext_RequestAmino { const obj: any = {}; - obj.id = message.id; - obj.method = message.method; + obj.id = message.id === "" ? undefined : message.id; + obj.method = message.method === "" ? undefined : 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.path = message.path === "" ? undefined : message.path; + obj.host = message.host === "" ? undefined : message.host; + obj.scheme = message.scheme === "" ? undefined : message.scheme; + obj.query = message.query === "" ? undefined : message.query; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.size = message.size ? message.size.toString() : undefined; - obj.protocol = message.protocol; - obj.reason = message.reason; + obj.size = message.size !== BigInt(0) ? message.size.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; + obj.reason = message.reason === "" ? undefined : message.reason; obj.auth = message.auth ? AttributeContext_Auth.toAmino(message.auth) : undefined; return obj; }, @@ -2284,8 +2284,8 @@ export const AttributeContext_Response_HeadersEntry = { }, toAmino(message: AttributeContext_Response_HeadersEntry): AttributeContext_Response_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Response_HeadersEntryAminoMsg): AttributeContext_Response_HeadersEntry { @@ -2466,8 +2466,8 @@ export const AttributeContext_Response = { }, 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.code = message.code !== BigInt(0) ? message.code.toString() : undefined; + obj.size = message.size !== BigInt(0) ? message.size.toString() : undefined; obj.headers = {}; if (message.headers) { Object.entries(message.headers).forEach(([k, v]) => { @@ -2572,8 +2572,8 @@ export const AttributeContext_Resource_LabelsEntry = { }, toAmino(message: AttributeContext_Resource_LabelsEntry): AttributeContext_Resource_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Resource_LabelsEntryAminoMsg): AttributeContext_Resource_LabelsEntry { @@ -2664,8 +2664,8 @@ export const AttributeContext_Resource_AnnotationsEntry = { }, toAmino(message: AttributeContext_Resource_AnnotationsEntry): AttributeContext_Resource_AnnotationsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Resource_AnnotationsEntryAminoMsg): AttributeContext_Resource_AnnotationsEntry { @@ -2983,28 +2983,28 @@ export const AttributeContext_Resource = { }, toAmino(message: AttributeContext_Resource): AttributeContext_ResourceAmino { const obj: any = {}; - obj.service = message.service; - obj.name = message.name; - obj.type = message.type; + obj.service = message.service === "" ? undefined : message.service; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { obj.labels[k] = v; }); } - obj.uid = message.uid; + obj.uid = message.uid === "" ? undefined : message.uid; obj.annotations = {}; if (message.annotations) { Object.entries(message.annotations).forEach(([k, v]) => { obj.annotations[k] = v; }); } - obj.display_name = message.displayName; + obj.display_name = message.displayName === "" ? undefined : message.displayName; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; obj.delete_time = message.deleteTime ? Timestamp.toAmino(toTimestamp(message.deleteTime)) : undefined; - obj.etag = message.etag; - obj.location = message.location; + obj.etag = message.etag === "" ? undefined : message.etag; + obj.location = message.location === "" ? undefined : message.location; return obj; }, fromAminoMsg(object: AttributeContext_ResourceAminoMsg): AttributeContext_Resource { diff --git a/__fixtures__/v-next/outputv2/google/rpc/error_details.ts b/__fixtures__/v-next/outputv2/google/rpc/error_details.ts index f5b258f348..7d96ca7211 100644 --- a/__fixtures__/v-next/outputv2/google/rpc/error_details.ts +++ b/__fixtures__/v-next/outputv2/google/rpc/error_details.ts @@ -951,9 +951,9 @@ export const DebugInfo = { if (message.stackEntries) { obj.stack_entries = message.stackEntries.map(e => e); } else { - obj.stack_entries = []; + obj.stack_entries = message.stackEntries; } - obj.detail = message.detail; + obj.detail = message.detail === "" ? undefined : message.detail; return obj; }, fromAminoMsg(object: DebugInfoAminoMsg): DebugInfo { @@ -1045,7 +1045,7 @@ export const QuotaFailure = { if (message.violations) { obj.violations = message.violations.map(e => e ? QuotaFailure_Violation.toAmino(e) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -1144,8 +1144,8 @@ export const QuotaFailure_Violation = { }, toAmino(message: QuotaFailure_Violation): QuotaFailure_ViolationAmino { const obj: any = {}; - obj.subject = message.subject; - obj.description = message.description; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: QuotaFailure_ViolationAminoMsg): QuotaFailure_Violation { @@ -1242,8 +1242,8 @@ export const ErrorInfo_MetadataEntry = { }, toAmino(message: ErrorInfo_MetadataEntry): ErrorInfo_MetadataEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: ErrorInfo_MetadataEntryAminoMsg): ErrorInfo_MetadataEntry { @@ -1388,8 +1388,8 @@ export const ErrorInfo = { }, toAmino(message: ErrorInfo): ErrorInfoAmino { const obj: any = {}; - obj.reason = message.reason; - obj.domain = message.domain; + obj.reason = message.reason === "" ? undefined : message.reason; + obj.domain = message.domain === "" ? undefined : message.domain; obj.metadata = {}; if (message.metadata) { Object.entries(message.metadata).forEach(([k, v]) => { @@ -1487,7 +1487,7 @@ export const PreconditionFailure = { if (message.violations) { obj.violations = message.violations.map(e => e ? PreconditionFailure_Violation.toAmino(e) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -1601,9 +1601,9 @@ export const PreconditionFailure_Violation = { }, toAmino(message: PreconditionFailure_Violation): PreconditionFailure_ViolationAmino { const obj: any = {}; - obj.type = message.type; - obj.subject = message.subject; - obj.description = message.description; + obj.type = message.type === "" ? undefined : message.type; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: PreconditionFailure_ViolationAminoMsg): PreconditionFailure_Violation { @@ -1695,7 +1695,7 @@ export const BadRequest = { if (message.fieldViolations) { obj.field_violations = message.fieldViolations.map(e => e ? BadRequest_FieldViolation.toAmino(e) : undefined); } else { - obj.field_violations = []; + obj.field_violations = message.fieldViolations; } return obj; }, @@ -1794,8 +1794,8 @@ export const BadRequest_FieldViolation = { }, toAmino(message: BadRequest_FieldViolation): BadRequest_FieldViolationAmino { const obj: any = {}; - obj.field = message.field; - obj.description = message.description; + obj.field = message.field === "" ? undefined : message.field; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: BadRequest_FieldViolationAminoMsg): BadRequest_FieldViolation { @@ -1893,8 +1893,8 @@ export const RequestInfo = { }, toAmino(message: RequestInfo): RequestInfoAmino { const obj: any = {}; - obj.request_id = message.requestId; - obj.serving_data = message.servingData; + obj.request_id = message.requestId === "" ? undefined : message.requestId; + obj.serving_data = message.servingData === "" ? undefined : message.servingData; return obj; }, fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo { @@ -2022,10 +2022,10 @@ export const ResourceInfo = { }, 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; + obj.resource_type = message.resourceType === "" ? undefined : message.resourceType; + obj.resource_name = message.resourceName === "" ? undefined : message.resourceName; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo { @@ -2117,7 +2117,7 @@ export const Help = { if (message.links) { obj.links = message.links.map(e => e ? Help_Link.toAmino(e) : undefined); } else { - obj.links = []; + obj.links = message.links; } return obj; }, @@ -2216,8 +2216,8 @@ export const Help_Link = { }, toAmino(message: Help_Link): Help_LinkAmino { const obj: any = {}; - obj.description = message.description; - obj.url = message.url; + obj.description = message.description === "" ? undefined : message.description; + obj.url = message.url === "" ? undefined : message.url; return obj; }, fromAminoMsg(object: Help_LinkAminoMsg): Help_Link { @@ -2315,8 +2315,8 @@ export const LocalizedMessage = { }, toAmino(message: LocalizedMessage): LocalizedMessageAmino { const obj: any = {}; - obj.locale = message.locale; - obj.message = message.message; + obj.locale = message.locale === "" ? undefined : message.locale; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: LocalizedMessageAminoMsg): LocalizedMessage { diff --git a/__fixtures__/v-next/outputv2/google/rpc/status.ts b/__fixtures__/v-next/outputv2/google/rpc/status.ts index ffeda611ab..34662ded0e 100644 --- a/__fixtures__/v-next/outputv2/google/rpc/status.ts +++ b/__fixtures__/v-next/outputv2/google/rpc/status.ts @@ -172,12 +172,12 @@ export const Status = { }, toAmino(message: Status): StatusAmino { const obj: any = {}; - obj.code = message.code; - obj.message = message.message; + obj.code = message.code === 0 ? undefined : message.code; + obj.message = message.message === "" ? undefined : message.message; if (message.details) { obj.details = message.details.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.details = []; + obj.details = message.details; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/helpers.ts b/__fixtures__/v-next/outputv2/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/v-next/outputv2/helpers.ts +++ b/__fixtures__/v-next/outputv2/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/genesis.ts b/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/genesis.ts index 53f754163d..0b3a350003 100644 --- a/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/genesis.ts @@ -131,11 +131,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.port_id = message.portId; + obj.port_id = message.portId === "" ? undefined : message.portId; if (message.denomTraces) { obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e) : undefined); } else { - obj.denom_traces = []; + obj.denom_traces = message.denomTraces; } obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/query.ts b/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/query.ts index bd4e260dc3..33af9a9633 100644 --- a/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/query.ts +++ b/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/query.ts @@ -233,7 +233,7 @@ export const QueryDenomTraceRequest = { }, toAmino(message: QueryDenomTraceRequest): QueryDenomTraceRequestAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === "" ? undefined : message.hash; return obj; }, fromAminoMsg(object: QueryDenomTraceRequestAminoMsg): QueryDenomTraceRequest { @@ -533,7 +533,7 @@ export const QueryDenomTracesResponse = { if (message.denomTraces) { obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e) : undefined); } else { - obj.denom_traces = []; + obj.denom_traces = message.denomTraces; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/transfer.ts b/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/transfer.ts index 87679420f6..22ea78785c 100644 --- a/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/transfer.ts +++ b/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/transfer.ts @@ -177,8 +177,8 @@ export const DenomTrace = { }, toAmino(message: DenomTrace): DenomTraceAmino { const obj: any = {}; - obj.path = message.path; - obj.base_denom = message.baseDenom; + obj.path = message.path === "" ? undefined : message.path; + obj.base_denom = message.baseDenom === "" ? undefined : message.baseDenom; return obj; }, fromAminoMsg(object: DenomTraceAminoMsg): DenomTrace { @@ -283,8 +283,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.send_enabled = message.sendEnabled; - obj.receive_enabled = message.receiveEnabled; + obj.send_enabled = message.sendEnabled === false ? undefined : message.sendEnabled; + obj.receive_enabled = message.receiveEnabled === false ? undefined : message.receiveEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/tx.ts b/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/tx.ts index d4260e20db..a7185130e9 100644 --- a/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/ibc/applications/transfer/v1/tx.ts @@ -254,13 +254,13 @@ export const MsgTransfer = { }, toAmino(message: MsgTransfer): MsgTransferAmino { const obj: any = {}; - obj.source_port = message.sourcePort; - obj.source_channel = message.sourceChannel; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; obj.token = message.token ? Coin.toAmino(message.token) : undefined; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromAminoMsg(object: MsgTransferAminoMsg): MsgTransfer { diff --git a/__fixtures__/v-next/outputv2/ibc/applications/transfer/v2/packet.ts b/__fixtures__/v-next/outputv2/ibc/applications/transfer/v2/packet.ts index bc81a64dd9..271712a346 100644 --- a/__fixtures__/v-next/outputv2/ibc/applications/transfer/v2/packet.ts +++ b/__fixtures__/v-next/outputv2/ibc/applications/transfer/v2/packet.ts @@ -160,10 +160,10 @@ export const FungibleTokenPacketData = { }, toAmino(message: FungibleTokenPacketData): FungibleTokenPacketDataAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: FungibleTokenPacketDataAminoMsg): FungibleTokenPacketData { diff --git a/__fixtures__/v-next/outputv2/ibc/core/channel/v1/channel.ts b/__fixtures__/v-next/outputv2/ibc/core/channel/v1/channel.ts index 7ab74999bc..ddbf07af07 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/channel/v1/channel.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/channel/v1/channel.ts @@ -547,10 +547,10 @@ export const Channel = { fromAmino(object: ChannelAmino): Channel { const message = createBaseChannel(); if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -563,15 +563,15 @@ export const Channel = { }, toAmino(message: Channel): ChannelAmino { const obj: any = {}; - obj.state = message.state; - obj.ordering = message.ordering; + obj.state = message.state === 0 ? undefined : message.state; + obj.ordering = message.ordering === 0 ? undefined : 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.connection_hops = message.connectionHops; } - obj.version = message.version; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: ChannelAminoMsg): Channel { @@ -737,10 +737,10 @@ export const IdentifiedChannel = { fromAmino(object: IdentifiedChannelAmino): IdentifiedChannel { const message = createBaseIdentifiedChannel(); if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -759,17 +759,17 @@ export const IdentifiedChannel = { }, toAmino(message: IdentifiedChannel): IdentifiedChannelAmino { const obj: any = {}; - obj.state = message.state; - obj.ordering = message.ordering; + obj.state = message.state === 0 ? undefined : message.state; + obj.ordering = message.ordering === 0 ? undefined : 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.connection_hops = message.connectionHops; } - obj.version = message.version; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.version = message.version === "" ? undefined : message.version; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: IdentifiedChannelAminoMsg): IdentifiedChannel { @@ -874,8 +874,8 @@ export const Counterparty = { }, toAmino(message: Counterparty): CounterpartyAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: CounterpartyAminoMsg): Counterparty { @@ -1076,14 +1076,14 @@ export const Packet = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; + obj.destination_port = message.destinationPort === "" ? undefined : message.destinationPort; + obj.destination_channel = message.destinationChannel === "" ? undefined : message.destinationChannel; obj.data = message.data ? base64FromBytes(message.data) : undefined; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromAminoMsg(object: PacketAminoMsg): Packet { @@ -1220,9 +1220,9 @@ export const PacketState = { }, 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.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1329,7 +1329,7 @@ export const Acknowledgement = { toAmino(message: Acknowledgement): AcknowledgementAmino { const obj: any = {}; obj.result = message.result ? base64FromBytes(message.result) : undefined; - obj.error = message.error; + obj.error = message.error === null ? undefined : message.error; return obj; }, fromAminoMsg(object: AcknowledgementAminoMsg): Acknowledgement { diff --git a/__fixtures__/v-next/outputv2/ibc/core/channel/v1/genesis.ts b/__fixtures__/v-next/outputv2/ibc/core/channel/v1/genesis.ts index 5777c77995..3c52808c62 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/channel/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/channel/v1/genesis.ts @@ -297,39 +297,39 @@ export const GenesisState = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } if (message.acknowledgements) { obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.acknowledgements = []; + obj.acknowledgements = message.acknowledgements; } if (message.commitments) { obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.commitments = []; + obj.commitments = message.commitments; } if (message.receipts) { obj.receipts = message.receipts.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.receipts = []; + obj.receipts = message.receipts; } if (message.sendSequences) { obj.send_sequences = message.sendSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.send_sequences = []; + obj.send_sequences = message.sendSequences; } if (message.recvSequences) { obj.recv_sequences = message.recvSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.recv_sequences = []; + obj.recv_sequences = message.recvSequences; } if (message.ackSequences) { obj.ack_sequences = message.ackSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.ack_sequences = []; + obj.ack_sequences = message.ackSequences; } - obj.next_channel_sequence = message.nextChannelSequence ? message.nextChannelSequence.toString() : undefined; + obj.next_channel_sequence = message.nextChannelSequence !== BigInt(0) ? message.nextChannelSequence.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -451,9 +451,9 @@ export const PacketSequence = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: PacketSequenceAminoMsg): PacketSequence { diff --git a/__fixtures__/v-next/outputv2/ibc/core/channel/v1/query.ts b/__fixtures__/v-next/outputv2/ibc/core/channel/v1/query.ts index 0ccd3b8c3f..fa7244f228 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/channel/v1/query.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/channel/v1/query.ts @@ -1107,8 +1107,8 @@ export const QueryChannelRequest = { }, toAmino(message: QueryChannelRequest): QueryChannelRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryChannelRequestAminoMsg): QueryChannelRequest { @@ -1459,7 +1459,7 @@ export const QueryChannelsResponse = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -1569,7 +1569,7 @@ export const QueryConnectionChannelsRequest = { }, toAmino(message: QueryConnectionChannelsRequest): QueryConnectionChannelsRequestAmino { const obj: any = {}; - obj.connection = message.connection; + obj.connection = message.connection === "" ? undefined : message.connection; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1703,7 +1703,7 @@ export const QueryConnectionChannelsResponse = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -1811,8 +1811,8 @@ export const QueryChannelClientStateRequest = { }, toAmino(message: QueryChannelClientStateRequest): QueryChannelClientStateRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryChannelClientStateRequestAminoMsg): QueryChannelClientStateRequest { @@ -2077,10 +2077,10 @@ export const QueryChannelConsensusStateRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryChannelConsensusStateRequestAminoMsg): QueryChannelConsensusStateRequest { @@ -2220,7 +2220,7 @@ export const QueryChannelConsensusStateResponse = { toAmino(message: QueryChannelConsensusStateResponse): QueryChannelConsensusStateResponseAmino { const obj: any = {}; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; @@ -2344,9 +2344,9 @@ export const QueryPacketCommitmentRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketCommitmentRequestAminoMsg): QueryPacketCommitmentRequest { @@ -2592,8 +2592,8 @@ export const QueryPacketCommitmentsRequest = { }, toAmino(message: QueryPacketCommitmentsRequest): QueryPacketCommitmentsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2727,7 +2727,7 @@ export const QueryPacketCommitmentsResponse = { if (message.commitments) { obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.commitments = []; + obj.commitments = message.commitments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -2852,9 +2852,9 @@ export const QueryPacketReceiptRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketReceiptRequestAminoMsg): QueryPacketReceiptRequest { @@ -2976,7 +2976,7 @@ export const QueryPacketReceiptResponse = { }, toAmino(message: QueryPacketReceiptResponse): QueryPacketReceiptResponseAmino { const obj: any = {}; - obj.received = message.received; + obj.received = message.received === false ? undefined : message.received; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; @@ -3100,9 +3100,9 @@ export const QueryPacketAcknowledgementRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketAcknowledgementRequestAminoMsg): QueryPacketAcknowledgementRequest { @@ -3378,13 +3378,13 @@ export const QueryPacketAcknowledgementsRequest = { }, toAmino(message: QueryPacketAcknowledgementsRequest): QueryPacketAcknowledgementsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : 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 = []; + obj.packet_commitment_sequences = message.packetCommitmentSequences; } return obj; }, @@ -3518,7 +3518,7 @@ export const QueryPacketAcknowledgementsResponse = { if (message.acknowledgements) { obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.acknowledgements = []; + obj.acknowledgements = message.acknowledgements; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -3656,12 +3656,12 @@ export const QueryUnreceivedPacketsRequest = { }, toAmino(message: QueryUnreceivedPacketsRequest): QueryUnreceivedPacketsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; if (message.packetCommitmentSequences) { obj.packet_commitment_sequences = message.packetCommitmentSequences.map(e => e.toString()); } else { - obj.packet_commitment_sequences = []; + obj.packet_commitment_sequences = message.packetCommitmentSequences; } return obj; }, @@ -3787,7 +3787,7 @@ export const QueryUnreceivedPacketsResponse = { if (message.sequences) { obj.sequences = message.sequences.map(e => e.toString()); } else { - obj.sequences = []; + obj.sequences = message.sequences; } obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; @@ -3924,12 +3924,12 @@ export const QueryUnreceivedAcksRequest = { }, toAmino(message: QueryUnreceivedAcksRequest): QueryUnreceivedAcksRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; if (message.packetAckSequences) { obj.packet_ack_sequences = message.packetAckSequences.map(e => e.toString()); } else { - obj.packet_ack_sequences = []; + obj.packet_ack_sequences = message.packetAckSequences; } return obj; }, @@ -4055,7 +4055,7 @@ export const QueryUnreceivedAcksResponse = { if (message.sequences) { obj.sequences = message.sequences.map(e => e.toString()); } else { - obj.sequences = []; + obj.sequences = message.sequences; } obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; @@ -4162,8 +4162,8 @@ export const QueryNextSequenceReceiveRequest = { }, toAmino(message: QueryNextSequenceReceiveRequest): QueryNextSequenceReceiveRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryNextSequenceReceiveRequestAminoMsg): QueryNextSequenceReceiveRequest { @@ -4287,7 +4287,7 @@ export const QueryNextSequenceReceiveResponse = { }, toAmino(message: QueryNextSequenceReceiveResponse): QueryNextSequenceReceiveResponseAmino { const obj: any = {}; - obj.next_sequence_receive = message.nextSequenceReceive ? message.nextSequenceReceive.toString() : undefined; + obj.next_sequence_receive = message.nextSequenceReceive !== BigInt(0) ? message.nextSequenceReceive.toString() : undefined; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; diff --git a/__fixtures__/v-next/outputv2/ibc/core/channel/v1/tx.ts b/__fixtures__/v-next/outputv2/ibc/core/channel/v1/tx.ts index ee0363e697..94c0099488 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/channel/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/channel/v1/tx.ts @@ -640,9 +640,9 @@ export const MsgChannelOpenInit = { }, toAmino(message: MsgChannelOpenInit): MsgChannelOpenInitAmino { const obj: any = {}; - obj.port_id = message.portId; + obj.port_id = message.portId === "" ? undefined : message.portId; obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenInitAminoMsg): MsgChannelOpenInit { @@ -898,13 +898,13 @@ export const MsgChannelOpenTry = { }, toAmino(message: MsgChannelOpenTry): MsgChannelOpenTryAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.previous_channel_id = message.previousChannelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.previous_channel_id = message.previousChannelId === "" ? undefined : message.previousChannelId; obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; - obj.counterparty_version = message.counterpartyVersion; + obj.counterparty_version = message.counterpartyVersion === "" ? undefined : message.counterpartyVersion; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenTryAminoMsg): MsgChannelOpenTry { @@ -1158,13 +1158,13 @@ export const MsgChannelOpenAck = { }, 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.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.counterparty_channel_id = message.counterpartyChannelId === "" ? undefined : message.counterpartyChannelId; + obj.counterparty_version = message.counterpartyVersion === "" ? undefined : message.counterpartyVersion; obj.proof_try = message.proofTry ? base64FromBytes(message.proofTry) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenAckAminoMsg): MsgChannelOpenAck { @@ -1388,11 +1388,11 @@ export const MsgChannelOpenConfirm = { }, toAmino(message: MsgChannelOpenConfirm): MsgChannelOpenConfirmAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.proof_ack = message.proofAck ? base64FromBytes(message.proofAck) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenConfirmAminoMsg): MsgChannelOpenConfirm { @@ -1584,9 +1584,9 @@ export const MsgChannelCloseInit = { }, toAmino(message: MsgChannelCloseInit): MsgChannelCloseInitAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; - obj.signer = message.signer; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelCloseInitAminoMsg): MsgChannelCloseInit { @@ -1810,11 +1810,11 @@ export const MsgChannelCloseConfirm = { }, toAmino(message: MsgChannelCloseConfirm): MsgChannelCloseConfirmAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelCloseConfirmAminoMsg): MsgChannelCloseConfirm { @@ -2028,7 +2028,7 @@ export const MsgRecvPacket = { obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; obj.proof_commitment = message.proofCommitment ? base64FromBytes(message.proofCommitment) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgRecvPacketAminoMsg): MsgRecvPacket { @@ -2259,8 +2259,8 @@ export const MsgTimeout = { obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; obj.proof_unreceived = message.proofUnreceived ? base64FromBytes(message.proofUnreceived) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; - obj.signer = message.signer; + obj.next_sequence_recv = message.nextSequenceRecv !== BigInt(0) ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgTimeoutAminoMsg): MsgTimeout { @@ -2507,8 +2507,8 @@ export const MsgTimeoutOnClose = { obj.proof_unreceived = message.proofUnreceived ? base64FromBytes(message.proofUnreceived) : undefined; obj.proof_close = message.proofClose ? base64FromBytes(message.proofClose) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; - obj.signer = message.signer; + obj.next_sequence_recv = message.nextSequenceRecv !== BigInt(0) ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgTimeoutOnCloseAminoMsg): MsgTimeoutOnClose { @@ -2738,7 +2738,7 @@ export const MsgAcknowledgement = { obj.acknowledgement = message.acknowledgement ? base64FromBytes(message.acknowledgement) : undefined; obj.proof_acked = message.proofAcked ? base64FromBytes(message.proofAcked) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgAcknowledgementAminoMsg): MsgAcknowledgement { diff --git a/__fixtures__/v-next/outputv2/ibc/core/client/v1/client.ts b/__fixtures__/v-next/outputv2/ibc/core/client/v1/client.ts index e76f4e5b5b..e5d1ddf5b6 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/client/v1/client.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/client/v1/client.ts @@ -391,7 +391,7 @@ export const IdentifiedClientState = { }, toAmino(message: IdentifiedClientState): IdentifiedClientStateAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; return obj; }, @@ -613,11 +613,11 @@ export const ClientConsensusStates = { }, toAmino(message: ClientConsensusStates): ClientConsensusStatesAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.consensusStates) { obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e) : undefined); } else { - obj.consensus_states = []; + obj.consensus_states = message.consensusStates; } return obj; }, @@ -754,10 +754,10 @@ export const ClientUpdateProposal = { }, 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; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.subject_client_id = message.subjectClientId === "" ? undefined : message.subjectClientId; + obj.substitute_client_id = message.substituteClientId === "" ? undefined : message.substituteClientId; return obj; }, fromAminoMsg(object: ClientUpdateProposalAminoMsg): ClientUpdateProposal { @@ -897,8 +897,8 @@ export const UpgradeProposal = { }, toAmino(message: UpgradeProposal): UpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; return obj; @@ -1005,8 +1005,8 @@ export const Height = { }, 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; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: HeightAminoMsg): Height { @@ -1105,7 +1105,7 @@ export const Params = { if (message.allowedClients) { obj.allowed_clients = message.allowedClients.map(e => e); } else { - obj.allowed_clients = []; + obj.allowed_clients = message.allowedClients; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/ibc/core/client/v1/genesis.ts b/__fixtures__/v-next/outputv2/ibc/core/client/v1/genesis.ts index 1c5ec27b8f..3afb72c4ca 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/client/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/client/v1/genesis.ts @@ -280,21 +280,21 @@ export const GenesisState = { if (message.clients) { obj.clients = message.clients.map(e => e ? IdentifiedClientState.toAmino(e) : undefined); } else { - obj.clients = []; + obj.clients = message.clients; } if (message.clientsConsensus) { obj.clients_consensus = message.clientsConsensus.map(e => e ? ClientConsensusStates.toAmino(e) : undefined); } else { - obj.clients_consensus = []; + obj.clients_consensus = message.clientsConsensus; } if (message.clientsMetadata) { obj.clients_metadata = message.clientsMetadata.map(e => e ? IdentifiedGenesisMetadata.toAmino(e) : undefined); } else { - obj.clients_metadata = []; + obj.clients_metadata = message.clientsMetadata; } obj.params = message.params ? Params.toAmino(message.params) : undefined; - obj.create_localhost = message.createLocalhost; - obj.next_client_sequence = message.nextClientSequence ? message.nextClientSequence.toString() : undefined; + obj.create_localhost = message.createLocalhost === false ? undefined : message.createLocalhost; + obj.next_client_sequence = message.nextClientSequence !== BigInt(0) ? message.nextClientSequence.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -511,11 +511,11 @@ export const IdentifiedGenesisMetadata = { }, toAmino(message: IdentifiedGenesisMetadata): IdentifiedGenesisMetadataAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.clientMetadata) { obj.client_metadata = message.clientMetadata.map(e => e ? GenesisMetadata.toAmino(e) : undefined); } else { - obj.client_metadata = []; + obj.client_metadata = message.clientMetadata; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/ibc/core/client/v1/query.ts b/__fixtures__/v-next/outputv2/ibc/core/client/v1/query.ts index d79cdc2abb..26729eb12a 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/client/v1/query.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/client/v1/query.ts @@ -601,7 +601,7 @@ export const QueryClientStateRequest = { }, toAmino(message: QueryClientStateRequest): QueryClientStateRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientStateRequestAminoMsg): QueryClientStateRequest { @@ -935,7 +935,7 @@ export const QueryClientStatesResponse = { if (message.clientStates) { obj.client_states = message.clientStates.map(e => e ? IdentifiedClientState.toAmino(e) : undefined); } else { - obj.client_states = []; + obj.client_states = message.clientStates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1076,10 +1076,10 @@ export const QueryConsensusStateRequest = { }, 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; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; + obj.latest_height = message.latestHeight === false ? undefined : message.latestHeight; return obj; }, fromAminoMsg(object: QueryConsensusStateRequestAminoMsg): QueryConsensusStateRequest { @@ -1312,7 +1312,7 @@ export const QueryConsensusStatesRequest = { }, toAmino(message: QueryConsensusStatesRequest): QueryConsensusStatesRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1429,7 +1429,7 @@ export const QueryConsensusStatesResponse = { if (message.consensusStates) { obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e) : undefined); } else { - obj.consensus_states = []; + obj.consensus_states = message.consensusStates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1521,7 +1521,7 @@ export const QueryClientStatusRequest = { }, toAmino(message: QueryClientStatusRequest): QueryClientStatusRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientStatusRequestAminoMsg): QueryClientStatusRequest { @@ -1611,7 +1611,7 @@ export const QueryClientStatusResponse = { }, toAmino(message: QueryClientStatusResponse): QueryClientStatusResponseAmino { const obj: any = {}; - obj.status = message.status; + obj.status = message.status === "" ? undefined : message.status; return obj; }, fromAminoMsg(object: QueryClientStatusResponseAminoMsg): QueryClientStatusResponse { diff --git a/__fixtures__/v-next/outputv2/ibc/core/client/v1/tx.ts b/__fixtures__/v-next/outputv2/ibc/core/client/v1/tx.ts index 77b03ccce8..0e76d91b4f 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/client/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/client/v1/tx.ts @@ -350,7 +350,7 @@ export const MsgCreateClient = { 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; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgCreateClientAminoMsg): MsgCreateClient { @@ -544,9 +544,9 @@ export const MsgUpdateClient = { }, toAmino(message: MsgUpdateClient): MsgUpdateClientAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.header = message.header ? Any.toAmino(message.header) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgUpdateClientAminoMsg): MsgUpdateClient { @@ -787,12 +787,12 @@ export const MsgUpgradeClient = { }, toAmino(message: MsgUpgradeClient): MsgUpgradeClientAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : 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 ? base64FromBytes(message.proofUpgradeClient) : undefined; obj.proof_upgrade_consensus_state = message.proofUpgradeConsensusState ? base64FromBytes(message.proofUpgradeConsensusState) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgUpgradeClientAminoMsg): MsgUpgradeClient { @@ -986,9 +986,9 @@ export const MsgSubmitMisbehaviour = { }, toAmino(message: MsgSubmitMisbehaviour): MsgSubmitMisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.misbehaviour = message.misbehaviour ? Any.toAmino(message.misbehaviour) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgSubmitMisbehaviourAminoMsg): MsgSubmitMisbehaviour { diff --git a/__fixtures__/v-next/outputv2/ibc/core/commitment/v1/commitment.ts b/__fixtures__/v-next/outputv2/ibc/core/commitment/v1/commitment.ts index e55763baee..391cb3d31c 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/commitment/v1/commitment.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/commitment/v1/commitment.ts @@ -387,7 +387,7 @@ export const MerklePath = { if (message.keyPath) { obj.key_path = message.keyPath.map(e => e); } else { - obj.key_path = []; + obj.key_path = message.keyPath; } return obj; }, @@ -487,7 +487,7 @@ export const MerkleProof = { if (message.proofs) { obj.proofs = message.proofs.map(e => e ? CommitmentProof.toAmino(e) : undefined); } else { - obj.proofs = []; + obj.proofs = message.proofs; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/ibc/core/connection/v1/connection.ts b/__fixtures__/v-next/outputv2/ibc/core/connection/v1/connection.ts index 1f109c6066..25ad5a283e 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/connection/v1/connection.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/connection/v1/connection.ts @@ -472,7 +472,7 @@ export const ConnectionEnd = { } message.versions = object.versions?.map(e => Version.fromAmino(e)) || []; if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -484,15 +484,15 @@ export const ConnectionEnd = { }, toAmino(message: ConnectionEnd): ConnectionEndAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.versions) { obj.versions = message.versions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.versions = []; + obj.versions = message.versions; } - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; return obj; }, fromAminoMsg(object: ConnectionEndAminoMsg): ConnectionEnd { @@ -655,7 +655,7 @@ export const IdentifiedConnection = { } message.versions = object.versions?.map(e => Version.fromAmino(e)) || []; if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -667,16 +667,16 @@ export const IdentifiedConnection = { }, toAmino(message: IdentifiedConnection): IdentifiedConnectionAmino { const obj: any = {}; - obj.id = message.id; - obj.client_id = message.clientId; + obj.id = message.id === "" ? undefined : message.id; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.versions) { obj.versions = message.versions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.versions = []; + obj.versions = message.versions; } - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; return obj; }, fromAminoMsg(object: IdentifiedConnectionAminoMsg): IdentifiedConnection { @@ -798,8 +798,8 @@ export const Counterparty = { }, toAmino(message: Counterparty): CounterpartyAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.connection_id = message.connectionId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.prefix = message.prefix ? MerklePrefix.toAmino(message.prefix) : undefined; return obj; }, @@ -899,7 +899,7 @@ export const ClientPaths = { if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, @@ -1011,11 +1011,11 @@ export const ConnectionPaths = { }, toAmino(message: ConnectionPaths): ConnectionPathsAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, @@ -1127,11 +1127,11 @@ export const Version = { }, toAmino(message: Version): VersionAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; if (message.features) { obj.features = message.features.map(e => e); } else { - obj.features = []; + obj.features = message.features; } return obj; }, @@ -1224,7 +1224,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.max_expected_time_per_block = message.maxExpectedTimePerBlock ? message.maxExpectedTimePerBlock.toString() : undefined; + obj.max_expected_time_per_block = message.maxExpectedTimePerBlock !== BigInt(0) ? message.maxExpectedTimePerBlock.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/ibc/core/connection/v1/genesis.ts b/__fixtures__/v-next/outputv2/ibc/core/connection/v1/genesis.ts index c1a78c6f9d..d2b16082e3 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/connection/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/connection/v1/genesis.ts @@ -162,14 +162,14 @@ export const GenesisState = { if (message.connections) { obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e) : undefined); } else { - obj.connections = []; + obj.connections = message.connections; } if (message.clientConnectionPaths) { obj.client_connection_paths = message.clientConnectionPaths.map(e => e ? ConnectionPaths.toAmino(e) : undefined); } else { - obj.client_connection_paths = []; + obj.client_connection_paths = message.clientConnectionPaths; } - obj.next_connection_sequence = message.nextConnectionSequence ? message.nextConnectionSequence.toString() : undefined; + obj.next_connection_sequence = message.nextConnectionSequence !== BigInt(0) ? message.nextConnectionSequence.toString() : undefined; obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv2/ibc/core/connection/v1/query.ts b/__fixtures__/v-next/outputv2/ibc/core/connection/v1/query.ts index 00dd7f6c08..e3f68e7c8b 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/connection/v1/query.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/connection/v1/query.ts @@ -442,7 +442,7 @@ export const QueryConnectionRequest = { }, toAmino(message: QueryConnectionRequest): QueryConnectionRequestAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromAminoMsg(object: QueryConnectionRequestAminoMsg): QueryConnectionRequest { @@ -793,7 +793,7 @@ export const QueryConnectionsResponse = { if (message.connections) { obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e) : undefined); } else { - obj.connections = []; + obj.connections = message.connections; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -886,7 +886,7 @@ export const QueryClientConnectionsRequest = { }, toAmino(message: QueryClientConnectionsRequest): QueryClientConnectionsRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientConnectionsRequestAminoMsg): QueryClientConnectionsRequest { @@ -1017,7 +1017,7 @@ export const QueryClientConnectionsResponse = { if (message.connectionPaths) { obj.connection_paths = message.connectionPaths.map(e => e); } else { - obj.connection_paths = []; + obj.connection_paths = message.connectionPaths; } obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; @@ -1110,7 +1110,7 @@ export const QueryConnectionClientStateRequest = { }, toAmino(message: QueryConnectionClientStateRequest): QueryConnectionClientStateRequestAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromAminoMsg(object: QueryConnectionClientStateRequestAminoMsg): QueryConnectionClientStateRequest { @@ -1360,9 +1360,9 @@ export const QueryConnectionConsensusStateRequest = { }, 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; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryConnectionConsensusStateRequestAminoMsg): QueryConnectionConsensusStateRequest { @@ -1502,7 +1502,7 @@ export const QueryConnectionConsensusStateResponse = { toAmino(message: QueryConnectionConsensusStateResponse): QueryConnectionConsensusStateResponseAmino { const obj: any = {}; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; diff --git a/__fixtures__/v-next/outputv2/ibc/core/connection/v1/tx.ts b/__fixtures__/v-next/outputv2/ibc/core/connection/v1/tx.ts index df234d2c57..81e514fd87 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/connection/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/connection/v1/tx.ts @@ -440,11 +440,11 @@ export const MsgConnectionOpenInit = { }, toAmino(message: MsgConnectionOpenInit): MsgConnectionOpenInitAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : 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; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenInitAminoMsg): MsgConnectionOpenInit { @@ -787,22 +787,22 @@ export const MsgConnectionOpenTry = { }, toAmino(message: MsgConnectionOpenTry): MsgConnectionOpenTryAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.previous_connection_id = message.previousConnectionId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.previous_connection_id = message.previousConnectionId === "" ? undefined : 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; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; if (message.counterpartyVersions) { obj.counterparty_versions = message.counterpartyVersions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.counterparty_versions = []; + obj.counterparty_versions = message.counterpartyVersions; } obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_client = message.proofClient ? base64FromBytes(message.proofClient) : undefined; obj.proof_consensus = message.proofConsensus ? base64FromBytes(message.proofConsensus) : undefined; obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenTryAminoMsg): MsgConnectionOpenTry { @@ -1107,8 +1107,8 @@ export const MsgConnectionOpenAck = { }, toAmino(message: MsgConnectionOpenAck): MsgConnectionOpenAckAmino { const obj: any = {}; - obj.connection_id = message.connectionId; - obj.counterparty_connection_id = message.counterpartyConnectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.counterparty_connection_id = message.counterpartyConnectionId === "" ? undefined : 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) : {}; @@ -1116,7 +1116,7 @@ export const MsgConnectionOpenAck = { obj.proof_client = message.proofClient ? base64FromBytes(message.proofClient) : undefined; obj.proof_consensus = message.proofConsensus ? base64FromBytes(message.proofConsensus) : undefined; obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenAckAminoMsg): MsgConnectionOpenAck { @@ -1325,10 +1325,10 @@ export const MsgConnectionOpenConfirm = { }, toAmino(message: MsgConnectionOpenConfirm): MsgConnectionOpenConfirmAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.proof_ack = message.proofAck ? base64FromBytes(message.proofAck) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenConfirmAminoMsg): MsgConnectionOpenConfirm { diff --git a/__fixtures__/v-next/outputv2/ibc/core/port/v1/query.ts b/__fixtures__/v-next/outputv2/ibc/core/port/v1/query.ts index 5dbde6f39d..9033d7a80f 100644 --- a/__fixtures__/v-next/outputv2/ibc/core/port/v1/query.ts +++ b/__fixtures__/v-next/outputv2/ibc/core/port/v1/query.ts @@ -186,7 +186,7 @@ export const QueryAppVersionRequest = { message.connectionId = object.connection_id; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -198,11 +198,11 @@ export const QueryAppVersionRequest = { }, toAmino(message: QueryAppVersionRequest): QueryAppVersionRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.connection_id = message.connectionId; - obj.ordering = message.ordering; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.ordering = message.ordering === 0 ? undefined : message.ordering; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.proposed_version = message.proposedVersion; + obj.proposed_version = message.proposedVersion === "" ? undefined : message.proposedVersion; return obj; }, fromAminoMsg(object: QueryAppVersionRequestAminoMsg): QueryAppVersionRequest { @@ -307,8 +307,8 @@ export const QueryAppVersionResponse = { }, toAmino(message: QueryAppVersionResponse): QueryAppVersionResponseAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.version = message.version; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: QueryAppVersionResponseAminoMsg): QueryAppVersionResponse { diff --git a/__fixtures__/v-next/outputv2/ibc/lightclients/localhost/v1/localhost.ts b/__fixtures__/v-next/outputv2/ibc/lightclients/localhost/v1/localhost.ts index 97f969aeca..8d341796bf 100644 --- a/__fixtures__/v-next/outputv2/ibc/lightclients/localhost/v1/localhost.ts +++ b/__fixtures__/v-next/outputv2/ibc/lightclients/localhost/v1/localhost.ts @@ -120,7 +120,7 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; }, diff --git a/__fixtures__/v-next/outputv2/ibc/lightclients/solomachine/v1/solomachine.ts b/__fixtures__/v-next/outputv2/ibc/lightclients/solomachine/v1/solomachine.ts index a81aabce7a..83f0070241 100644 --- a/__fixtures__/v-next/outputv2/ibc/lightclients/solomachine/v1/solomachine.ts +++ b/__fixtures__/v-next/outputv2/ibc/lightclients/solomachine/v1/solomachine.ts @@ -763,10 +763,10 @@ export const ClientState = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.frozen_sequence = message.frozenSequence !== BigInt(0) ? message.frozenSequence.toString() : undefined; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; - obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal === false ? undefined : message.allowUpdateAfterProposal; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -891,8 +891,8 @@ export const ConsensusState = { 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; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { @@ -1048,11 +1048,11 @@ export const Header = { }, toAmino(message: Header): HeaderAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderAminoMsg): Header { @@ -1193,8 +1193,8 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.sequence = message.sequence !== BigInt(0) ? 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; @@ -1321,7 +1321,7 @@ export const SignatureAndData = { message.signature = bytesFromBase64(object.signature); } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1334,9 +1334,9 @@ export const SignatureAndData = { toAmino(message: SignatureAndData): SignatureAndDataAmino { const obj: any = {}; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; - obj.data_type = message.dataType; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { @@ -1444,7 +1444,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { @@ -1589,7 +1589,7 @@ export const SignBytes = { message.diversifier = object.diversifier; } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1598,10 +1598,10 @@ export const SignBytes = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1710,7 +1710,7 @@ export const HeaderData = { toAmino(message: HeaderData): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { @@ -2552,7 +2552,7 @@ export const NextSequenceRecvData = { toAmino(message: NextSequenceRecvData): NextSequenceRecvDataAmino { const obj: any = {}; obj.path = message.path ? base64FromBytes(message.path) : undefined; - obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + obj.next_seq_recv = message.nextSeqRecv !== BigInt(0) ? message.nextSeqRecv.toString() : undefined; return obj; }, fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData { diff --git a/__fixtures__/v-next/outputv2/ibc/lightclients/solomachine/v2/solomachine.ts b/__fixtures__/v-next/outputv2/ibc/lightclients/solomachine/v2/solomachine.ts index d1fa384de0..fa52fee62d 100644 --- a/__fixtures__/v-next/outputv2/ibc/lightclients/solomachine/v2/solomachine.ts +++ b/__fixtures__/v-next/outputv2/ibc/lightclients/solomachine/v2/solomachine.ts @@ -761,10 +761,10 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.is_frozen = message.isFrozen; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.is_frozen = message.isFrozen === false ? undefined : message.isFrozen; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; - obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal === false ? undefined : message.allowUpdateAfterProposal; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -889,8 +889,8 @@ export const ConsensusState = { 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; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { @@ -1046,11 +1046,11 @@ export const Header = { }, toAmino(message: Header): HeaderAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderAminoMsg): Header { @@ -1191,8 +1191,8 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.sequence = message.sequence !== BigInt(0) ? 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; @@ -1319,7 +1319,7 @@ export const SignatureAndData = { message.signature = bytesFromBase64(object.signature); } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1332,9 +1332,9 @@ export const SignatureAndData = { toAmino(message: SignatureAndData): SignatureAndDataAmino { const obj: any = {}; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; - obj.data_type = message.dataType; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { @@ -1442,7 +1442,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { @@ -1587,7 +1587,7 @@ export const SignBytes = { message.diversifier = object.diversifier; } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1596,10 +1596,10 @@ export const SignBytes = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1708,7 +1708,7 @@ export const HeaderData = { toAmino(message: HeaderData): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { @@ -2550,7 +2550,7 @@ export const NextSequenceRecvData = { toAmino(message: NextSequenceRecvData): NextSequenceRecvDataAmino { const obj: any = {}; obj.path = message.path ? base64FromBytes(message.path) : undefined; - obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + obj.next_seq_recv = message.nextSeqRecv !== BigInt(0) ? message.nextSeqRecv.toString() : undefined; return obj; }, fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData { diff --git a/__fixtures__/v-next/outputv2/ibc/lightclients/tendermint/v1/tendermint.ts b/__fixtures__/v-next/outputv2/ibc/lightclients/tendermint/v1/tendermint.ts index 9a6349f370..16e285c86f 100644 --- a/__fixtures__/v-next/outputv2/ibc/lightclients/tendermint/v1/tendermint.ts +++ b/__fixtures__/v-next/outputv2/ibc/lightclients/tendermint/v1/tendermint.ts @@ -529,7 +529,7 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : 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; @@ -539,15 +539,15 @@ export const ClientState = { if (message.proofSpecs) { obj.proof_specs = message.proofSpecs.map(e => e ? ProofSpec.toAmino(e) : undefined); } else { - obj.proof_specs = []; + obj.proof_specs = message.proofSpecs; } if (message.upgradePath) { obj.upgrade_path = message.upgradePath.map(e => e); } else { - obj.upgrade_path = []; + obj.upgrade_path = message.upgradePath; } - obj.allow_update_after_expiry = message.allowUpdateAfterExpiry; - obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour; + obj.allow_update_after_expiry = message.allowUpdateAfterExpiry === false ? undefined : message.allowUpdateAfterExpiry; + obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour === false ? undefined : message.allowUpdateAfterMisbehaviour; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -795,7 +795,7 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.header_1 = message.header1 ? Header.toAmino(message.header1) : undefined; obj.header_2 = message.header2 ? Header.toAmino(message.header2) : undefined; return obj; @@ -1052,8 +1052,8 @@ export const Fraction = { }, toAmino(message: Fraction): FractionAmino { const obj: any = {}; - obj.numerator = message.numerator ? message.numerator.toString() : undefined; - obj.denominator = message.denominator ? message.denominator.toString() : undefined; + obj.numerator = message.numerator !== BigInt(0) ? message.numerator.toString() : undefined; + obj.denominator = message.denominator !== BigInt(0) ? message.denominator.toString() : undefined; return obj; }, fromAminoMsg(object: FractionAminoMsg): Fraction { diff --git a/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/claim.ts b/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/claim.ts index a86b70654e..9a098fed00 100644 --- a/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/claim.ts +++ b/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/claim.ts @@ -200,16 +200,16 @@ export const ClaimRecord = { }, toAmino(message: ClaimRecord): ClaimRecordAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.initialClaimableAmount) { obj.initial_claimable_amount = message.initialClaimableAmount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_claimable_amount = []; + obj.initial_claimable_amount = message.initialClaimableAmount; } if (message.actionCompleted) { obj.action_completed = message.actionCompleted.map(e => e); } else { - obj.action_completed = []; + obj.action_completed = message.actionCompleted; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/genesis.ts index e5201490d1..5d9e255b28 100644 --- a/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/genesis.ts @@ -146,7 +146,7 @@ export const GenesisState = { if (message.claimRecords) { obj.claim_records = message.claimRecords.map(e => e ? ClaimRecord.toAmino(e) : undefined); } else { - obj.claim_records = []; + obj.claim_records = message.claimRecords; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/params.ts b/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/params.ts index adb394f054..61fbf7d3c2 100644 --- a/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/params.ts @@ -151,7 +151,7 @@ export const Params = { obj.airdrop_start_time = message.airdropStartTime ? Timestamp.toAmino(toTimestamp(message.airdropStartTime)) : undefined; 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; + obj.claim_denom = message.claimDenom === "" ? undefined : message.claimDenom; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/query.ts b/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/query.ts index 72fcc080ed..da9f74b606 100644 --- a/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/osmosis/claim/v1beta1/query.ts @@ -327,7 +327,7 @@ export const QueryModuleAccountBalanceResponse = { if (message.moduleAccountBalance) { obj.moduleAccountBalance = message.moduleAccountBalance.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.moduleAccountBalance = []; + obj.moduleAccountBalance = message.moduleAccountBalance; } return obj; }, @@ -582,7 +582,7 @@ export const QueryClaimRecordRequest = { }, toAmino(message: QueryClaimRecordRequest): QueryClaimRecordRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryClaimRecordRequestAminoMsg): QueryClaimRecordRequest { @@ -773,14 +773,14 @@ export const QueryClaimableForActionRequest = { message.address = object.address; } if (object.action !== undefined && object.action !== null) { - message.action = actionFromJSON(object.action); + message.action = object.action; } return message; }, toAmino(message: QueryClaimableForActionRequest): QueryClaimableForActionRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.action = message.action; + obj.address = message.address === "" ? undefined : message.address; + obj.action = message.action === 0 ? undefined : message.action; return obj; }, fromAminoMsg(object: QueryClaimableForActionRequestAminoMsg): QueryClaimableForActionRequest { @@ -879,7 +879,7 @@ export const QueryClaimableForActionResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -970,7 +970,7 @@ export const QueryTotalClaimableRequest = { }, toAmino(message: QueryTotalClaimableRequest): QueryTotalClaimableRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryTotalClaimableRequestAminoMsg): QueryTotalClaimableRequest { @@ -1069,7 +1069,7 @@ export const QueryTotalClaimableResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/epochs/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/epochs/genesis.ts index b8e5e2b0ac..03f5834f3c 100644 --- a/__fixtures__/v-next/outputv2/osmosis/epochs/genesis.ts +++ b/__fixtures__/v-next/outputv2/osmosis/epochs/genesis.ts @@ -321,13 +321,13 @@ export const EpochInfo = { }, toAmino(message: EpochInfo): EpochInfoAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; obj.current_epoch_start_time = message.currentEpochStartTime ? Timestamp.toAmino(toTimestamp(message.currentEpochStartTime)) : undefined; - obj.epoch_counting_started = message.epochCountingStarted; - obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + obj.epoch_counting_started = message.epochCountingStarted === false ? undefined : message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight !== BigInt(0) ? message.currentEpochStartHeight.toString() : undefined; return obj; }, fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo { @@ -426,7 +426,7 @@ export const GenesisState = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/epochs/query.ts b/__fixtures__/v-next/outputv2/osmosis/epochs/query.ts index c183b8fb78..ed5a161df9 100644 --- a/__fixtures__/v-next/outputv2/osmosis/epochs/query.ts +++ b/__fixtures__/v-next/outputv2/osmosis/epochs/query.ts @@ -210,7 +210,7 @@ export const QueryEpochsInfoResponse = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, @@ -301,7 +301,7 @@ export const QueryCurrentEpochRequest = { }, toAmino(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; return obj; }, fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest { @@ -393,7 +393,7 @@ export const QueryCurrentEpochResponse = { }, toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { const obj: any = {}; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse { diff --git a/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/balancer/balancerPool.ts b/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/balancer/balancerPool.ts index 7a7d847f0e..2e1a4fa8e6 100644 --- a/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/balancer/balancerPool.ts +++ b/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/balancer/balancerPool.ts @@ -397,12 +397,12 @@ export const SmoothWeightChangeParams = { if (message.initialPoolWeights) { obj.initial_pool_weights = message.initialPoolWeights.map(e => e ? PoolAsset.toAmino(e) : undefined); } else { - obj.initial_pool_weights = []; + obj.initial_pool_weights = message.initialPoolWeights; } if (message.targetPoolWeights) { obj.target_pool_weights = message.targetPoolWeights.map(e => e ? PoolAsset.toAmino(e) : undefined); } else { - obj.target_pool_weights = []; + obj.target_pool_weights = message.targetPoolWeights; } return obj; }, @@ -525,8 +525,8 @@ export const PoolParams = { }, toAmino(message: PoolParams): PoolParamsAmino { const obj: any = {}; - obj.swap_fee = message.swapFee; - obj.exit_fee = message.exitFee; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; + obj.exit_fee = message.exitFee === "" ? undefined : message.exitFee; obj.smooth_weight_change_params = message.smoothWeightChangeParams ? SmoothWeightChangeParams.toAmino(message.smoothWeightChangeParams) : undefined; return obj; }, @@ -635,7 +635,7 @@ export const PoolAsset = { toAmino(message: PoolAsset): PoolAssetAmino { const obj: any = {}; obj.token = message.token ? Coin.toAmino(message.token) : undefined; - obj.weight = message.weight; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: PoolAssetAminoMsg): PoolAsset { @@ -828,17 +828,17 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.address = message.address; - obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : 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.pool_assets = message.poolAssets; } - obj.total_weight = message.totalWeight; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { diff --git a/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.ts b/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.ts index b34606d7b1..99dccd54f3 100644 --- a/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.ts +++ b/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.ts @@ -169,14 +169,14 @@ export const MsgCreateBalancerPool = { }, toAmino(message: MsgCreateBalancerPool): MsgCreateBalancerPoolAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : 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.pool_assets = message.poolAssets; } - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; return obj; }, fromAminoMsg(object: MsgCreateBalancerPoolAminoMsg): MsgCreateBalancerPool { @@ -268,7 +268,7 @@ export const MsgCreateBalancerPoolResponse = { }, toAmino(message: MsgCreateBalancerPoolResponse): MsgCreateBalancerPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateBalancerPoolResponseAminoMsg): MsgCreateBalancerPoolResponse { diff --git a/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts b/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts index 0f8139a256..630187e303 100644 --- a/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts +++ b/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts @@ -192,8 +192,8 @@ export const PoolParams = { }, toAmino(message: PoolParams): PoolParamsAmino { const obj: any = {}; - obj.swap_fee = message.swapFee; - obj.exit_fee = message.exitFee; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; + obj.exit_fee = message.exitFee === "" ? undefined : message.exitFee; return obj; }, fromAminoMsg(object: PoolParamsAminoMsg): PoolParams { @@ -416,22 +416,22 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.address = message.address; - obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : 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 = []; + obj.pool_liquidity = message.poolLiquidity; } if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } - obj.scaling_factor_controller = message.scalingFactorController; + obj.scaling_factor_controller = message.scalingFactorController === "" ? undefined : message.scalingFactorController; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { diff --git a/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/stableswap/tx.ts b/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/stableswap/tx.ts index d0afa73b34..520703b67b 100644 --- a/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/stableswap/tx.ts +++ b/__fixtures__/v-next/outputv2/osmosis/gamm/pool-models/stableswap/tx.ts @@ -267,20 +267,20 @@ export const MsgCreateStableswapPool = { }, toAmino(message: MsgCreateStableswapPool): MsgCreateStableswapPoolAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : 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 = []; + obj.initial_pool_liquidity = message.initialPoolLiquidity; } if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } - obj.future_pool_governor = message.futurePoolGovernor; - obj.scaling_factor_controller = message.scalingFactorController; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; + obj.scaling_factor_controller = message.scalingFactorController === "" ? undefined : message.scalingFactorController; return obj; }, fromAminoMsg(object: MsgCreateStableswapPoolAminoMsg): MsgCreateStableswapPool { @@ -372,7 +372,7 @@ export const MsgCreateStableswapPoolResponse = { }, toAmino(message: MsgCreateStableswapPoolResponse): MsgCreateStableswapPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateStableswapPoolResponseAminoMsg): MsgCreateStableswapPoolResponse { @@ -509,12 +509,12 @@ export const MsgStableSwapAdjustScalingFactors = { }, toAmino(message: MsgStableSwapAdjustScalingFactors): MsgStableSwapAdjustScalingFactorsAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/genesis.ts index 349bffd6ef..eb1b154716 100644 --- a/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/genesis.ts @@ -134,7 +134,7 @@ export const Params = { if (message.poolCreationFee) { obj.pool_creation_fee = message.poolCreationFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.pool_creation_fee = []; + obj.pool_creation_fee = message.poolCreationFee; } return obj; }, @@ -268,9 +268,9 @@ export const GenesisState = { if (message.pools) { obj.pools = message.pools.map(e => e ? PoolI_ToAmino((e as Any)) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } - obj.next_pool_number = message.nextPoolNumber ? message.nextPoolNumber.toString() : undefined; + obj.next_pool_number = message.nextPoolNumber !== BigInt(0) ? message.nextPoolNumber.toString() : undefined; obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; }, @@ -308,7 +308,7 @@ export const PoolI_InterfaceDecoder = (input: BinaryReader | Uint8Array): Pool1 return data; } }; -export const PoolI_FromAmino = (content: AnyAmino) => { +export const PoolI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "osmosis/gamm/pool": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/query.ts b/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/query.ts index 66bec76893..9410eb8e1c 100644 --- a/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/query.ts @@ -714,7 +714,7 @@ export const QueryPoolRequest = { }, toAmino(message: QueryPoolRequest): QueryPoolRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolRequestAminoMsg): QueryPoolRequest { @@ -1014,7 +1014,7 @@ export const QueryPoolsResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? PoolI_ToAmino((e as Any)) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1180,7 +1180,7 @@ export const QueryNumPoolsResponse = { }, toAmino(message: QueryNumPoolsResponse): QueryNumPoolsResponseAmino { const obj: any = {}; - obj.num_pools = message.numPools ? message.numPools.toString() : undefined; + obj.num_pools = message.numPools !== BigInt(0) ? message.numPools.toString() : undefined; return obj; }, fromAminoMsg(object: QueryNumPoolsResponseAminoMsg): QueryNumPoolsResponse { @@ -1272,7 +1272,7 @@ export const QueryPoolTypeRequest = { }, toAmino(message: QueryPoolTypeRequest): QueryPoolTypeRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolTypeRequestAminoMsg): QueryPoolTypeRequest { @@ -1362,7 +1362,7 @@ export const QueryPoolTypeResponse = { }, toAmino(message: QueryPoolTypeResponse): QueryPoolTypeResponseAmino { const obj: any = {}; - obj.pool_type = message.poolType; + obj.pool_type = message.poolType === "" ? undefined : message.poolType; return obj; }, fromAminoMsg(object: QueryPoolTypeResponseAminoMsg): QueryPoolTypeResponse { @@ -1475,11 +1475,11 @@ export const QueryCalcJoinPoolSharesRequest = { }, toAmino(message: QueryCalcJoinPoolSharesRequest): QueryCalcJoinPoolSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.tokensIn) { obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_in = []; + obj.tokens_in = message.tokensIn; } return obj; }, @@ -1591,11 +1591,11 @@ export const QueryCalcJoinPoolSharesResponse = { }, toAmino(message: QueryCalcJoinPoolSharesResponse): QueryCalcJoinPoolSharesResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } return obj; }, @@ -1703,8 +1703,8 @@ export const QueryCalcExitPoolCoinsFromSharesRequest = { }, toAmino(message: QueryCalcExitPoolCoinsFromSharesRequest): QueryCalcExitPoolCoinsFromSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.share_in_amount = message.shareInAmount; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; return obj; }, fromAminoMsg(object: QueryCalcExitPoolCoinsFromSharesRequestAminoMsg): QueryCalcExitPoolCoinsFromSharesRequest { @@ -1803,7 +1803,7 @@ export const QueryCalcExitPoolCoinsFromSharesResponse = { if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } return obj; }, @@ -1896,7 +1896,7 @@ export const QueryPoolParamsRequest = { }, toAmino(message: QueryPoolParamsRequest): QueryPoolParamsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolParamsRequestAminoMsg): QueryPoolParamsRequest { @@ -2080,7 +2080,7 @@ export const QueryTotalPoolLiquidityRequest = { }, toAmino(message: QueryTotalPoolLiquidityRequest): QueryTotalPoolLiquidityRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTotalPoolLiquidityRequestAminoMsg): QueryTotalPoolLiquidityRequest { @@ -2179,7 +2179,7 @@ export const QueryTotalPoolLiquidityResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, @@ -2272,7 +2272,7 @@ export const QueryTotalSharesRequest = { }, toAmino(message: QueryTotalSharesRequest): QueryTotalSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTotalSharesRequestAminoMsg): QueryTotalSharesRequest { @@ -2477,11 +2477,11 @@ export const QueryCalcJoinPoolNoSwapSharesRequest = { }, toAmino(message: QueryCalcJoinPoolNoSwapSharesRequest): QueryCalcJoinPoolNoSwapSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.tokensIn) { obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_in = []; + obj.tokens_in = message.tokensIn; } return obj; }, @@ -2596,9 +2596,9 @@ export const QueryCalcJoinPoolNoSwapSharesResponse = { if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } - obj.shares_out = message.sharesOut; + obj.shares_out = message.sharesOut === "" ? undefined : message.sharesOut; return obj; }, fromAminoMsg(object: QueryCalcJoinPoolNoSwapSharesResponseAminoMsg): QueryCalcJoinPoolNoSwapSharesResponse { @@ -2720,9 +2720,9 @@ export const QuerySpotPriceRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest { @@ -2853,9 +2853,9 @@ export const QueryPoolsWithFilterRequest = { if (message.minLiquidity) { obj.min_liquidity = message.minLiquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_liquidity = []; + obj.min_liquidity = message.minLiquidity; } - obj.pool_type = message.poolType; + obj.pool_type = message.poolType === "" ? undefined : message.poolType; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2972,7 +2972,7 @@ export const QueryPoolsWithFilterResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? PoolI_ToAmino((e as Any)) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -3064,7 +3064,7 @@ export const QuerySpotPriceResponse = { }, toAmino(message: QuerySpotPriceResponse): QuerySpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse { @@ -3207,13 +3207,13 @@ export const QuerySwapExactAmountInRequest = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn === "" ? undefined : message.tokenIn; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } return obj; }, @@ -3304,7 +3304,7 @@ export const QuerySwapExactAmountInResponse = { }, toAmino(message: QuerySwapExactAmountInResponse): QuerySwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: QuerySwapExactAmountInResponseAminoMsg): QuerySwapExactAmountInResponse { @@ -3447,14 +3447,14 @@ export const QuerySwapExactAmountOutRequest = { }, toAmino(message: QuerySwapExactAmountOutRequest): QuerySwapExactAmountOutRequestAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_out = message.tokenOut; + obj.token_out = message.tokenOut === "" ? undefined : message.tokenOut; return obj; }, fromAminoMsg(object: QuerySwapExactAmountOutRequestAminoMsg): QuerySwapExactAmountOutRequest { @@ -3544,7 +3544,7 @@ export const QuerySwapExactAmountOutResponse = { }, toAmino(message: QuerySwapExactAmountOutResponse): QuerySwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: QuerySwapExactAmountOutResponseAminoMsg): QuerySwapExactAmountOutResponse { @@ -3715,7 +3715,7 @@ export const QueryTotalLiquidityResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, @@ -3753,7 +3753,7 @@ export const PoolI_InterfaceDecoder = (input: BinaryReader | Uint8Array): Pool1 return data; } }; -export const PoolI_FromAmino = (content: AnyAmino) => { +export const PoolI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "osmosis/gamm/pool": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/tx.ts index 01c9de80e3..c508331d74 100644 --- a/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/tx.ts @@ -555,13 +555,13 @@ export const MsgJoinPool = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenInMaxs) { obj.token_in_maxs = message.tokenInMaxs.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_in_maxs = []; + obj.token_in_maxs = message.tokenInMaxs; } return obj; }, @@ -673,11 +673,11 @@ export const MsgJoinPoolResponse = { }, toAmino(message: MsgJoinPoolResponse): MsgJoinPoolResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenIn) { obj.token_in = message.tokenIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_in = []; + obj.token_in = message.tokenIn; } return obj; }, @@ -821,13 +821,13 @@ export const MsgExitPool = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; if (message.tokenOutMins) { obj.token_out_mins = message.tokenOutMins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_out_mins = []; + obj.token_out_mins = message.tokenOutMins; } return obj; }, @@ -927,7 +927,7 @@ export const MsgExitPoolResponse = { if (message.tokenOut) { obj.token_out = message.tokenOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_out = []; + obj.token_out = message.tokenOut; } return obj; }, @@ -1035,8 +1035,8 @@ export const SwapAmountInRoute = { }, toAmino(message: SwapAmountInRoute): SwapAmountInRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_out_denom = message.tokenOutDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; return obj; }, fromAminoMsg(object: SwapAmountInRouteAminoMsg): SwapAmountInRoute { @@ -1179,14 +1179,14 @@ export const MsgSwapExactAmountIn = { }, toAmino(message: MsgSwapExactAmountIn): MsgSwapExactAmountInAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; - obj.token_out_min_amount = message.tokenOutMinAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInAminoMsg): MsgSwapExactAmountIn { @@ -1276,7 +1276,7 @@ export const MsgSwapExactAmountInResponse = { }, toAmino(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInResponseAminoMsg): MsgSwapExactAmountInResponse { @@ -1383,8 +1383,8 @@ export const SwapAmountOutRoute = { }, toAmino(message: SwapAmountOutRoute): SwapAmountOutRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_in_denom = message.tokenInDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; return obj; }, fromAminoMsg(object: SwapAmountOutRouteAminoMsg): SwapAmountOutRoute { @@ -1527,13 +1527,13 @@ export const MsgSwapExactAmountOut = { }, toAmino(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_in_max_amount = message.tokenInMaxAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; return obj; }, @@ -1624,7 +1624,7 @@ export const MsgSwapExactAmountOutResponse = { }, toAmino(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountOutResponseAminoMsg): MsgSwapExactAmountOutResponse { @@ -1763,10 +1763,10 @@ export const MsgJoinSwapExternAmountIn = { }, toAmino(message: MsgJoinSwapExternAmountIn): MsgJoinSwapExternAmountInAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; - obj.share_out_min_amount = message.shareOutMinAmount; + obj.share_out_min_amount = message.shareOutMinAmount === "" ? undefined : message.shareOutMinAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapExternAmountInAminoMsg): MsgJoinSwapExternAmountIn { @@ -1856,7 +1856,7 @@ export const MsgJoinSwapExternAmountInResponse = { }, toAmino(message: MsgJoinSwapExternAmountInResponse): MsgJoinSwapExternAmountInResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapExternAmountInResponseAminoMsg): MsgJoinSwapExternAmountInResponse { @@ -2008,11 +2008,11 @@ export const MsgJoinSwapShareAmountOut = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapShareAmountOutAminoMsg): MsgJoinSwapShareAmountOut { @@ -2102,7 +2102,7 @@ export const MsgJoinSwapShareAmountOutResponse = { }, toAmino(message: MsgJoinSwapShareAmountOutResponse): MsgJoinSwapShareAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapShareAmountOutResponseAminoMsg): MsgJoinSwapShareAmountOutResponse { @@ -2254,11 +2254,11 @@ export const MsgExitSwapShareAmountIn = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromAminoMsg(object: MsgExitSwapShareAmountInAminoMsg): MsgExitSwapShareAmountIn { @@ -2348,7 +2348,7 @@ export const MsgExitSwapShareAmountInResponse = { }, toAmino(message: MsgExitSwapShareAmountInResponse): MsgExitSwapShareAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: MsgExitSwapShareAmountInResponseAminoMsg): MsgExitSwapShareAmountInResponse { @@ -2487,10 +2487,10 @@ export const MsgExitSwapExternAmountOut = { }, toAmino(message: MsgExitSwapExternAmountOut): MsgExitSwapExternAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; - obj.share_in_max_amount = message.shareInMaxAmount; + obj.share_in_max_amount = message.shareInMaxAmount === "" ? undefined : message.shareInMaxAmount; return obj; }, fromAminoMsg(object: MsgExitSwapExternAmountOutAminoMsg): MsgExitSwapExternAmountOut { @@ -2580,7 +2580,7 @@ export const MsgExitSwapExternAmountOutResponse = { }, toAmino(message: MsgExitSwapExternAmountOutResponse): MsgExitSwapExternAmountOutResponseAmino { const obj: any = {}; - obj.share_in_amount = message.shareInAmount; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; return obj; }, fromAminoMsg(object: MsgExitSwapExternAmountOutResponseAminoMsg): MsgExitSwapExternAmountOutResponse { diff --git a/__fixtures__/v-next/outputv2/osmosis/gamm/v2/query.ts b/__fixtures__/v-next/outputv2/osmosis/gamm/v2/query.ts index 98418eb73a..37866f66ea 100644 --- a/__fixtures__/v-next/outputv2/osmosis/gamm/v2/query.ts +++ b/__fixtures__/v-next/outputv2/osmosis/gamm/v2/query.ts @@ -164,9 +164,9 @@ export const QuerySpotPriceRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest { @@ -256,7 +256,7 @@ export const QuerySpotPriceResponse = { }, toAmino(message: QuerySpotPriceResponse): QuerySpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse { diff --git a/__fixtures__/v-next/outputv2/osmosis/ibc-rate-limit/v1beta1/params.ts b/__fixtures__/v-next/outputv2/osmosis/ibc-rate-limit/v1beta1/params.ts index 726fb7866d..937e0bc18c 100644 --- a/__fixtures__/v-next/outputv2/osmosis/ibc-rate-limit/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv2/osmosis/ibc-rate-limit/v1beta1/params.ts @@ -86,7 +86,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/osmosis/incentives/gauge.ts b/__fixtures__/v-next/outputv2/osmosis/incentives/gauge.ts index 56ef1d2c92..0150dcde09 100644 --- a/__fixtures__/v-next/outputv2/osmosis/incentives/gauge.ts +++ b/__fixtures__/v-next/outputv2/osmosis/incentives/gauge.ts @@ -319,21 +319,21 @@ export const Gauge = { }, toAmino(message: Gauge): GaugeAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.is_perpetual = message.isPerpetual; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.is_perpetual = message.isPerpetual === false ? undefined : 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.coins = message.coins; } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; - obj.filled_epochs = message.filledEpochs ? message.filledEpochs.toString() : undefined; + obj.num_epochs_paid_over = message.numEpochsPaidOver !== BigInt(0) ? message.numEpochsPaidOver.toString() : undefined; + obj.filled_epochs = message.filledEpochs !== BigInt(0) ? message.filledEpochs.toString() : undefined; if (message.distributedCoins) { obj.distributed_coins = message.distributedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.distributed_coins = []; + obj.distributed_coins = message.distributedCoins; } return obj; }, @@ -433,7 +433,7 @@ export const LockableDurationsInfo = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/incentives/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/incentives/genesis.ts index 7ae6c446ad..1f5b8bc0d0 100644 --- a/__fixtures__/v-next/outputv2/osmosis/incentives/genesis.ts +++ b/__fixtures__/v-next/outputv2/osmosis/incentives/genesis.ts @@ -192,14 +192,14 @@ export const GenesisState = { if (message.gauges) { obj.gauges = message.gauges.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.gauges = []; + obj.gauges = message.gauges; } if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } - obj.last_gauge_id = message.lastGaugeId ? message.lastGaugeId.toString() : undefined; + obj.last_gauge_id = message.lastGaugeId !== BigInt(0) ? message.lastGaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputv2/osmosis/incentives/params.ts b/__fixtures__/v-next/outputv2/osmosis/incentives/params.ts index 2bcc0633d8..bf648d6108 100644 --- a/__fixtures__/v-next/outputv2/osmosis/incentives/params.ts +++ b/__fixtures__/v-next/outputv2/osmosis/incentives/params.ts @@ -94,7 +94,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.distr_epoch_identifier = message.distrEpochIdentifier; + obj.distr_epoch_identifier = message.distrEpochIdentifier === "" ? undefined : message.distrEpochIdentifier; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/osmosis/incentives/query.ts b/__fixtures__/v-next/outputv2/osmosis/incentives/query.ts index 7dfb45b464..6cf257623d 100644 --- a/__fixtures__/v-next/outputv2/osmosis/incentives/query.ts +++ b/__fixtures__/v-next/outputv2/osmosis/incentives/query.ts @@ -534,7 +534,7 @@ export const ModuleToDistributeCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -627,7 +627,7 @@ export const GaugeByIDRequest = { }, toAmino(message: GaugeByIDRequest): GaugeByIDRequestAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; return obj; }, fromAminoMsg(object: GaugeByIDRequestAminoMsg): GaugeByIDRequest { @@ -927,7 +927,7 @@ export const GaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1137,7 +1137,7 @@ export const ActiveGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1246,7 +1246,7 @@ export const ActiveGaugesPerDenomRequest = { }, toAmino(message: ActiveGaugesPerDenomRequest): ActiveGaugesPerDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1363,7 +1363,7 @@ export const ActiveGaugesPerDenomResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1573,7 +1573,7 @@ export const UpcomingGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1682,7 +1682,7 @@ export const UpcomingGaugesPerDenomRequest = { }, toAmino(message: UpcomingGaugesPerDenomRequest): UpcomingGaugesPerDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1799,7 +1799,7 @@ export const UpcomingGaugesPerDenomResponse = { if (message.upcomingGauges) { obj.upcoming_gauges = message.upcomingGauges.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.upcoming_gauges = []; + obj.upcoming_gauges = message.upcomingGauges; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1938,13 +1938,13 @@ export const RewardsEstRequest = { }, toAmino(message: RewardsEstRequest): RewardsEstRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; if (message.lockIds) { obj.lock_ids = message.lockIds.map(e => e.toString()); } else { - obj.lock_ids = []; + obj.lock_ids = message.lockIds; } - obj.end_epoch = message.endEpoch ? message.endEpoch.toString() : undefined; + obj.end_epoch = message.endEpoch !== BigInt(0) ? message.endEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: RewardsEstRequestAminoMsg): RewardsEstRequest { @@ -2043,7 +2043,7 @@ export const RewardsEstResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -2215,7 +2215,7 @@ export const QueryLockableDurationsResponse = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/incentives/tx.ts b/__fixtures__/v-next/outputv2/osmosis/incentives/tx.ts index e66eaf4cbf..4c15055079 100644 --- a/__fixtures__/v-next/outputv2/osmosis/incentives/tx.ts +++ b/__fixtures__/v-next/outputv2/osmosis/incentives/tx.ts @@ -279,16 +279,16 @@ export const MsgCreateGauge = { }, toAmino(message: MsgCreateGauge): MsgCreateGaugeAmino { const obj: any = {}; - obj.is_perpetual = message.isPerpetual; - obj.owner = message.owner; + obj.is_perpetual = message.isPerpetual === false ? undefined : message.isPerpetual; + obj.owner = message.owner === "" ? undefined : 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.coins = message.coins; } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; + obj.num_epochs_paid_over = message.numEpochsPaidOver !== BigInt(0) ? message.numEpochsPaidOver.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateGaugeAminoMsg): MsgCreateGauge { @@ -488,12 +488,12 @@ export const MsgAddToGauge = { }, toAmino(message: MsgAddToGauge): MsgAddToGaugeAmino { const obj: any = {}; - obj.owner = message.owner; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; if (message.rewards) { obj.rewards = message.rewards.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/lockup/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/lockup/genesis.ts index b8cf9374fe..11fbe2e2a1 100644 --- a/__fixtures__/v-next/outputv2/osmosis/lockup/genesis.ts +++ b/__fixtures__/v-next/outputv2/osmosis/lockup/genesis.ts @@ -137,16 +137,16 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.last_lock_id = message.lastLockId ? message.lastLockId.toString() : undefined; + obj.last_lock_id = message.lastLockId !== BigInt(0) ? message.lastLockId.toString() : undefined; if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputv2/osmosis/lockup/lock.ts index 6899d4256a..63d0173b51 100644 --- a/__fixtures__/v-next/outputv2/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputv2/osmosis/lockup/lock.ts @@ -404,14 +404,14 @@ export const PeriodLock = { }, toAmino(message: PeriodLock): PeriodLockAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; - obj.owner = message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -534,7 +534,7 @@ export const QueryCondition = { fromAmino(object: QueryConditionAmino): QueryCondition { const message = createBaseQueryCondition(); if (object.lock_query_type !== undefined && object.lock_query_type !== null) { - message.lockQueryType = lockQueryTypeFromJSON(object.lock_query_type); + message.lockQueryType = object.lock_query_type; } if (object.denom !== undefined && object.denom !== null) { message.denom = object.denom; @@ -549,8 +549,8 @@ export const QueryCondition = { }, toAmino(message: QueryCondition): QueryConditionAmino { const obj: any = {}; - obj.lock_query_type = message.lockQueryType; - obj.denom = message.denom; + obj.lock_query_type = message.lockQueryType === 0 ? undefined : message.lockQueryType; + obj.denom = message.denom === "" ? undefined : message.denom; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; @@ -691,8 +691,8 @@ export const SyntheticLock = { }, toAmino(message: SyntheticLock): SyntheticLockAmino { const obj: any = {}; - obj.underlying_lock_id = message.underlyingLockId ? message.underlyingLockId.toString() : undefined; - obj.synth_denom = message.synthDenom; + obj.underlying_lock_id = message.underlyingLockId !== BigInt(0) ? message.underlyingLockId.toString() : undefined; + obj.synth_denom = message.synthDenom === "" ? undefined : message.synthDenom; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/osmosis/lockup/params.ts b/__fixtures__/v-next/outputv2/osmosis/lockup/params.ts index fca9e954e5..651a4c7012 100644 --- a/__fixtures__/v-next/outputv2/osmosis/lockup/params.ts +++ b/__fixtures__/v-next/outputv2/osmosis/lockup/params.ts @@ -92,7 +92,7 @@ export const Params = { if (message.forceUnlockAllowedAddresses) { obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses.map(e => e); } else { - obj.force_unlock_allowed_addresses = []; + obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/lockup/query.ts b/__fixtures__/v-next/outputv2/osmosis/lockup/query.ts index 20304c3605..920dde78a1 100644 --- a/__fixtures__/v-next/outputv2/osmosis/lockup/query.ts +++ b/__fixtures__/v-next/outputv2/osmosis/lockup/query.ts @@ -745,7 +745,7 @@ export const ModuleBalanceResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -917,7 +917,7 @@ export const ModuleLockedAmountResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1008,7 +1008,7 @@ export const AccountUnlockableCoinsRequest = { }, toAmino(message: AccountUnlockableCoinsRequest): AccountUnlockableCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountUnlockableCoinsRequestAminoMsg): AccountUnlockableCoinsRequest { @@ -1107,7 +1107,7 @@ export const AccountUnlockableCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1198,7 +1198,7 @@ export const AccountUnlockingCoinsRequest = { }, toAmino(message: AccountUnlockingCoinsRequest): AccountUnlockingCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountUnlockingCoinsRequestAminoMsg): AccountUnlockingCoinsRequest { @@ -1297,7 +1297,7 @@ export const AccountUnlockingCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1388,7 +1388,7 @@ export const AccountLockedCoinsRequest = { }, toAmino(message: AccountLockedCoinsRequest): AccountLockedCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountLockedCoinsRequestAminoMsg): AccountLockedCoinsRequest { @@ -1487,7 +1487,7 @@ export const AccountLockedCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1593,7 +1593,7 @@ export const AccountLockedPastTimeRequest = { }, toAmino(message: AccountLockedPastTimeRequest): AccountLockedPastTimeRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1693,7 +1693,7 @@ export const AccountLockedPastTimeResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1799,7 +1799,7 @@ export const AccountLockedPastTimeNotUnlockingOnlyRequest = { }, toAmino(message: AccountLockedPastTimeNotUnlockingOnlyRequest): AccountLockedPastTimeNotUnlockingOnlyRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1899,7 +1899,7 @@ export const AccountLockedPastTimeNotUnlockingOnlyResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2005,7 +2005,7 @@ export const AccountUnlockedBeforeTimeRequest = { }, toAmino(message: AccountUnlockedBeforeTimeRequest): AccountUnlockedBeforeTimeRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -2105,7 +2105,7 @@ export const AccountUnlockedBeforeTimeResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2226,9 +2226,9 @@ export const AccountLockedPastTimeDenomRequest = { }, toAmino(message: AccountLockedPastTimeDenomRequest): AccountLockedPastTimeDenomRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AccountLockedPastTimeDenomRequestAminoMsg): AccountLockedPastTimeDenomRequest { @@ -2327,7 +2327,7 @@ export const AccountLockedPastTimeDenomResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2435,7 +2435,7 @@ export const LockedDenomRequest = { }, toAmino(message: LockedDenomRequest): LockedDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -2526,7 +2526,7 @@ export const LockedDenomResponse = { }, toAmino(message: LockedDenomResponse): LockedDenomResponseAmino { const obj: any = {}; - obj.amount = message.amount; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: LockedDenomResponseAminoMsg): LockedDenomResponse { @@ -2618,7 +2618,7 @@ export const LockedRequest = { }, toAmino(message: LockedRequest): LockedRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: LockedRequestAminoMsg): LockedRequest { @@ -2802,7 +2802,7 @@ export const SyntheticLockupsByLockupIDRequest = { }, toAmino(message: SyntheticLockupsByLockupIDRequest): SyntheticLockupsByLockupIDRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: SyntheticLockupsByLockupIDRequestAminoMsg): SyntheticLockupsByLockupIDRequest { @@ -2901,7 +2901,7 @@ export const SyntheticLockupsByLockupIDResponse = { if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, @@ -3009,7 +3009,7 @@ export const AccountLockedLongerDurationRequest = { }, toAmino(message: AccountLockedLongerDurationRequest): AccountLockedLongerDurationRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -3109,7 +3109,7 @@ export const AccountLockedLongerDurationResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3217,7 +3217,7 @@ export const AccountLockedDurationRequest = { }, toAmino(message: AccountLockedDurationRequest): AccountLockedDurationRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -3317,7 +3317,7 @@ export const AccountLockedDurationResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3425,7 +3425,7 @@ export const AccountLockedLongerDurationNotUnlockingOnlyRequest = { }, toAmino(message: AccountLockedLongerDurationNotUnlockingOnlyRequest): AccountLockedLongerDurationNotUnlockingOnlyRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -3525,7 +3525,7 @@ export const AccountLockedLongerDurationNotUnlockingOnlyResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3648,9 +3648,9 @@ export const AccountLockedLongerDurationDenomRequest = { }, toAmino(message: AccountLockedLongerDurationDenomRequest): AccountLockedLongerDurationDenomRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AccountLockedLongerDurationDenomRequestAminoMsg): AccountLockedLongerDurationDenomRequest { @@ -3749,7 +3749,7 @@ export const AccountLockedLongerDurationDenomResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputv2/osmosis/lockup/tx.ts index 93db570036..89ac3d78eb 100644 --- a/__fixtures__/v-next/outputv2/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputv2/osmosis/lockup/tx.ts @@ -337,12 +337,12 @@ export const MsgLockTokens = { }, toAmino(message: MsgLockTokens): MsgLockTokensAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : 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 = []; + obj.coins = message.coins; } return obj; }, @@ -435,7 +435,7 @@ export const MsgLockTokensResponse = { }, toAmino(message: MsgLockTokensResponse): MsgLockTokensResponseAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockTokensResponseAminoMsg): MsgLockTokensResponse { @@ -525,7 +525,7 @@ export const MsgBeginUnlockingAll = { }, toAmino(message: MsgBeginUnlockingAll): MsgBeginUnlockingAllAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: MsgBeginUnlockingAllAminoMsg): MsgBeginUnlockingAll { @@ -624,7 +624,7 @@ export const MsgBeginUnlockingAllResponse = { if (message.unlocks) { obj.unlocks = message.unlocks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.unlocks = []; + obj.unlocks = message.unlocks; } return obj; }, @@ -753,12 +753,12 @@ export const MsgBeginUnlocking = { }, toAmino(message: MsgBeginUnlocking): MsgBeginUnlockingAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -849,7 +849,7 @@ export const MsgBeginUnlockingResponse = { }, toAmino(message: MsgBeginUnlockingResponse): MsgBeginUnlockingResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgBeginUnlockingResponseAminoMsg): MsgBeginUnlockingResponse { @@ -973,8 +973,8 @@ export const MsgExtendLockup = { }, toAmino(message: MsgExtendLockup): MsgExtendLockupAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -1065,7 +1065,7 @@ export const MsgExtendLockupResponse = { }, toAmino(message: MsgExtendLockupResponse): MsgExtendLockupResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgExtendLockupResponseAminoMsg): MsgExtendLockupResponse { @@ -1193,12 +1193,12 @@ export const MsgForceUnlock = { }, toAmino(message: MsgForceUnlock): MsgForceUnlockAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1289,7 +1289,7 @@ export const MsgForceUnlockResponse = { }, toAmino(message: MsgForceUnlockResponse): MsgForceUnlockResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgForceUnlockResponseAminoMsg): MsgForceUnlockResponse { diff --git a/__fixtures__/v-next/outputv2/osmosis/mint/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/mint/v1beta1/genesis.ts index b0adc047a0..2f51ee0092 100644 --- a/__fixtures__/v-next/outputv2/osmosis/mint/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/osmosis/mint/v1beta1/genesis.ts @@ -143,7 +143,7 @@ export const GenesisState = { 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; + obj.reduction_started_epoch = message.reductionStartedEpoch !== BigInt(0) ? message.reductionStartedEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputv2/osmosis/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputv2/osmosis/mint/v1beta1/mint.ts index 393a0f6b2e..3782a815ac 100644 --- a/__fixtures__/v-next/outputv2/osmosis/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputv2/osmosis/mint/v1beta1/mint.ts @@ -290,7 +290,7 @@ export const Minter = { }, toAmino(message: Minter): MinterAmino { const obj: any = {}; - obj.epoch_provisions = message.epochProvisions; + obj.epoch_provisions = message.epochProvisions === "" ? undefined : message.epochProvisions; return obj; }, fromAminoMsg(object: MinterAminoMsg): Minter { @@ -395,8 +395,8 @@ export const WeightedAddress = { }, toAmino(message: WeightedAddress): WeightedAddressAmino { const obj: any = {}; - obj.address = message.address; - obj.weight = message.weight; + obj.address = message.address === "" ? undefined : message.address; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedAddressAminoMsg): WeightedAddress { @@ -531,10 +531,10 @@ export const DistributionProportions = { }, 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; + obj.staking = message.staking === "" ? undefined : message.staking; + obj.pool_incentives = message.poolIncentives === "" ? undefined : message.poolIncentives; + obj.developer_rewards = message.developerRewards === "" ? undefined : message.developerRewards; + obj.community_pool = message.communityPool === "" ? undefined : message.communityPool; return obj; }, fromAminoMsg(object: DistributionProportionsAminoMsg): DistributionProportions { @@ -741,18 +741,18 @@ export const Params = { }, 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.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; + obj.genesis_epoch_provisions = message.genesisEpochProvisions === "" ? undefined : message.genesisEpochProvisions; + obj.epoch_identifier = message.epochIdentifier === "" ? undefined : message.epochIdentifier; + obj.reduction_period_in_epochs = message.reductionPeriodInEpochs !== BigInt(0) ? message.reductionPeriodInEpochs.toString() : undefined; + obj.reduction_factor = message.reductionFactor === "" ? undefined : 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.weighted_developer_rewards_receivers = message.weightedDeveloperRewardsReceivers; } - obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; + obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch !== BigInt(0) ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/genesis.ts index 7ca2185f0b..33090d3fe5 100644 --- a/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/genesis.ts @@ -160,7 +160,7 @@ export const GenesisState = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } obj.distr_info = message.distrInfo ? DistrInfo.toAmino(message.distrInfo) : undefined; obj.pool_to_gauges = message.poolToGauges ? PoolToGauges.toAmino(message.poolToGauges) : undefined; diff --git a/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/gov.ts b/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/gov.ts index 37d45d9b13..65341fa1f8 100644 --- a/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/gov.ts @@ -208,12 +208,12 @@ export const ReplacePoolIncentivesProposal = { }, toAmino(message: ReplacePoolIncentivesProposal): ReplacePoolIncentivesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, @@ -341,12 +341,12 @@ export const UpdatePoolIncentivesProposal = { }, toAmino(message: UpdatePoolIncentivesProposal): UpdatePoolIncentivesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/incentives.ts b/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/incentives.ts index 07179fa965..6fd1d7f989 100644 --- a/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/incentives.ts +++ b/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/incentives.ts @@ -193,7 +193,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.minted_denom = message.mintedDenom; + obj.minted_denom = message.mintedDenom === "" ? undefined : message.mintedDenom; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -292,7 +292,7 @@ export const LockableDurationsInfo = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, @@ -404,11 +404,11 @@ export const DistrInfo = { }, toAmino(message: DistrInfo): DistrInfoAmino { const obj: any = {}; - obj.total_weight = message.totalWeight; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, @@ -516,8 +516,8 @@ export const DistrRecord = { }, toAmino(message: DistrRecord): DistrRecordAmino { const obj: any = {}; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; - obj.weight = message.weight; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: DistrRecordAminoMsg): DistrRecord { @@ -643,8 +643,8 @@ export const PoolToGauge = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -744,7 +744,7 @@ export const PoolToGauges = { if (message.poolToGauge) { obj.pool_to_gauge = message.poolToGauge.map(e => e ? PoolToGauge.toAmino(e) : undefined); } else { - obj.pool_to_gauge = []; + obj.pool_to_gauge = message.poolToGauge; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/query.ts b/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/query.ts index 8f832c5b3c..bad79351bf 100644 --- a/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/osmosis/pool-incentives/v1beta1/query.ts @@ -291,7 +291,7 @@ export const QueryGaugeIdsRequest = { }, toAmino(message: QueryGaugeIdsRequest): QueryGaugeIdsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGaugeIdsRequestAminoMsg): QueryGaugeIdsRequest { @@ -390,7 +390,7 @@ export const QueryGaugeIdsResponse = { if (message.gaugeIdsWithDuration) { obj.gauge_ids_with_duration = message.gaugeIdsWithDuration.map(e => e ? QueryGaugeIdsResponse_GaugeIdWithDuration.toAmino(e) : undefined); } else { - obj.gauge_ids_with_duration = []; + obj.gauge_ids_with_duration = message.gaugeIdsWithDuration; } return obj; }, @@ -515,9 +515,9 @@ export const QueryGaugeIdsResponse_GaugeIdWithDuration = { }, toAmino(message: QueryGaugeIdsResponse_GaugeIdWithDuration): QueryGaugeIdsResponse_GaugeIdWithDurationAmino { const obj: any = {}; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.gauge_incentive_percentage = message.gaugeIncentivePercentage; + obj.gauge_incentive_percentage = message.gaugeIncentivePercentage === "" ? undefined : message.gaugeIncentivePercentage; return obj; }, fromAminoMsg(object: QueryGaugeIdsResponse_GaugeIdWithDurationAminoMsg): QueryGaugeIdsResponse_GaugeIdWithDuration { @@ -1016,7 +1016,7 @@ export const QueryLockableDurationsResponse = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, @@ -1215,9 +1215,9 @@ export const IncentivizedPool = { }, toAmino(message: IncentivizedPool): IncentivizedPoolAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.lockable_duration = message.lockableDuration ? Duration.toAmino(message.lockableDuration) : undefined; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: IncentivizedPoolAminoMsg): IncentivizedPool { @@ -1316,7 +1316,7 @@ export const QueryIncentivizedPoolsResponse = { if (message.incentivizedPools) { obj.incentivized_pools = message.incentivizedPools.map(e => e ? IncentivizedPool.toAmino(e) : undefined); } else { - obj.incentivized_pools = []; + obj.incentivized_pools = message.incentivizedPools; } return obj; }, @@ -1488,7 +1488,7 @@ export const QueryExternalIncentiveGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/sumtree/v1beta1/tree.ts b/__fixtures__/v-next/outputv2/osmosis/sumtree/v1beta1/tree.ts index be7e6d9a28..e1d2dabe10 100644 --- a/__fixtures__/v-next/outputv2/osmosis/sumtree/v1beta1/tree.ts +++ b/__fixtures__/v-next/outputv2/osmosis/sumtree/v1beta1/tree.ts @@ -129,7 +129,7 @@ export const Node = { if (message.children) { obj.children = message.children.map(e => e ? Child.toAmino(e) : undefined); } else { - obj.children = []; + obj.children = message.children; } return obj; }, @@ -236,7 +236,7 @@ export const Child = { toAmino(message: Child): ChildAmino { const obj: any = {}; obj.index = message.index ? base64FromBytes(message.index) : undefined; - obj.accumulation = message.accumulation; + obj.accumulation = message.accumulation === "" ? undefined : message.accumulation; return obj; }, fromAminoMsg(object: ChildAminoMsg): Child { diff --git a/__fixtures__/v-next/outputv2/osmosis/superfluid/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/superfluid/genesis.ts index 8c607fc0ca..b2e333f280 100644 --- a/__fixtures__/v-next/outputv2/osmosis/superfluid/genesis.ts +++ b/__fixtures__/v-next/outputv2/osmosis/superfluid/genesis.ts @@ -214,22 +214,22 @@ export const GenesisState = { if (message.superfluidAssets) { obj.superfluid_assets = message.superfluidAssets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.superfluid_assets = []; + obj.superfluid_assets = message.superfluidAssets; } if (message.osmoEquivalentMultipliers) { obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers.map(e => e ? OsmoEquivalentMultiplierRecord.toAmino(e) : undefined); } else { - obj.osmo_equivalent_multipliers = []; + obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers; } if (message.intermediaryAccounts) { obj.intermediary_accounts = message.intermediaryAccounts.map(e => e ? SuperfluidIntermediaryAccount.toAmino(e) : undefined); } else { - obj.intermediary_accounts = []; + obj.intermediary_accounts = message.intermediaryAccounts; } if (message.intemediaryAccountConnections) { obj.intemediary_account_connections = message.intemediaryAccountConnections.map(e => e ? LockIdIntermediaryAccountConnection.toAmino(e) : undefined); } else { - obj.intemediary_account_connections = []; + obj.intemediary_account_connections = message.intemediaryAccountConnections; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/superfluid/params.ts b/__fixtures__/v-next/outputv2/osmosis/superfluid/params.ts index f5661fcac3..9695cc01ae 100644 --- a/__fixtures__/v-next/outputv2/osmosis/superfluid/params.ts +++ b/__fixtures__/v-next/outputv2/osmosis/superfluid/params.ts @@ -99,7 +99,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.minimum_risk_factor = message.minimumRiskFactor; + obj.minimum_risk_factor = message.minimumRiskFactor === "" ? undefined : message.minimumRiskFactor; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv2/osmosis/superfluid/query.ts b/__fixtures__/v-next/outputv2/osmosis/superfluid/query.ts index 0a38240451..a5d982fd50 100644 --- a/__fixtures__/v-next/outputv2/osmosis/superfluid/query.ts +++ b/__fixtures__/v-next/outputv2/osmosis/superfluid/query.ts @@ -812,7 +812,7 @@ export const AssetTypeRequest = { }, toAmino(message: AssetTypeRequest): AssetTypeRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AssetTypeRequestAminoMsg): AssetTypeRequest { @@ -896,13 +896,13 @@ export const AssetTypeResponse = { fromAmino(object: AssetTypeResponseAmino): AssetTypeResponse { const message = createBaseAssetTypeResponse(); if (object.asset_type !== undefined && object.asset_type !== null) { - message.assetType = superfluidAssetTypeFromJSON(object.asset_type); + message.assetType = object.asset_type; } return message; }, toAmino(message: AssetTypeResponse): AssetTypeResponseAmino { const obj: any = {}; - obj.asset_type = message.assetType; + obj.asset_type = message.assetType === 0 ? undefined : message.assetType; return obj; }, fromAminoMsg(object: AssetTypeResponseAminoMsg): AssetTypeResponse { @@ -1073,7 +1073,7 @@ export const AllAssetsResponse = { if (message.assets) { obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -1164,7 +1164,7 @@ export const AssetMultiplierRequest = { }, toAmino(message: AssetMultiplierRequest): AssetMultiplierRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AssetMultiplierRequestAminoMsg): AssetMultiplierRequest { @@ -1393,10 +1393,10 @@ export const SuperfluidIntermediaryAccountInfo = { }, 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; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: SuperfluidIntermediaryAccountInfoAminoMsg): SuperfluidIntermediaryAccountInfo { @@ -1604,7 +1604,7 @@ export const AllIntermediaryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? SuperfluidIntermediaryAccountInfo.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1698,7 +1698,7 @@ export const ConnectedIntermediaryAccountRequest = { }, toAmino(message: ConnectedIntermediaryAccountRequest): ConnectedIntermediaryAccountRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: ConnectedIntermediaryAccountRequestAminoMsg): ConnectedIntermediaryAccountRequest { @@ -1880,7 +1880,7 @@ export const QueryTotalDelegationByValidatorForDenomRequest = { }, toAmino(message: QueryTotalDelegationByValidatorForDenomRequest): QueryTotalDelegationByValidatorForDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryTotalDelegationByValidatorForDenomRequestAminoMsg): QueryTotalDelegationByValidatorForDenomRequest { @@ -1979,7 +1979,7 @@ export const QueryTotalDelegationByValidatorForDenomResponse = { if (message.assets) { obj.assets = message.assets.map(e => e ? Delegations.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -2100,9 +2100,9 @@ export const Delegations = { }, toAmino(message: Delegations): DelegationsAmino { const obj: any = {}; - obj.val_addr = message.valAddr; - obj.amount_sfsd = message.amountSfsd; - obj.osmo_equivalent = message.osmoEquivalent; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.amount_sfsd = message.amountSfsd === "" ? undefined : message.amountSfsd; + obj.osmo_equivalent = message.osmoEquivalent === "" ? undefined : message.osmoEquivalent; return obj; }, fromAminoMsg(object: DelegationsAminoMsg): Delegations { @@ -2264,7 +2264,7 @@ export const TotalSuperfluidDelegationsResponse = { }, toAmino(message: TotalSuperfluidDelegationsResponse): TotalSuperfluidDelegationsResponseAmino { const obj: any = {}; - obj.total_delegations = message.totalDelegations; + obj.total_delegations = message.totalDelegations === "" ? undefined : message.totalDelegations; return obj; }, fromAminoMsg(object: TotalSuperfluidDelegationsResponseAminoMsg): TotalSuperfluidDelegationsResponse { @@ -2384,9 +2384,9 @@ export const SuperfluidDelegationAmountRequest = { }, toAmino(message: SuperfluidDelegationAmountRequest): SuperfluidDelegationAmountRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidDelegationAmountRequestAminoMsg): SuperfluidDelegationAmountRequest { @@ -2485,7 +2485,7 @@ export const SuperfluidDelegationAmountResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -2576,7 +2576,7 @@ export const SuperfluidDelegationsByDelegatorRequest = { }, toAmino(message: SuperfluidDelegationsByDelegatorRequest): SuperfluidDelegationsByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: SuperfluidDelegationsByDelegatorRequestAminoMsg): SuperfluidDelegationsByDelegatorRequest { @@ -2713,12 +2713,12 @@ export const SuperfluidDelegationsByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined; return obj; @@ -2825,8 +2825,8 @@ export const SuperfluidUndelegationsByDelegatorRequest = { }, toAmino(message: SuperfluidUndelegationsByDelegatorRequest): SuperfluidUndelegationsByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.denom = message.denom; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidUndelegationsByDelegatorRequestAminoMsg): SuperfluidUndelegationsByDelegatorRequest { @@ -2967,17 +2967,17 @@ export const SuperfluidUndelegationsByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.totalUndelegatedCoins) { obj.total_undelegated_coins = message.totalUndelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_undelegated_coins = []; + obj.total_undelegated_coins = message.totalUndelegatedCoins; } if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, @@ -3083,8 +3083,8 @@ export const SuperfluidDelegationsByValidatorDenomRequest = { }, toAmino(message: SuperfluidDelegationsByValidatorDenomRequest): SuperfluidDelegationsByValidatorDenomRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidDelegationsByValidatorDenomRequestAminoMsg): SuperfluidDelegationsByValidatorDenomRequest { @@ -3183,7 +3183,7 @@ export const SuperfluidDelegationsByValidatorDenomResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } return obj; }, @@ -3289,8 +3289,8 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomRequest = { }, toAmino(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest): EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAminoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomRequest { @@ -3389,7 +3389,7 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomResponse = { if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } return obj; }, @@ -3480,7 +3480,7 @@ export const QueryTotalDelegationByDelegatorRequest = { }, toAmino(message: QueryTotalDelegationByDelegatorRequest): QueryTotalDelegationByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryTotalDelegationByDelegatorRequestAminoMsg): QueryTotalDelegationByDelegatorRequest { @@ -3638,17 +3638,17 @@ export const QueryTotalDelegationByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.delegationResponse) { obj.delegation_response = message.delegationResponse.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_response = []; + obj.delegation_response = message.delegationResponse; } if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined; return obj; @@ -3830,7 +3830,7 @@ export const QueryUnpoolWhitelistResponse = { if (message.poolIds) { obj.pool_ids = message.poolIds.map(e => e.toString()); } else { - obj.pool_ids = []; + obj.pool_ids = message.poolIds; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/superfluid/superfluid.ts b/__fixtures__/v-next/outputv2/osmosis/superfluid/superfluid.ts index 9cffddcab4..1aadf0fdf6 100644 --- a/__fixtures__/v-next/outputv2/osmosis/superfluid/superfluid.ts +++ b/__fixtures__/v-next/outputv2/osmosis/superfluid/superfluid.ts @@ -328,14 +328,14 @@ export const SuperfluidAsset = { message.denom = object.denom; } if (object.asset_type !== undefined && object.asset_type !== null) { - message.assetType = superfluidAssetTypeFromJSON(object.asset_type); + message.assetType = object.asset_type; } return message; }, toAmino(message: SuperfluidAsset): SuperfluidAssetAmino { const obj: any = {}; - obj.denom = message.denom; - obj.asset_type = message.assetType; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.asset_type = message.assetType === 0 ? undefined : message.assetType; return obj; }, fromAminoMsg(object: SuperfluidAssetAminoMsg): SuperfluidAsset { @@ -457,9 +457,9 @@ export const SuperfluidIntermediaryAccount = { }, 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; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: SuperfluidIntermediaryAccountAminoMsg): SuperfluidIntermediaryAccount { @@ -581,9 +581,9 @@ export const OsmoEquivalentMultiplierRecord = { }, toAmino(message: OsmoEquivalentMultiplierRecord): OsmoEquivalentMultiplierRecordAmino { const obj: any = {}; - obj.epoch_number = message.epochNumber ? message.epochNumber.toString() : undefined; - obj.denom = message.denom; - obj.multiplier = message.multiplier; + obj.epoch_number = message.epochNumber !== BigInt(0) ? message.epochNumber.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.multiplier = message.multiplier === "" ? undefined : message.multiplier; return obj; }, fromAminoMsg(object: OsmoEquivalentMultiplierRecordAminoMsg): OsmoEquivalentMultiplierRecord { @@ -722,8 +722,8 @@ export const SuperfluidDelegationRecord = { }, toAmino(message: SuperfluidDelegationRecord): SuperfluidDelegationRecordAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : 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; @@ -832,8 +832,8 @@ export const LockIdIntermediaryAccountConnection = { }, toAmino(message: LockIdIntermediaryAccountConnection): LockIdIntermediaryAccountConnectionAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; - obj.intermediary_account = message.intermediaryAccount; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; + obj.intermediary_account = message.intermediaryAccount === "" ? undefined : message.intermediaryAccount; return obj; }, fromAminoMsg(object: LockIdIntermediaryAccountConnectionAminoMsg): LockIdIntermediaryAccountConnection { @@ -941,7 +941,7 @@ export const UnpoolWhitelistedPools = { if (message.ids) { obj.ids = message.ids.map(e => e.toString()); } else { - obj.ids = []; + obj.ids = message.ids; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputv2/osmosis/superfluid/tx.ts index fc59b83c92..5db9cef83b 100644 --- a/__fixtures__/v-next/outputv2/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputv2/osmosis/superfluid/tx.ts @@ -317,9 +317,9 @@ export const MsgSuperfluidDelegate = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; return obj; }, fromAminoMsg(object: MsgSuperfluidDelegateAminoMsg): MsgSuperfluidDelegate { @@ -498,8 +498,8 @@ export const MsgSuperfluidUndelegate = { }, toAmino(message: MsgSuperfluidUndelegate): MsgSuperfluidUndelegateAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSuperfluidUndelegateAminoMsg): MsgSuperfluidUndelegate { @@ -678,8 +678,8 @@ export const MsgSuperfluidUnbondLock = { }, toAmino(message: MsgSuperfluidUnbondLock): MsgSuperfluidUnbondLockAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSuperfluidUnbondLockAminoMsg): MsgSuperfluidUnbondLock { @@ -877,13 +877,13 @@ export const MsgLockAndSuperfluidDelegate = { }, toAmino(message: MsgLockAndSuperfluidDelegate): MsgLockAndSuperfluidDelegateAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } - obj.val_addr = message.valAddr; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateAminoMsg): MsgLockAndSuperfluidDelegate { @@ -975,7 +975,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, toAmino(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateResponseAminoMsg): MsgLockAndSuperfluidDelegateResponse { @@ -1082,8 +1082,8 @@ export const MsgUnPoolWhitelistedPool = { }, toAmino(message: MsgUnPoolWhitelistedPool): MsgUnPoolWhitelistedPoolAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgUnPoolWhitelistedPoolAminoMsg): MsgUnPoolWhitelistedPool { @@ -1191,7 +1191,7 @@ export const MsgUnPoolWhitelistedPoolResponse = { if (message.exitedLockIds) { obj.exited_lock_ids = message.exitedLockIds.map(e => e.toString()); } else { - obj.exited_lock_ids = []; + obj.exited_lock_ids = message.exitedLockIds; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/superfluid/v1beta1/gov.ts b/__fixtures__/v-next/outputv2/osmosis/superfluid/v1beta1/gov.ts deleted file mode 100644 index fa99034a63..0000000000 --- a/__fixtures__/v-next/outputv2/osmosis/superfluid/v1beta1/gov.ts +++ /dev/null @@ -1,542 +0,0 @@ -import { SuperfluidAsset, SuperfluidAssetAmino, SuperfluidAssetSDKType } from "../superfluid"; -import { BinaryReader, BinaryWriter } from "../../../binary"; -import { isSet, DeepPartial } from "../../../helpers"; -export const protobufPackage = "osmosis.superfluid.v1beta1"; -/** - * SetSuperfluidAssetsProposal is a gov Content type to update the superfluid - * assets - */ -export interface SetSuperfluidAssetsProposal { - $typeUrl?: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal"; - title: string; - description: string; - assets: SuperfluidAsset[]; -} -export interface SetSuperfluidAssetsProposalProtoMsg { - typeUrl: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal"; - value: Uint8Array; -} -/** - * SetSuperfluidAssetsProposal is a gov Content type to update the superfluid - * assets - */ -export interface SetSuperfluidAssetsProposalAmino { - title?: string; - description?: string; - assets?: SuperfluidAssetAmino[]; -} -export interface SetSuperfluidAssetsProposalAminoMsg { - type: "osmosis/v1beta1/set-superfluid-assets-proposal"; - value: SetSuperfluidAssetsProposalAmino; -} -/** - * SetSuperfluidAssetsProposal is a gov Content type to update the superfluid - * assets - */ -export interface SetSuperfluidAssetsProposalSDKType { - $typeUrl?: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal"; - title: string; - description: string; - assets: SuperfluidAssetSDKType[]; -} -/** - * RemoveSuperfluidAssetsProposal is a gov Content type to remove the superfluid - * assets by denom - */ -export interface RemoveSuperfluidAssetsProposal { - $typeUrl?: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal"; - title: string; - description: string; - superfluidAssetDenoms: string[]; -} -export interface RemoveSuperfluidAssetsProposalProtoMsg { - typeUrl: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal"; - value: Uint8Array; -} -/** - * RemoveSuperfluidAssetsProposal is a gov Content type to remove the superfluid - * assets by denom - */ -export interface RemoveSuperfluidAssetsProposalAmino { - title?: string; - description?: string; - superfluid_asset_denoms?: string[]; -} -export interface RemoveSuperfluidAssetsProposalAminoMsg { - type: "osmosis/v1beta1/remove-superfluid-assets-proposal"; - value: RemoveSuperfluidAssetsProposalAmino; -} -/** - * RemoveSuperfluidAssetsProposal is a gov Content type to remove the superfluid - * assets by denom - */ -export interface RemoveSuperfluidAssetsProposalSDKType { - $typeUrl?: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal"; - title: string; - description: string; - superfluid_asset_denoms: string[]; -} -/** - * UpdateUnpoolWhiteListProposal is a gov Content type to update the - * allowed list of pool ids. - */ -export interface UpdateUnpoolWhiteListProposal { - $typeUrl?: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal"; - title: string; - description: string; - ids: bigint[]; - isOverwrite: boolean; -} -export interface UpdateUnpoolWhiteListProposalProtoMsg { - typeUrl: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal"; - value: Uint8Array; -} -/** - * UpdateUnpoolWhiteListProposal is a gov Content type to update the - * allowed list of pool ids. - */ -export interface UpdateUnpoolWhiteListProposalAmino { - title?: string; - description?: string; - ids?: string[]; - is_overwrite?: boolean; -} -export interface UpdateUnpoolWhiteListProposalAminoMsg { - type: "osmosis/v1beta1/update-unpool-white-list-proposal"; - value: UpdateUnpoolWhiteListProposalAmino; -} -/** - * UpdateUnpoolWhiteListProposal is a gov Content type to update the - * allowed list of pool ids. - */ -export interface UpdateUnpoolWhiteListProposalSDKType { - $typeUrl?: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal"; - title: string; - description: string; - ids: bigint[]; - is_overwrite: boolean; -} -function createBaseSetSuperfluidAssetsProposal(): SetSuperfluidAssetsProposal { - return { - $typeUrl: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal", - title: "", - description: "", - assets: [] - }; -} -export const SetSuperfluidAssetsProposal = { - typeUrl: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal", - aminoType: "osmosis/v1beta1/set-superfluid-assets-proposal", - encode(message: SetSuperfluidAssetsProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.title !== "") { - writer.uint32(10).string(message.title); - } - if (message.description !== "") { - writer.uint32(18).string(message.description); - } - for (const v of message.assets) { - SuperfluidAsset.encode(v!, writer.uint32(26).fork()).ldelim(); - } - return writer; - }, - decode(input: BinaryReader | Uint8Array, length?: number): SetSuperfluidAssetsProposal { - const reader = input instanceof BinaryReader ? input : new BinaryReader(input); - let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseSetSuperfluidAssetsProposal(); - while (reader.pos < end) { - const tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.title = reader.string(); - break; - case 2: - message.description = reader.string(); - break; - case 3: - message.assets.push(SuperfluidAsset.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }, - fromJSON(object: any): SetSuperfluidAssetsProposal { - const obj = createBaseSetSuperfluidAssetsProposal(); - if (isSet(object.title)) obj.title = String(object.title); - if (isSet(object.description)) obj.description = String(object.description); - if (Array.isArray(object?.assets)) obj.assets = object.assets.map((e: any) => SuperfluidAsset.fromJSON(e)); - return obj; - }, - toJSON(message: SetSuperfluidAssetsProposal): unknown { - const obj: any = {}; - message.title !== undefined && (obj.title = message.title); - message.description !== undefined && (obj.description = message.description); - if (message.assets) { - obj.assets = message.assets.map(e => e ? SuperfluidAsset.toJSON(e) : undefined); - } else { - obj.assets = []; - } - return obj; - }, - fromPartial(object: DeepPartial): SetSuperfluidAssetsProposal { - const message = createBaseSetSuperfluidAssetsProposal(); - message.title = object.title ?? ""; - message.description = object.description ?? ""; - message.assets = object.assets?.map(e => SuperfluidAsset.fromPartial(e)) || []; - return message; - }, - fromSDK(object: SetSuperfluidAssetsProposalSDKType): SetSuperfluidAssetsProposal { - return { - title: object?.title, - description: object?.description, - assets: Array.isArray(object?.assets) ? object.assets.map((e: any) => SuperfluidAsset.fromSDK(e)) : [] - }; - }, - toSDK(message: SetSuperfluidAssetsProposal): SetSuperfluidAssetsProposalSDKType { - const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - if (message.assets) { - obj.assets = message.assets.map(e => e ? SuperfluidAsset.toSDK(e) : undefined); - } else { - obj.assets = []; - } - return obj; - }, - fromAmino(object: SetSuperfluidAssetsProposalAmino): SetSuperfluidAssetsProposal { - const message = createBaseSetSuperfluidAssetsProposal(); - if (object.title !== undefined && object.title !== null) { - message.title = object.title; - } - if (object.description !== undefined && object.description !== null) { - message.description = object.description; - } - message.assets = object.assets?.map(e => SuperfluidAsset.fromAmino(e)) || []; - return message; - }, - 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 { - return { - $typeUrl: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal", - title: "", - description: "", - superfluidAssetDenoms: [] - }; -} -export const RemoveSuperfluidAssetsProposal = { - typeUrl: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal", - aminoType: "osmosis/v1beta1/remove-superfluid-assets-proposal", - encode(message: RemoveSuperfluidAssetsProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.title !== "") { - writer.uint32(10).string(message.title); - } - if (message.description !== "") { - writer.uint32(18).string(message.description); - } - for (const v of message.superfluidAssetDenoms) { - writer.uint32(26).string(v!); - } - return writer; - }, - decode(input: BinaryReader | Uint8Array, length?: number): RemoveSuperfluidAssetsProposal { - const reader = input instanceof BinaryReader ? input : new BinaryReader(input); - let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseRemoveSuperfluidAssetsProposal(); - while (reader.pos < end) { - const tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.title = reader.string(); - break; - case 2: - message.description = reader.string(); - break; - case 3: - message.superfluidAssetDenoms.push(reader.string()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }, - fromJSON(object: any): RemoveSuperfluidAssetsProposal { - const obj = createBaseRemoveSuperfluidAssetsProposal(); - if (isSet(object.title)) obj.title = String(object.title); - if (isSet(object.description)) obj.description = String(object.description); - if (Array.isArray(object?.superfluidAssetDenoms)) obj.superfluidAssetDenoms = object.superfluidAssetDenoms.map((e: any) => String(e)); - return obj; - }, - toJSON(message: RemoveSuperfluidAssetsProposal): unknown { - const obj: any = {}; - message.title !== undefined && (obj.title = message.title); - message.description !== undefined && (obj.description = message.description); - if (message.superfluidAssetDenoms) { - obj.superfluidAssetDenoms = message.superfluidAssetDenoms.map(e => e); - } else { - obj.superfluidAssetDenoms = []; - } - return obj; - }, - fromPartial(object: DeepPartial): RemoveSuperfluidAssetsProposal { - const message = createBaseRemoveSuperfluidAssetsProposal(); - message.title = object.title ?? ""; - message.description = object.description ?? ""; - message.superfluidAssetDenoms = object.superfluidAssetDenoms?.map(e => e) || []; - return message; - }, - fromSDK(object: RemoveSuperfluidAssetsProposalSDKType): RemoveSuperfluidAssetsProposal { - return { - title: object?.title, - description: object?.description, - superfluidAssetDenoms: Array.isArray(object?.superfluid_asset_denoms) ? object.superfluid_asset_denoms.map((e: any) => e) : [] - }; - }, - toSDK(message: RemoveSuperfluidAssetsProposal): RemoveSuperfluidAssetsProposalSDKType { - 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; - }, - fromAmino(object: RemoveSuperfluidAssetsProposalAmino): RemoveSuperfluidAssetsProposal { - const message = createBaseRemoveSuperfluidAssetsProposal(); - if (object.title !== undefined && object.title !== null) { - message.title = object.title; - } - if (object.description !== undefined && object.description !== null) { - message.description = object.description; - } - message.superfluidAssetDenoms = object.superfluid_asset_denoms?.map(e => e) || []; - return message; - }, - 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 { - return { - $typeUrl: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal", - title: "", - description: "", - ids: [], - isOverwrite: false - }; -} -export const UpdateUnpoolWhiteListProposal = { - typeUrl: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal", - aminoType: "osmosis/v1beta1/update-unpool-white-list-proposal", - encode(message: UpdateUnpoolWhiteListProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.title !== "") { - writer.uint32(10).string(message.title); - } - if (message.description !== "") { - writer.uint32(18).string(message.description); - } - writer.uint32(26).fork(); - for (const v of message.ids) { - writer.uint64(v); - } - writer.ldelim(); - if (message.isOverwrite === true) { - writer.uint32(32).bool(message.isOverwrite); - } - return writer; - }, - decode(input: BinaryReader | Uint8Array, length?: number): UpdateUnpoolWhiteListProposal { - const reader = input instanceof BinaryReader ? input : new BinaryReader(input); - let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseUpdateUnpoolWhiteListProposal(); - while (reader.pos < end) { - const tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.title = reader.string(); - break; - case 2: - message.description = reader.string(); - break; - case 3: - if ((tag & 7) === 2) { - const end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) { - message.ids.push(reader.uint64()); - } - } else { - message.ids.push(reader.uint64()); - } - break; - case 4: - message.isOverwrite = reader.bool(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }, - fromJSON(object: any): UpdateUnpoolWhiteListProposal { - const obj = createBaseUpdateUnpoolWhiteListProposal(); - if (isSet(object.title)) obj.title = String(object.title); - if (isSet(object.description)) obj.description = String(object.description); - if (Array.isArray(object?.ids)) obj.ids = object.ids.map((e: any) => BigInt(e.toString())); - if (isSet(object.isOverwrite)) obj.isOverwrite = Boolean(object.isOverwrite); - return obj; - }, - toJSON(message: UpdateUnpoolWhiteListProposal): unknown { - const obj: any = {}; - message.title !== undefined && (obj.title = message.title); - message.description !== undefined && (obj.description = message.description); - if (message.ids) { - obj.ids = message.ids.map(e => (e || BigInt(0)).toString()); - } else { - obj.ids = []; - } - message.isOverwrite !== undefined && (obj.isOverwrite = message.isOverwrite); - return obj; - }, - fromPartial(object: DeepPartial): UpdateUnpoolWhiteListProposal { - const message = createBaseUpdateUnpoolWhiteListProposal(); - message.title = object.title ?? ""; - message.description = object.description ?? ""; - message.ids = object.ids?.map(e => BigInt(e.toString())) || []; - message.isOverwrite = object.isOverwrite ?? false; - return message; - }, - fromSDK(object: UpdateUnpoolWhiteListProposalSDKType): UpdateUnpoolWhiteListProposal { - return { - title: object?.title, - description: object?.description, - ids: Array.isArray(object?.ids) ? object.ids.map((e: any) => e) : [], - isOverwrite: object?.is_overwrite - }; - }, - toSDK(message: UpdateUnpoolWhiteListProposal): UpdateUnpoolWhiteListProposalSDKType { - const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - if (message.ids) { - obj.ids = message.ids.map(e => e); - } else { - obj.ids = []; - } - obj.is_overwrite = message.isOverwrite; - return obj; - }, - fromAmino(object: UpdateUnpoolWhiteListProposalAmino): UpdateUnpoolWhiteListProposal { - const message = createBaseUpdateUnpoolWhiteListProposal(); - if (object.title !== undefined && object.title !== null) { - message.title = object.title; - } - if (object.description !== undefined && object.description !== null) { - message.description = object.description; - } - message.ids = object.ids?.map(e => BigInt(e)) || []; - if (object.is_overwrite !== undefined && object.is_overwrite !== null) { - message.isOverwrite = object.is_overwrite; - } - return message; - }, - 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/outputv2/osmosis/tokenfactory/v1beta1/authorityMetadata.ts b/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/authorityMetadata.ts index 2114047312..857186384f 100644 --- a/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/authorityMetadata.ts +++ b/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/authorityMetadata.ts @@ -100,7 +100,7 @@ export const DenomAuthorityMetadata = { }, toAmino(message: DenomAuthorityMetadata): DenomAuthorityMetadataAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; return obj; }, fromAminoMsg(object: DenomAuthorityMetadataAminoMsg): DenomAuthorityMetadata { diff --git a/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/genesis.ts index 8652800db6..fe42a8634b 100644 --- a/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/genesis.ts @@ -155,7 +155,7 @@ export const GenesisState = { if (message.factoryDenoms) { obj.factory_denoms = message.factoryDenoms.map(e => e ? GenesisDenom.toAmino(e) : undefined); } else { - obj.factory_denoms = []; + obj.factory_denoms = message.factoryDenoms; } return obj; }, @@ -263,7 +263,7 @@ export const GenesisDenom = { }, toAmino(message: GenesisDenom): GenesisDenomAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.authority_metadata = message.authorityMetadata ? DenomAuthorityMetadata.toAmino(message.authorityMetadata) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/params.ts b/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/params.ts index 80ffd2b53f..86643a593a 100644 --- a/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/params.ts @@ -96,7 +96,7 @@ export const Params = { if (message.denomCreationFee) { obj.denom_creation_fee = message.denomCreationFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.denom_creation_fee = []; + obj.denom_creation_fee = message.denomCreationFee; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/query.ts b/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/query.ts index 935c0a47ca..3ad1959faf 100644 --- a/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/query.ts @@ -384,7 +384,7 @@ export const QueryDenomAuthorityMetadataRequest = { }, toAmino(message: QueryDenomAuthorityMetadataRequest): QueryDenomAuthorityMetadataRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomAuthorityMetadataRequestAminoMsg): QueryDenomAuthorityMetadataRequest { @@ -566,7 +566,7 @@ export const QueryDenomsFromCreatorRequest = { }, toAmino(message: QueryDenomsFromCreatorRequest): QueryDenomsFromCreatorRequestAmino { const obj: any = {}; - obj.creator = message.creator; + obj.creator = message.creator === "" ? undefined : message.creator; return obj; }, fromAminoMsg(object: QueryDenomsFromCreatorRequestAminoMsg): QueryDenomsFromCreatorRequest { @@ -665,7 +665,7 @@ export const QueryDenomsFromCreatorResponse = { if (message.denoms) { obj.denoms = message.denoms.map(e => e); } else { - obj.denoms = []; + obj.denoms = message.denoms; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/tx.ts index 3a9389073b..79b0c59566 100644 --- a/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/osmosis/tokenfactory/v1beta1/tx.ts @@ -366,8 +366,8 @@ export const MsgCreateDenom = { }, toAmino(message: MsgCreateDenom): MsgCreateDenomAmino { const obj: any = {}; - obj.sender = message.sender; - obj.subdenom = message.subdenom; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.subdenom = message.subdenom === "" ? undefined : message.subdenom; return obj; }, fromAminoMsg(object: MsgCreateDenomAminoMsg): MsgCreateDenom { @@ -457,7 +457,7 @@ export const MsgCreateDenomResponse = { }, toAmino(message: MsgCreateDenomResponse): MsgCreateDenomResponseAmino { const obj: any = {}; - obj.new_token_denom = message.newTokenDenom; + obj.new_token_denom = message.newTokenDenom === "" ? undefined : message.newTokenDenom; return obj; }, fromAminoMsg(object: MsgCreateDenomResponseAminoMsg): MsgCreateDenomResponse { @@ -564,7 +564,7 @@ export const MsgMint = { }, toAmino(message: MsgMint): MsgMintAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -744,7 +744,7 @@ export const MsgBurn = { }, toAmino(message: MsgBurn): MsgBurnAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -937,9 +937,9 @@ export const MsgChangeAdmin = { }, toAmino(message: MsgChangeAdmin): MsgChangeAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.denom = message.denom; - obj.new_admin = message.newAdmin; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgChangeAdminAminoMsg): MsgChangeAdmin { @@ -1118,7 +1118,7 @@ export const MsgSetDenomMetadata = { }, toAmino(message: MsgSetDenomMetadata): MsgSetDenomMetadataAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/twap/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/twap/v1beta1/genesis.ts index 359ff29089..e0412f8ebb 100644 --- a/__fixtures__/v-next/outputv2/osmosis/twap/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/osmosis/twap/v1beta1/genesis.ts @@ -135,7 +135,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.prune_epoch_identifier = message.pruneEpochIdentifier; + obj.prune_epoch_identifier = message.pruneEpochIdentifier === "" ? undefined : message.pruneEpochIdentifier; obj.record_history_keep_period = message.recordHistoryKeepPeriod ? Duration.toAmino(message.recordHistoryKeepPeriod) : undefined; return obj; }, @@ -252,7 +252,7 @@ export const GenesisState = { if (message.twaps) { obj.twaps = message.twaps.map(e => e ? TwapRecord.toAmino(e) : undefined); } else { - obj.twaps = []; + obj.twaps = message.twaps; } obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/osmosis/twap/v1beta1/query.ts b/__fixtures__/v-next/outputv2/osmosis/twap/v1beta1/query.ts index 4e8bec56f5..7eb5cdbc22 100644 --- a/__fixtures__/v-next/outputv2/osmosis/twap/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/osmosis/twap/v1beta1/query.ts @@ -248,9 +248,9 @@ export const ArithmeticTwapRequest = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset === "" ? undefined : message.baseAsset; + obj.quote_asset = message.quoteAsset === "" ? undefined : message.quoteAsset; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; return obj; @@ -342,7 +342,7 @@ export const ArithmeticTwapResponse = { }, toAmino(message: ArithmeticTwapResponse): ArithmeticTwapResponseAmino { const obj: any = {}; - obj.arithmetic_twap = message.arithmeticTwap; + obj.arithmetic_twap = message.arithmeticTwap === "" ? undefined : message.arithmeticTwap; return obj; }, fromAminoMsg(object: ArithmeticTwapResponseAminoMsg): ArithmeticTwapResponse { @@ -479,9 +479,9 @@ export const ArithmeticTwapToNowRequest = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset === "" ? undefined : message.baseAsset; + obj.quote_asset = message.quoteAsset === "" ? undefined : message.quoteAsset; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, @@ -572,7 +572,7 @@ export const ArithmeticTwapToNowResponse = { }, toAmino(message: ArithmeticTwapToNowResponse): ArithmeticTwapToNowResponseAmino { const obj: any = {}; - obj.arithmetic_twap = message.arithmeticTwap; + obj.arithmetic_twap = message.arithmeticTwap === "" ? undefined : message.arithmeticTwap; return obj; }, fromAminoMsg(object: ArithmeticTwapToNowResponseAminoMsg): ArithmeticTwapToNowResponse { diff --git a/__fixtures__/v-next/outputv2/osmosis/twap/v1beta1/twap_record.ts b/__fixtures__/v-next/outputv2/osmosis/twap/v1beta1/twap_record.ts index 16c781e3cc..e019cb5930 100644 --- a/__fixtures__/v-next/outputv2/osmosis/twap/v1beta1/twap_record.ts +++ b/__fixtures__/v-next/outputv2/osmosis/twap/v1beta1/twap_record.ts @@ -60,7 +60,7 @@ export interface TwapRecordAmino { /** Lexicographically larger denom of the pair */ asset1_denom?: string; /** height this record corresponds to, for debugging purposes */ - height?: string; + height: string; /** * This field should only exist until we have a global registry in the state * machine, mapping prior block heights within {TIME RANGE} to times. @@ -310,15 +310,15 @@ export const TwapRecord = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.asset0_denom = message.asset0Denom === "" ? undefined : message.asset0Denom; + obj.asset1_denom = message.asset1Denom === "" ? undefined : message.asset1Denom; + obj.height = message.height ? message.height.toString() : "0"; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - 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.p0_last_spot_price = message.p0LastSpotPrice === "" ? undefined : message.p0LastSpotPrice; + obj.p1_last_spot_price = message.p1LastSpotPrice === "" ? undefined : message.p1LastSpotPrice; + obj.p0_arithmetic_twap_accumulator = message.p0ArithmeticTwapAccumulator === "" ? undefined : message.p0ArithmeticTwapAccumulator; + obj.p1_arithmetic_twap_accumulator = message.p1ArithmeticTwapAccumulator === "" ? undefined : message.p1ArithmeticTwapAccumulator; obj.last_error_time = message.lastErrorTime ? Timestamp.toAmino(toTimestamp(message.lastErrorTime)) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/feetoken.ts b/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/feetoken.ts index a34a3f315f..be594d0c96 100644 --- a/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/feetoken.ts +++ b/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/feetoken.ts @@ -121,8 +121,8 @@ export const FeeToken = { }, toAmino(message: FeeToken): FeeTokenAmino { const obj: any = {}; - obj.denom = message.denom; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; return obj; }, fromAminoMsg(object: FeeTokenAminoMsg): FeeToken { diff --git a/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/genesis.ts index 33634a88bd..56d8d308a3 100644 --- a/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/genesis.ts @@ -111,11 +111,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.basedenom = message.basedenom; + obj.basedenom = message.basedenom === "" ? undefined : message.basedenom; if (message.feetokens) { obj.feetokens = message.feetokens.map(e => e ? FeeToken.toAmino(e) : undefined); } else { - obj.feetokens = []; + obj.feetokens = message.feetokens; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/gov.ts b/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/gov.ts index 80ba7a685d..8d5c4085f0 100644 --- a/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/gov.ts @@ -146,8 +146,8 @@ export const UpdateFeeTokenProposal = { }, toAmino(message: UpdateFeeTokenProposal): UpdateFeeTokenProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.feetoken = message.feetoken ? FeeToken.toAmino(message.feetoken) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/query.ts b/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/query.ts index bd63a21099..2ead0fbeaa 100644 --- a/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/osmosis/txfees/v1beta1/query.ts @@ -300,7 +300,7 @@ export const QueryFeeTokensResponse = { if (message.feeTokens) { obj.fee_tokens = message.feeTokens.map(e => e ? FeeToken.toAmino(e) : undefined); } else { - obj.fee_tokens = []; + obj.fee_tokens = message.feeTokens; } return obj; }, @@ -391,7 +391,7 @@ export const QueryDenomSpotPriceRequest = { }, toAmino(message: QueryDenomSpotPriceRequest): QueryDenomSpotPriceRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomSpotPriceRequestAminoMsg): QueryDenomSpotPriceRequest { @@ -498,8 +498,8 @@ export const QueryDenomSpotPriceResponse = { }, toAmino(message: QueryDenomSpotPriceResponse): QueryDenomSpotPriceResponseAmino { const obj: any = {}; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; - obj.spot_price = message.spotPrice; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QueryDenomSpotPriceResponseAminoMsg): QueryDenomSpotPriceResponse { @@ -589,7 +589,7 @@ export const QueryDenomPoolIdRequest = { }, toAmino(message: QueryDenomPoolIdRequest): QueryDenomPoolIdRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomPoolIdRequestAminoMsg): QueryDenomPoolIdRequest { @@ -681,7 +681,7 @@ export const QueryDenomPoolIdResponse = { }, toAmino(message: QueryDenomPoolIdResponse): QueryDenomPoolIdResponseAmino { const obj: any = {}; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; return obj; }, fromAminoMsg(object: QueryDenomPoolIdResponseAminoMsg): QueryDenomPoolIdResponse { @@ -843,7 +843,7 @@ export const QueryBaseDenomResponse = { }, toAmino(message: QueryBaseDenomResponse): QueryBaseDenomResponseAmino { const obj: any = {}; - obj.base_denom = message.baseDenom; + obj.base_denom = message.baseDenom === "" ? undefined : message.baseDenom; return obj; }, fromAminoMsg(object: QueryBaseDenomResponseAminoMsg): QueryBaseDenomResponse { diff --git a/__fixtures__/v-next/outputv2/tendermint/abci/types.ts b/__fixtures__/v-next/outputv2/tendermint/abci/types.ts index 1cb5e8f649..57ad0fa219 100644 --- a/__fixtures__/v-next/outputv2/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputv2/tendermint/abci/types.ts @@ -1787,7 +1787,7 @@ export const RequestEcho = { }, toAmino(message: RequestEcho): RequestEchoAmino { const obj: any = {}; - obj.message = message.message; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: RequestEchoAminoMsg): RequestEcho { @@ -1969,9 +1969,9 @@ export const RequestInfo = { }, 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; + obj.version = message.version === "" ? undefined : message.version; + obj.block_version = message.blockVersion !== BigInt(0) ? message.blockVersion.toString() : undefined; + obj.p2p_version = message.p2pVersion !== BigInt(0) ? message.p2pVersion.toString() : undefined; return obj; }, fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo { @@ -2069,8 +2069,8 @@ export const RequestSetOption = { }, toAmino(message: RequestSetOption): RequestSetOptionAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: RequestSetOptionAminoMsg): RequestSetOption { @@ -2239,15 +2239,15 @@ export const RequestInitChain = { toAmino(message: RequestInitChain): RequestInitChainAmino { const obj: any = {}; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : 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.validators = message.validators; } obj.app_state_bytes = message.appStateBytes ? base64FromBytes(message.appStateBytes) : undefined; - obj.initial_height = message.initialHeight ? message.initialHeight.toString() : undefined; + obj.initial_height = message.initialHeight !== BigInt(0) ? message.initialHeight.toString() : undefined; return obj; }, fromAminoMsg(object: RequestInitChainAminoMsg): RequestInitChain { @@ -2378,9 +2378,9 @@ export const RequestQuery = { toAmino(message: RequestQuery): RequestQueryAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.path = message.path; - obj.height = message.height ? message.height.toString() : undefined; - obj.prove = message.prove; + obj.path = message.path === "" ? undefined : message.path; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.prove = message.prove === false ? undefined : message.prove; return obj; }, fromAminoMsg(object: RequestQueryAminoMsg): RequestQuery { @@ -2524,7 +2524,7 @@ export const RequestBeginBlock = { if (message.byzantineValidators) { obj.byzantine_validators = message.byzantineValidators.map(e => e ? Evidence.toAmino(e) : undefined); } else { - obj.byzantine_validators = []; + obj.byzantine_validators = message.byzantineValidators; } return obj; }, @@ -2617,14 +2617,14 @@ export const RequestCheckTx = { message.tx = bytesFromBase64(object.tx); } if (object.type !== undefined && object.type !== null) { - message.type = checkTxTypeFromJSON(object.type); + message.type = object.type; } return message; }, toAmino(message: RequestCheckTx): RequestCheckTxAmino { const obj: any = {}; obj.tx = message.tx ? base64FromBytes(message.tx) : undefined; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; return obj; }, fromAminoMsg(object: RequestCheckTxAminoMsg): RequestCheckTx { @@ -2792,7 +2792,7 @@ export const RequestEndBlock = { }, toAmino(message: RequestEndBlock): RequestEndBlockAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: RequestEndBlockAminoMsg): RequestEndBlock { @@ -3138,9 +3138,9 @@ export const RequestLoadSnapshotChunk = { }, toAmino(message: RequestLoadSnapshotChunk): RequestLoadSnapshotChunkAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunk = message.chunk; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunk = message.chunk === 0 ? undefined : message.chunk; return obj; }, fromAminoMsg(object: RequestLoadSnapshotChunkAminoMsg): RequestLoadSnapshotChunk { @@ -3253,9 +3253,9 @@ export const RequestApplySnapshotChunk = { }, toAmino(message: RequestApplySnapshotChunk): RequestApplySnapshotChunkAmino { const obj: any = {}; - obj.index = message.index; + obj.index = message.index === 0 ? undefined : message.index; obj.chunk = message.chunk ? base64FromBytes(message.chunk) : undefined; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: RequestApplySnapshotChunkAminoMsg): RequestApplySnapshotChunk { @@ -3693,7 +3693,7 @@ export const ResponseException = { }, toAmino(message: ResponseException): ResponseExceptionAmino { const obj: any = {}; - obj.error = message.error; + obj.error = message.error === "" ? undefined : message.error; return obj; }, fromAminoMsg(object: ResponseExceptionAminoMsg): ResponseException { @@ -3776,7 +3776,7 @@ export const ResponseEcho = { }, toAmino(message: ResponseEcho): ResponseEchoAmino { const obj: any = {}; - obj.message = message.message; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: ResponseEchoAminoMsg): ResponseEcho { @@ -3988,10 +3988,10 @@ export const ResponseInfo = { }, 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.data = message.data === "" ? undefined : message.data; + obj.version = message.version === "" ? undefined : message.version; + obj.app_version = message.appVersion !== BigInt(0) ? message.appVersion.toString() : undefined; + obj.last_block_height = message.lastBlockHeight !== BigInt(0) ? message.lastBlockHeight.toString() : undefined; obj.last_block_app_hash = message.lastBlockAppHash ? base64FromBytes(message.lastBlockAppHash) : undefined; return obj; }, @@ -4105,9 +4105,9 @@ export const ResponseSetOption = { }, toAmino(message: ResponseSetOption): ResponseSetOptionAmino { const obj: any = {}; - obj.code = message.code; - obj.log = message.log; - obj.info = message.info; + obj.code = message.code === 0 ? undefined : message.code; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; return obj; }, fromAminoMsg(object: ResponseSetOptionAminoMsg): ResponseSetOption { @@ -4232,7 +4232,7 @@ export const ResponseInitChain = { if (message.validators) { obj.validators = message.validators.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.app_hash = message.appHash ? base64FromBytes(message.appHash) : undefined; return obj; @@ -4443,15 +4443,15 @@ export const ResponseQuery = { }, 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.code = message.code === 0 ? undefined : message.code; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; obj.proof_ops = message.proofOps ? ProofOps.toAmino(message.proofOps) : undefined; - obj.height = message.height ? message.height.toString() : undefined; - obj.codespace = message.codespace; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseQueryAminoMsg): ResponseQuery { @@ -4543,7 +4543,7 @@ export const ResponseBeginBlock = { if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -4742,18 +4742,18 @@ export const ResponseCheckTx = { }, toAmino(message: ResponseCheckTx): ResponseCheckTxAmino { const obj: any = {}; - obj.code = message.code; + obj.code = message.code === 0 ? undefined : message.code; obj.data = message.data ? base64FromBytes(message.data) : undefined; - 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; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } - obj.codespace = message.codespace; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseCheckTxAminoMsg): ResponseCheckTx { @@ -4951,18 +4951,18 @@ export const ResponseDeliverTx = { }, toAmino(message: ResponseDeliverTx): ResponseDeliverTxAmino { const obj: any = {}; - obj.code = message.code; + obj.code = message.code === 0 ? undefined : message.code; obj.data = message.data ? base64FromBytes(message.data) : undefined; - 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; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } - obj.codespace = message.codespace; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseDeliverTxAminoMsg): ResponseDeliverTx { @@ -5092,13 +5092,13 @@ export const ResponseEndBlock = { if (message.validatorUpdates) { obj.validator_updates = message.validatorUpdates.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); } else { - obj.validator_updates = []; + obj.validator_updates = message.validatorUpdates; } 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 = []; + obj.events = message.events; } return obj; }, @@ -5200,7 +5200,7 @@ export const ResponseCommit = { toAmino(message: ResponseCommit): ResponseCommitAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.retain_height = message.retainHeight ? message.retainHeight.toString() : undefined; + obj.retain_height = message.retainHeight !== BigInt(0) ? message.retainHeight.toString() : undefined; return obj; }, fromAminoMsg(object: ResponseCommitAminoMsg): ResponseCommit { @@ -5292,7 +5292,7 @@ export const ResponseListSnapshots = { if (message.snapshots) { obj.snapshots = message.snapshots.map(e => e ? Snapshot.toAmino(e) : undefined); } else { - obj.snapshots = []; + obj.snapshots = message.snapshots; } return obj; }, @@ -5370,13 +5370,13 @@ export const ResponseOfferSnapshot = { fromAmino(object: ResponseOfferSnapshotAmino): ResponseOfferSnapshot { const message = createBaseResponseOfferSnapshot(); if (object.result !== undefined && object.result !== null) { - message.result = responseOfferSnapshot_ResultFromJSON(object.result); + message.result = object.result; } return message; }, toAmino(message: ResponseOfferSnapshot): ResponseOfferSnapshotAmino { const obj: any = {}; - obj.result = message.result; + obj.result = message.result === 0 ? undefined : message.result; return obj; }, fromAminoMsg(object: ResponseOfferSnapshotAminoMsg): ResponseOfferSnapshot { @@ -5585,7 +5585,7 @@ export const ResponseApplySnapshotChunk = { fromAmino(object: ResponseApplySnapshotChunkAmino): ResponseApplySnapshotChunk { const message = createBaseResponseApplySnapshotChunk(); if (object.result !== undefined && object.result !== null) { - message.result = responseApplySnapshotChunk_ResultFromJSON(object.result); + message.result = object.result; } message.refetchChunks = object.refetch_chunks?.map(e => e) || []; message.rejectSenders = object.reject_senders?.map(e => e) || []; @@ -5593,16 +5593,16 @@ export const ResponseApplySnapshotChunk = { }, toAmino(message: ResponseApplySnapshotChunk): ResponseApplySnapshotChunkAmino { const obj: any = {}; - obj.result = message.result; + obj.result = message.result === 0 ? undefined : message.result; if (message.refetchChunks) { obj.refetch_chunks = message.refetchChunks.map(e => e); } else { - obj.refetch_chunks = []; + obj.refetch_chunks = message.refetchChunks; } if (message.rejectSenders) { obj.reject_senders = message.rejectSenders.map(e => e); } else { - obj.reject_senders = []; + obj.reject_senders = message.rejectSenders; } return obj; }, @@ -5844,8 +5844,8 @@ export const BlockParams = { }, 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.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas !== BigInt(0) ? message.maxGas.toString() : undefined; return obj; }, fromAminoMsg(object: BlockParamsAminoMsg): BlockParams { @@ -5949,11 +5949,11 @@ export const LastCommitInfo = { }, toAmino(message: LastCommitInfo): LastCommitInfoAmino { const obj: any = {}; - obj.round = message.round; + obj.round = message.round === 0 ? undefined : message.round; if (message.votes) { obj.votes = message.votes.map(e => e ? VoteInfo.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } return obj; }, @@ -6058,11 +6058,11 @@ export const Event = { }, toAmino(message: Event): EventAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? EventAttribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -6178,7 +6178,7 @@ export const EventAttribute = { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; - obj.index = message.index; + obj.index = message.index === false ? undefined : message.index; return obj; }, fromAminoMsg(object: EventAttributeAminoMsg): EventAttribute { @@ -6310,8 +6310,8 @@ export const TxResult = { }, toAmino(message: TxResult): TxResultAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.index = message.index; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.index = message.index === 0 ? undefined : message.index; obj.tx = message.tx ? base64FromBytes(message.tx) : undefined; obj.result = message.result ? ResponseDeliverTx.toAmino(message.result) : undefined; return obj; @@ -6414,7 +6414,7 @@ export const Validator = { toAmino(message: Validator): ValidatorAmino { const obj: any = {}; obj.address = message.address ? base64FromBytes(message.address) : undefined; - obj.power = message.power ? message.power.toString() : undefined; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -6517,7 +6517,7 @@ export const ValidatorUpdate = { 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; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorUpdateAminoMsg): ValidatorUpdate { @@ -6618,7 +6618,7 @@ export const VoteInfo = { toAmino(message: VoteInfo): VoteInfoAmino { const obj: any = {}; obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; - obj.signed_last_block = message.signedLastBlock; + obj.signed_last_block = message.signedLastBlock === false ? undefined : message.signedLastBlock; return obj; }, fromAminoMsg(object: VoteInfoAminoMsg): VoteInfo { @@ -6749,7 +6749,7 @@ export const Evidence = { fromAmino(object: EvidenceAmino): Evidence { const message = createBaseEvidence(); if (object.type !== undefined && object.type !== null) { - message.type = evidenceTypeFromJSON(object.type); + message.type = object.type; } if (object.validator !== undefined && object.validator !== null) { message.validator = Validator.fromAmino(object.validator); @@ -6767,11 +6767,11 @@ export const Evidence = { }, toAmino(message: Evidence): EvidenceAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; return obj; }, fromAminoMsg(object: EvidenceAminoMsg): Evidence { @@ -6916,9 +6916,9 @@ export const Snapshot = { }, toAmino(message: Snapshot): SnapshotAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunks = message.chunks; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunks = message.chunks === 0 ? undefined : message.chunks; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; obj.metadata = message.metadata ? base64FromBytes(message.metadata) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv2/tendermint/crypto/proof.ts b/__fixtures__/v-next/outputv2/tendermint/crypto/proof.ts index 4249f6a930..000003ef73 100644 --- a/__fixtures__/v-next/outputv2/tendermint/crypto/proof.ts +++ b/__fixtures__/v-next/outputv2/tendermint/crypto/proof.ts @@ -251,13 +251,13 @@ export const Proof = { }, toAmino(message: Proof): ProofAmino { const obj: any = {}; - obj.total = message.total ? message.total.toString() : undefined; - obj.index = message.index ? message.index.toString() : undefined; + obj.total = message.total !== BigInt(0) ? message.total.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.leaf_hash = message.leafHash ? base64FromBytes(message.leafHash) : undefined; if (message.aunts) { obj.aunts = message.aunts.map(e => base64FromBytes(e)); } else { - obj.aunts = []; + obj.aunts = message.aunts; } return obj; }, @@ -472,9 +472,9 @@ export const DominoOp = { }, toAmino(message: DominoOp): DominoOpAmino { const obj: any = {}; - obj.key = message.key; - obj.input = message.input; - obj.output = message.output; + obj.key = message.key === "" ? undefined : message.key; + obj.input = message.input === "" ? undefined : message.input; + obj.output = message.output === "" ? undefined : message.output; return obj; }, fromAminoMsg(object: DominoOpAminoMsg): DominoOp { @@ -587,7 +587,7 @@ export const ProofOp = { }, toAmino(message: ProofOp): ProofOpAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; @@ -681,7 +681,7 @@ export const ProofOps = { if (message.ops) { obj.ops = message.ops.map(e => e ? ProofOp.toAmino(e) : undefined); } else { - obj.ops = []; + obj.ops = message.ops; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/tendermint/libs/bits/types.ts b/__fixtures__/v-next/outputv2/tendermint/libs/bits/types.ts index 2a213d3edc..93f66d1a99 100644 --- a/__fixtures__/v-next/outputv2/tendermint/libs/bits/types.ts +++ b/__fixtures__/v-next/outputv2/tendermint/libs/bits/types.ts @@ -117,11 +117,11 @@ export const BitArray = { }, toAmino(message: BitArray): BitArrayAmino { const obj: any = {}; - obj.bits = message.bits ? message.bits.toString() : undefined; + obj.bits = message.bits !== BigInt(0) ? message.bits.toString() : undefined; if (message.elems) { obj.elems = message.elems.map(e => e.toString()); } else { - obj.elems = []; + obj.elems = message.elems; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/tendermint/p2p/types.ts b/__fixtures__/v-next/outputv2/tendermint/p2p/types.ts index 781aba721c..6b77e89f75 100644 --- a/__fixtures__/v-next/outputv2/tendermint/p2p/types.ts +++ b/__fixtures__/v-next/outputv2/tendermint/p2p/types.ts @@ -232,9 +232,9 @@ export const ProtocolVersion = { }, 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; + obj.p2p = message.p2p !== BigInt(0) ? message.p2p.toString() : undefined; + obj.block = message.block !== BigInt(0) ? message.block.toString() : undefined; + obj.app = message.app !== BigInt(0) ? message.app.toString() : undefined; return obj; }, fromAminoMsg(object: ProtocolVersionAminoMsg): ProtocolVersion { @@ -427,12 +427,12 @@ export const NodeInfo = { 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.node_id = message.nodeId === "" ? undefined : message.nodeId; + obj.listen_addr = message.listenAddr === "" ? undefined : message.listenAddr; + obj.network = message.network === "" ? undefined : message.network; + obj.version = message.version === "" ? undefined : message.version; obj.channels = message.channels ? base64FromBytes(message.channels) : undefined; - obj.moniker = message.moniker; + obj.moniker = message.moniker === "" ? undefined : message.moniker; obj.other = message.other ? NodeInfoOther.toAmino(message.other) : undefined; return obj; }, @@ -531,8 +531,8 @@ export const NodeInfoOther = { }, toAmino(message: NodeInfoOther): NodeInfoOtherAmino { const obj: any = {}; - obj.tx_index = message.txIndex; - obj.rpc_address = message.rpcAddress; + obj.tx_index = message.txIndex === "" ? undefined : message.txIndex; + obj.rpc_address = message.rpcAddress === "" ? undefined : message.rpcAddress; return obj; }, fromAminoMsg(object: NodeInfoOtherAminoMsg): NodeInfoOther { @@ -651,11 +651,11 @@ export const PeerInfo = { }, toAmino(message: PeerInfo): PeerInfoAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; if (message.addressInfo) { obj.address_info = message.addressInfo.map(e => e ? PeerAddressInfo.toAmino(e) : undefined); } else { - obj.address_info = []; + obj.address_info = message.addressInfo; } obj.last_connected = message.lastConnected ? Timestamp.toAmino(toTimestamp(message.lastConnected)) : undefined; return obj; @@ -785,10 +785,10 @@ export const PeerAddressInfo = { }, toAmino(message: PeerAddressInfo): PeerAddressInfoAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.last_dial_success = message.lastDialSuccess ? Timestamp.toAmino(toTimestamp(message.lastDialSuccess)) : undefined; obj.last_dial_failure = message.lastDialFailure ? Timestamp.toAmino(toTimestamp(message.lastDialFailure)) : undefined; - obj.dial_failures = message.dialFailures; + obj.dial_failures = message.dialFailures === 0 ? undefined : message.dialFailures; return obj; }, fromAminoMsg(object: PeerAddressInfoAminoMsg): PeerAddressInfo { diff --git a/__fixtures__/v-next/outputv2/tendermint/types/evidence.ts b/__fixtures__/v-next/outputv2/tendermint/types/evidence.ts index 847bca798f..ffea338dfc 100644 --- a/__fixtures__/v-next/outputv2/tendermint/types/evidence.ts +++ b/__fixtures__/v-next/outputv2/tendermint/types/evidence.ts @@ -342,8 +342,8 @@ export const DuplicateVoteEvidence = { 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.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; + obj.validator_power = message.validatorPower !== BigInt(0) ? message.validatorPower.toString() : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -500,13 +500,13 @@ export const LightClientAttackEvidence = { 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; + obj.common_height = message.commonHeight !== BigInt(0) ? message.commonHeight.toString() : undefined; if (message.byzantineValidators) { obj.byzantine_validators = message.byzantineValidators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.byzantine_validators = []; + obj.byzantine_validators = message.byzantineValidators; } - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -599,7 +599,7 @@ export const EvidenceList = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Evidence.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } return obj; }, diff --git a/__fixtures__/v-next/outputv2/tendermint/types/params.ts b/__fixtures__/v-next/outputv2/tendermint/types/params.ts index 14a31dbc8f..e031d8a875 100644 --- a/__fixtures__/v-next/outputv2/tendermint/types/params.ts +++ b/__fixtures__/v-next/outputv2/tendermint/types/params.ts @@ -479,9 +479,9 @@ export const BlockParams = { }, 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; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas !== BigInt(0) ? message.maxGas.toString() : undefined; + obj.time_iota_ms = message.timeIotaMs !== BigInt(0) ? message.timeIotaMs.toString() : undefined; return obj; }, fromAminoMsg(object: BlockParamsAminoMsg): BlockParams { @@ -600,9 +600,9 @@ export const EvidenceParams = { }, toAmino(message: EvidenceParams): EvidenceParamsAmino { const obj: any = {}; - obj.max_age_num_blocks = message.maxAgeNumBlocks ? message.maxAgeNumBlocks.toString() : undefined; + obj.max_age_num_blocks = message.maxAgeNumBlocks !== BigInt(0) ? message.maxAgeNumBlocks.toString() : undefined; obj.max_age_duration = message.maxAgeDuration ? Duration.toAmino(message.maxAgeDuration) : undefined; - obj.max_bytes = message.maxBytes ? message.maxBytes.toString() : undefined; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; return obj; }, fromAminoMsg(object: EvidenceParamsAminoMsg): EvidenceParams { @@ -694,7 +694,7 @@ export const ValidatorParams = { if (message.pubKeyTypes) { obj.pub_key_types = message.pubKeyTypes.map(e => e); } else { - obj.pub_key_types = []; + obj.pub_key_types = message.pubKeyTypes; } return obj; }, @@ -780,7 +780,7 @@ export const VersionParams = { }, toAmino(message: VersionParams): VersionParamsAmino { const obj: any = {}; - obj.app_version = message.appVersion ? message.appVersion.toString() : undefined; + obj.app_version = message.appVersion !== BigInt(0) ? message.appVersion.toString() : undefined; return obj; }, fromAminoMsg(object: VersionParamsAminoMsg): VersionParams { @@ -882,8 +882,8 @@ export const HashedParams = { }, 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; + obj.block_max_bytes = message.blockMaxBytes !== BigInt(0) ? message.blockMaxBytes.toString() : undefined; + obj.block_max_gas = message.blockMaxGas !== BigInt(0) ? message.blockMaxGas.toString() : undefined; return obj; }, fromAminoMsg(object: HashedParamsAminoMsg): HashedParams { diff --git a/__fixtures__/v-next/outputv2/tendermint/types/types.ts b/__fixtures__/v-next/outputv2/tendermint/types/types.ts index 73b6d251f4..f74246007e 100644 --- a/__fixtures__/v-next/outputv2/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputv2/tendermint/types/types.ts @@ -589,7 +589,7 @@ export const PartSetHeader = { }, toAmino(message: PartSetHeader): PartSetHeaderAmino { const obj: any = {}; - obj.total = message.total; + obj.total = message.total === 0 ? undefined : message.total; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; return obj; }, @@ -705,7 +705,7 @@ export const Part = { }, toAmino(message: Part): PartAmino { const obj: any = {}; - obj.index = message.index; + obj.index = message.index === 0 ? undefined : message.index; obj.bytes = message.bytes ? base64FromBytes(message.bytes) : undefined; obj.proof = message.proof ? Proof.toAmino(message.proof) : undefined; return obj; @@ -1093,8 +1093,8 @@ export const Header = { 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.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; obj.last_block_id = message.lastBlockId ? BlockID.toAmino(message.lastBlockId) : undefined; obj.last_commit_hash = message.lastCommitHash ? base64FromBytes(message.lastCommitHash) : undefined; @@ -1197,7 +1197,7 @@ export const Data = { if (message.txs) { obj.txs = message.txs.map(e => base64FromBytes(e)); } else { - obj.txs = []; + obj.txs = message.txs; } return obj; }, @@ -1363,7 +1363,7 @@ export const Vote = { fromAmino(object: VoteAmino): Vote { const message = createBaseVote(); if (object.type !== undefined && object.type !== null) { - message.type = signedMsgTypeFromJSON(object.type); + message.type = object.type; } if (object.height !== undefined && object.height !== null) { message.height = BigInt(object.height); @@ -1390,13 +1390,13 @@ export const Vote = { }, toAmino(message: Vote): VoteAmino { const obj: any = {}; - obj.type = message.type; - obj.height = message.height ? message.height.toString() : undefined; - obj.round = message.round; + obj.type = message.type === 0 ? undefined : message.type; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.validator_address = message.validatorAddress ? base64FromBytes(message.validatorAddress) : undefined; - obj.validator_index = message.validatorIndex; + obj.validator_index = message.validatorIndex === 0 ? undefined : message.validatorIndex; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; return obj; }, @@ -1535,13 +1535,13 @@ export const Commit = { }, toAmino(message: Commit): CommitAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.round = message.round; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : 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 = []; + obj.signatures = message.signatures; } return obj; }, @@ -1655,7 +1655,7 @@ export const CommitSig = { fromAmino(object: CommitSigAmino): CommitSig { const message = createBaseCommitSig(); if (object.block_id_flag !== undefined && object.block_id_flag !== null) { - message.blockIdFlag = blockIDFlagFromJSON(object.block_id_flag); + message.blockIdFlag = object.block_id_flag; } if (object.validator_address !== undefined && object.validator_address !== null) { message.validatorAddress = bytesFromBase64(object.validator_address); @@ -1670,7 +1670,7 @@ export const CommitSig = { }, toAmino(message: CommitSig): CommitSigAmino { const obj: any = {}; - obj.block_id_flag = message.blockIdFlag; + obj.block_id_flag = message.blockIdFlag === 0 ? undefined : message.blockIdFlag; obj.validator_address = message.validatorAddress ? base64FromBytes(message.validatorAddress) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; @@ -1826,7 +1826,7 @@ export const Proposal = { fromAmino(object: ProposalAmino): Proposal { const message = createBaseProposal(); if (object.type !== undefined && object.type !== null) { - message.type = signedMsgTypeFromJSON(object.type); + message.type = object.type; } if (object.height !== undefined && object.height !== null) { message.height = BigInt(object.height); @@ -1850,10 +1850,10 @@ export const Proposal = { }, 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.type = message.type === 0 ? undefined : message.type; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; + obj.pol_round = message.polRound === 0 ? undefined : message.polRound; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; @@ -2199,9 +2199,9 @@ export const BlockMeta = { 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.block_size = message.blockSize !== BigInt(0) ? message.blockSize.toString() : undefined; obj.header = message.header ? Header.toAmino(message.header) : undefined; - obj.num_txs = message.numTxs ? message.numTxs.toString() : undefined; + obj.num_txs = message.numTxs !== BigInt(0) ? message.numTxs.toString() : undefined; return obj; }, fromAminoMsg(object: BlockMetaAminoMsg): BlockMeta { diff --git a/__fixtures__/v-next/outputv2/tendermint/types/validator.ts b/__fixtures__/v-next/outputv2/tendermint/types/validator.ts index e82177c244..1eff394408 100644 --- a/__fixtures__/v-next/outputv2/tendermint/types/validator.ts +++ b/__fixtures__/v-next/outputv2/tendermint/types/validator.ts @@ -178,10 +178,10 @@ export const ValidatorSet = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.proposer = message.proposer ? Validator.toAmino(message.proposer) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorSetAminoMsg): ValidatorSet { @@ -317,8 +317,8 @@ export const Validator = { const obj: any = {}; obj.address = message.address ? base64FromBytes(message.address) : undefined; 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority !== BigInt(0) ? message.proposerPriority.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -421,7 +421,7 @@ export const SimpleValidator = { 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; return obj; }, fromAminoMsg(object: SimpleValidatorAminoMsg): SimpleValidator { diff --git a/__fixtures__/v-next/outputv2/tendermint/version/types.ts b/__fixtures__/v-next/outputv2/tendermint/version/types.ts index e53c91fbb0..78a391def9 100644 --- a/__fixtures__/v-next/outputv2/tendermint/version/types.ts +++ b/__fixtures__/v-next/outputv2/tendermint/version/types.ts @@ -152,8 +152,8 @@ export const App = { }, toAmino(message: App): AppAmino { const obj: any = {}; - obj.protocol = message.protocol ? message.protocol.toString() : undefined; - obj.software = message.software; + obj.protocol = message.protocol !== BigInt(0) ? message.protocol.toString() : undefined; + obj.software = message.software === "" ? undefined : message.software; return obj; }, fromAminoMsg(object: AppAminoMsg): App { @@ -255,8 +255,8 @@ export const Consensus = { }, toAmino(message: Consensus): ConsensusAmino { const obj: any = {}; - obj.block = message.block ? message.block.toString() : undefined; - obj.app = message.app ? message.app.toString() : undefined; + obj.block = message.block !== BigInt(0) ? message.block.toString() : undefined; + obj.app = message.app !== BigInt(0) ? message.app.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusAminoMsg): Consensus { diff --git a/__fixtures__/v-next/outputv3/akash/audit/v1beta1/audit.ts b/__fixtures__/v-next/outputv3/akash/audit/v1beta1/audit.ts index 9ef6a55626..c0c2d46bbf 100644 --- a/__fixtures__/v-next/outputv3/akash/audit/v1beta1/audit.ts +++ b/__fixtures__/v-next/outputv3/akash/audit/v1beta1/audit.ts @@ -14,9 +14,9 @@ export interface ProviderProtoMsg { } /** Provider stores owner auditor and attributes details */ export interface ProviderAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } /** Provider stores owner auditor and attributes details */ export interface ProviderSDKType { @@ -36,9 +36,9 @@ export interface AuditedAttributesProtoMsg { } /** Attributes */ export interface AuditedAttributesAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } /** Attributes */ export interface AuditedAttributesSDKType { @@ -56,7 +56,7 @@ export interface AttributesResponseProtoMsg { } /** AttributesResponse represents details of deployment along with group details */ export interface AttributesResponseAmino { - attributes?: AuditedAttributesAmino[]; + attributes: AuditedAttributesAmino[]; } /** AttributesResponse represents details of deployment along with group details */ export interface AttributesResponseSDKType { @@ -73,8 +73,8 @@ export interface AttributesFiltersProtoMsg { } /** AttributesFilters defines filters used to filter deployments */ export interface AttributesFiltersAmino { - auditors?: string[]; - owners?: string[]; + auditors: string[]; + owners: string[]; } /** AttributesFilters defines filters used to filter deployments */ export interface AttributesFiltersSDKType { @@ -93,9 +93,9 @@ export interface MsgSignProviderAttributesProtoMsg { } /** MsgSignProviderAttributes defines an SDK message for signing a provider attributes */ export interface MsgSignProviderAttributesAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } /** MsgSignProviderAttributes defines an SDK message for signing a provider attributes */ export interface MsgSignProviderAttributesSDKType { @@ -125,9 +125,9 @@ export interface MsgDeleteProviderAttributesProtoMsg { } /** MsgDeleteProviderAttributes defined the Msg/DeleteProviderAttributes */ export interface MsgDeleteProviderAttributesAmino { - owner?: string; - auditor?: string; - keys?: string[]; + owner: string; + auditor: string; + keys: string[]; } /** MsgDeleteProviderAttributes defined the Msg/DeleteProviderAttributes */ export interface MsgDeleteProviderAttributesSDKType { @@ -245,12 +245,12 @@ export const Provider = { }, toAmino(message: Provider, useInterfaces: boolean = true): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -367,12 +367,12 @@ export const AuditedAttributes = { }, toAmino(message: AuditedAttributes, useInterfaces: boolean = true): AuditedAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -462,7 +462,7 @@ export const AttributesResponse = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -573,12 +573,12 @@ export const AttributesFilters = { if (message.auditors) { obj.auditors = message.auditors.map(e => e); } else { - obj.auditors = []; + obj.auditors = message.auditors; } if (message.owners) { obj.owners = message.owners.map(e => e); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, @@ -695,12 +695,12 @@ export const MsgSignProviderAttributes = { }, toAmino(message: MsgSignProviderAttributes, useInterfaces: boolean = true): MsgSignProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -879,12 +879,12 @@ export const MsgDeleteProviderAttributes = { }, toAmino(message: MsgDeleteProviderAttributes, useInterfaces: boolean = true): MsgDeleteProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/audit/v1beta2/audit.ts b/__fixtures__/v-next/outputv3/akash/audit/v1beta2/audit.ts index d2d721c641..b30458d0cd 100644 --- a/__fixtures__/v-next/outputv3/akash/audit/v1beta2/audit.ts +++ b/__fixtures__/v-next/outputv3/akash/audit/v1beta2/audit.ts @@ -14,9 +14,9 @@ export interface ProviderProtoMsg { } /** Provider stores owner auditor and attributes details */ export interface ProviderAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } /** Provider stores owner auditor and attributes details */ export interface ProviderSDKType { @@ -36,9 +36,9 @@ export interface AuditedAttributesProtoMsg { } /** Attributes */ export interface AuditedAttributesAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } /** Attributes */ export interface AuditedAttributesSDKType { @@ -56,7 +56,7 @@ export interface AttributesResponseProtoMsg { } /** AttributesResponse represents details of deployment along with group details */ export interface AttributesResponseAmino { - attributes?: AuditedAttributesAmino[]; + attributes: AuditedAttributesAmino[]; } /** AttributesResponse represents details of deployment along with group details */ export interface AttributesResponseSDKType { @@ -73,8 +73,8 @@ export interface AttributesFiltersProtoMsg { } /** AttributesFilters defines filters used to filter deployments */ export interface AttributesFiltersAmino { - auditors?: string[]; - owners?: string[]; + auditors: string[]; + owners: string[]; } /** AttributesFilters defines filters used to filter deployments */ export interface AttributesFiltersSDKType { @@ -93,9 +93,9 @@ export interface MsgSignProviderAttributesProtoMsg { } /** MsgSignProviderAttributes defines an SDK message for signing a provider attributes */ export interface MsgSignProviderAttributesAmino { - owner?: string; - auditor?: string; - attributes?: AttributeAmino[]; + owner: string; + auditor: string; + attributes: AttributeAmino[]; } /** MsgSignProviderAttributes defines an SDK message for signing a provider attributes */ export interface MsgSignProviderAttributesSDKType { @@ -125,9 +125,9 @@ export interface MsgDeleteProviderAttributesProtoMsg { } /** MsgDeleteProviderAttributes defined the Msg/DeleteProviderAttributes */ export interface MsgDeleteProviderAttributesAmino { - owner?: string; - auditor?: string; - keys?: string[]; + owner: string; + auditor: string; + keys: string[]; } /** MsgDeleteProviderAttributes defined the Msg/DeleteProviderAttributes */ export interface MsgDeleteProviderAttributesSDKType { @@ -245,12 +245,12 @@ export const Provider = { }, toAmino(message: Provider, useInterfaces: boolean = true): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -367,12 +367,12 @@ export const AuditedAttributes = { }, toAmino(message: AuditedAttributes, useInterfaces: boolean = true): AuditedAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -462,7 +462,7 @@ export const AttributesResponse = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -573,12 +573,12 @@ export const AttributesFilters = { if (message.auditors) { obj.auditors = message.auditors.map(e => e); } else { - obj.auditors = []; + obj.auditors = message.auditors; } if (message.owners) { obj.owners = message.owners.map(e => e); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, @@ -695,12 +695,12 @@ export const MsgSignProviderAttributes = { }, toAmino(message: MsgSignProviderAttributes, useInterfaces: boolean = true): MsgSignProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -879,12 +879,12 @@ export const MsgDeleteProviderAttributes = { }, toAmino(message: MsgDeleteProviderAttributes, useInterfaces: boolean = true): MsgDeleteProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/audit/v1beta2/genesis.ts b/__fixtures__/v-next/outputv3/akash/audit/v1beta2/genesis.ts index 508c44c34a..950c0c79ad 100644 --- a/__fixtures__/v-next/outputv3/akash/audit/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv3/akash/audit/v1beta2/genesis.ts @@ -12,7 +12,7 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by audit module */ export interface GenesisStateAmino { - attributes?: AuditedAttributesAmino[]; + attributes: AuditedAttributesAmino[]; } /** GenesisState defines the basic genesis state used by audit module */ export interface GenesisStateSDKType { @@ -91,7 +91,7 @@ export const GenesisState = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/audit/v1beta2/query.ts b/__fixtures__/v-next/outputv3/akash/audit/v1beta2/query.ts index f46649c5d4..a7250297a1 100644 --- a/__fixtures__/v-next/outputv3/akash/audit/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv3/akash/audit/v1beta2/query.ts @@ -204,7 +204,7 @@ export const QueryProvidersResponse = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e, useInterfaces) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -301,8 +301,8 @@ export const QueryProviderRequest = { }, toAmino(message: QueryProviderRequest, useInterfaces: boolean = true): QueryProviderRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; - obj.owner = message.owner; + obj.auditor = message.auditor === "" ? undefined : message.auditor; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromProtoMsg(message: QueryProviderRequestProtoMsg, useInterfaces: boolean = true): QueryProviderRequest { @@ -481,7 +481,7 @@ export const QueryProviderAttributesRequest = { }, toAmino(message: QueryProviderAttributesRequest, useInterfaces: boolean = true): QueryProviderAttributesRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -577,8 +577,8 @@ export const QueryProviderAuditorRequest = { }, toAmino(message: QueryProviderAuditorRequest, useInterfaces: boolean = true): QueryProviderAuditorRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; - obj.owner = message.owner; + obj.auditor = message.auditor === "" ? undefined : message.auditor; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromProtoMsg(message: QueryProviderAuditorRequestProtoMsg, useInterfaces: boolean = true): QueryProviderAuditorRequest { @@ -675,7 +675,7 @@ export const QueryAuditorAttributesRequest = { }, toAmino(message: QueryAuditorAttributesRequest, useInterfaces: boolean = true): QueryAuditorAttributesRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; + obj.auditor = message.auditor === "" ? undefined : message.auditor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/base/v1beta1/attribute.ts b/__fixtures__/v-next/outputv3/akash/base/v1beta1/attribute.ts index 532df98b01..5537d842c7 100644 --- a/__fixtures__/v-next/outputv3/akash/base/v1beta1/attribute.ts +++ b/__fixtures__/v-next/outputv3/akash/base/v1beta1/attribute.ts @@ -44,9 +44,9 @@ export interface SignedByProtoMsg { */ export interface SignedByAmino { /** all_of all keys in this list must have signed attributes */ - all_of?: string[]; + all_of: string[]; /** any_of at least of of the keys from the list must have signed attributes */ - any_of?: string[]; + any_of: string[]; } /** * SignedBy represents validation accounts that tenant expects signatures for provider attributes @@ -72,9 +72,9 @@ export interface PlacementRequirementsProtoMsg { /** PlacementRequirements */ export interface PlacementRequirementsAmino { /** SignedBy list of keys that tenants expect to have signatures from */ - signed_by?: SignedByAmino; + signed_by: SignedByAmino; /** Attribute list of attributes tenant expects from the provider */ - attributes?: AttributeAmino[]; + attributes: AttributeAmino[]; } /** PlacementRequirements */ export interface PlacementRequirementsSDKType { @@ -160,8 +160,8 @@ export const Attribute = { }, toAmino(message: Attribute, useInterfaces: boolean = true): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: AttributeProtoMsg, useInterfaces: boolean = true): Attribute { @@ -271,12 +271,12 @@ export const SignedBy = { if (message.allOf) { obj.all_of = message.allOf.map(e => e); } else { - obj.all_of = []; + obj.all_of = message.allOf; } if (message.anyOf) { obj.any_of = message.anyOf.map(e => e); } else { - obj.any_of = []; + obj.any_of = message.anyOf; } return obj; }, @@ -380,11 +380,11 @@ export const PlacementRequirements = { }, toAmino(message: PlacementRequirements, useInterfaces: boolean = true): PlacementRequirementsAmino { const obj: any = {}; - obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy, useInterfaces) : undefined; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy, useInterfaces) : SignedBy.toAmino(SignedBy.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/base/v1beta1/endpoint.ts b/__fixtures__/v-next/outputv3/akash/base/v1beta1/endpoint.ts index e2ee2e7c75..2401795f8e 100644 --- a/__fixtures__/v-next/outputv3/akash/base/v1beta1/endpoint.ts +++ b/__fixtures__/v-next/outputv3/akash/base/v1beta1/endpoint.ts @@ -110,13 +110,13 @@ export const Endpoint = { fromAmino(object: EndpointAmino): Endpoint { const message = createBaseEndpoint(); if (object.kind !== undefined && object.kind !== null) { - message.kind = endpoint_KindFromJSON(object.kind); + message.kind = object.kind; } return message; }, toAmino(message: Endpoint, useInterfaces: boolean = true): EndpointAmino { const obj: any = {}; - obj.kind = message.kind; + obj.kind = message.kind === 0 ? undefined : message.kind; return obj; }, fromProtoMsg(message: EndpointProtoMsg, useInterfaces: boolean = true): Endpoint { diff --git a/__fixtures__/v-next/outputv3/akash/base/v1beta1/resource.ts b/__fixtures__/v-next/outputv3/akash/base/v1beta1/resource.ts index 6a8e7d1858..235a55203c 100644 --- a/__fixtures__/v-next/outputv3/akash/base/v1beta1/resource.ts +++ b/__fixtures__/v-next/outputv3/akash/base/v1beta1/resource.ts @@ -34,7 +34,7 @@ export interface MemoryProtoMsg { } /** Memory stores resource quantity and memory attributes */ export interface MemoryAmino { - quantity?: ResourceValueAmino; + quantity: ResourceValueAmino; attributes?: AttributeAmino[]; } /** Memory stores resource quantity and memory attributes */ @@ -53,7 +53,7 @@ export interface StorageProtoMsg { } /** Storage stores resource quantity and storage attributes */ export interface StorageAmino { - quantity?: ResourceValueAmino; + quantity: ResourceValueAmino; attributes?: AttributeAmino[]; } /** Storage stores resource quantity and storage attributes */ @@ -83,7 +83,7 @@ export interface ResourceUnitsAmino { cpu?: CPUAmino; memory?: MemoryAmino; storage?: StorageAmino; - endpoints?: EndpointAmino[]; + endpoints: EndpointAmino[]; } /** * ResourceUnits describes all available resources types for deployment/node etc @@ -186,7 +186,7 @@ export const CPU = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -290,11 +290,11 @@ export const Memory = { }, toAmino(message: Memory, useInterfaces: boolean = true): MemoryAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity, useInterfaces) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity, useInterfaces) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -398,11 +398,11 @@ export const Storage = { }, toAmino(message: Storage, useInterfaces: boolean = true): StorageAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity, useInterfaces) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity, useInterfaces) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -546,7 +546,7 @@ export const ResourceUnits = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e, useInterfaces) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/base/v1beta2/attribute.ts b/__fixtures__/v-next/outputv3/akash/base/v1beta2/attribute.ts index 116f472cba..3b7aee5492 100644 --- a/__fixtures__/v-next/outputv3/akash/base/v1beta2/attribute.ts +++ b/__fixtures__/v-next/outputv3/akash/base/v1beta2/attribute.ts @@ -44,9 +44,9 @@ export interface SignedByProtoMsg { */ export interface SignedByAmino { /** all_of all keys in this list must have signed attributes */ - all_of?: string[]; + all_of: string[]; /** any_of at least of of the keys from the list must have signed attributes */ - any_of?: string[]; + any_of: string[]; } /** * SignedBy represents validation accounts that tenant expects signatures for provider attributes @@ -72,9 +72,9 @@ export interface PlacementRequirementsProtoMsg { /** PlacementRequirements */ export interface PlacementRequirementsAmino { /** SignedBy list of keys that tenants expect to have signatures from */ - signed_by?: SignedByAmino; + signed_by: SignedByAmino; /** Attribute list of attributes tenant expects from the provider */ - attributes?: AttributeAmino[]; + attributes: AttributeAmino[]; } /** PlacementRequirements */ export interface PlacementRequirementsSDKType { @@ -160,8 +160,8 @@ export const Attribute = { }, toAmino(message: Attribute, useInterfaces: boolean = true): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: AttributeProtoMsg, useInterfaces: boolean = true): Attribute { @@ -271,12 +271,12 @@ export const SignedBy = { if (message.allOf) { obj.all_of = message.allOf.map(e => e); } else { - obj.all_of = []; + obj.all_of = message.allOf; } if (message.anyOf) { obj.any_of = message.anyOf.map(e => e); } else { - obj.any_of = []; + obj.any_of = message.anyOf; } return obj; }, @@ -380,11 +380,11 @@ export const PlacementRequirements = { }, toAmino(message: PlacementRequirements, useInterfaces: boolean = true): PlacementRequirementsAmino { const obj: any = {}; - obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy, useInterfaces) : undefined; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy, useInterfaces) : SignedBy.toAmino(SignedBy.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/base/v1beta2/endpoint.ts b/__fixtures__/v-next/outputv3/akash/base/v1beta2/endpoint.ts index b860a0ac8c..930e284e78 100644 --- a/__fixtures__/v-next/outputv3/akash/base/v1beta2/endpoint.ts +++ b/__fixtures__/v-next/outputv3/akash/base/v1beta2/endpoint.ts @@ -55,7 +55,7 @@ export interface EndpointProtoMsg { /** Endpoint describes a publicly accessible IP service */ export interface EndpointAmino { kind?: Endpoint_Kind; - sequence_number?: number; + sequence_number: number; } /** Endpoint describes a publicly accessible IP service */ export interface EndpointSDKType { @@ -132,7 +132,7 @@ export const Endpoint = { fromAmino(object: EndpointAmino): Endpoint { const message = createBaseEndpoint(); if (object.kind !== undefined && object.kind !== null) { - message.kind = endpoint_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.sequence_number !== undefined && object.sequence_number !== null) { message.sequenceNumber = object.sequence_number; @@ -141,8 +141,8 @@ export const Endpoint = { }, toAmino(message: Endpoint, useInterfaces: boolean = true): EndpointAmino { const obj: any = {}; - obj.kind = message.kind; - obj.sequence_number = message.sequenceNumber; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.sequence_number = message.sequenceNumber ?? 0; return obj; }, fromProtoMsg(message: EndpointProtoMsg, useInterfaces: boolean = true): Endpoint { diff --git a/__fixtures__/v-next/outputv3/akash/base/v1beta2/resource.ts b/__fixtures__/v-next/outputv3/akash/base/v1beta2/resource.ts index 79c46ad50c..030dec4011 100644 --- a/__fixtures__/v-next/outputv3/akash/base/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputv3/akash/base/v1beta2/resource.ts @@ -33,7 +33,7 @@ export interface MemoryProtoMsg { } /** Memory stores resource quantity and memory attributes */ export interface MemoryAmino { - quantity?: ResourceValueAmino; + quantity: ResourceValueAmino; attributes?: AttributeAmino[]; } /** Memory stores resource quantity and memory attributes */ @@ -53,8 +53,8 @@ export interface StorageProtoMsg { } /** Storage stores resource quantity and storage attributes */ export interface StorageAmino { - name?: string; - quantity?: ResourceValueAmino; + name: string; + quantity: ResourceValueAmino; attributes?: AttributeAmino[]; } /** Storage stores resource quantity and storage attributes */ @@ -154,7 +154,7 @@ export const CPU = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -258,11 +258,11 @@ export const Memory = { }, toAmino(message: Memory, useInterfaces: boolean = true): MemoryAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity, useInterfaces) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity, useInterfaces) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -381,12 +381,12 @@ export const Storage = { }, toAmino(message: Storage, useInterfaces: boolean = true): StorageAmino { const obj: any = {}; - obj.name = message.name; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity, useInterfaces) : undefined; + obj.name = message.name ?? ""; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity, useInterfaces) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/base/v1beta2/resourceunits.ts b/__fixtures__/v-next/outputv3/akash/base/v1beta2/resourceunits.ts index 0e0f7a2b34..d768e7cf03 100644 --- a/__fixtures__/v-next/outputv3/akash/base/v1beta2/resourceunits.ts +++ b/__fixtures__/v-next/outputv3/akash/base/v1beta2/resourceunits.ts @@ -25,7 +25,7 @@ export interface ResourceUnitsAmino { cpu?: CPUAmino; memory?: MemoryAmino; storage?: StorageAmino[]; - endpoints?: EndpointAmino[]; + endpoints: EndpointAmino[]; } /** * ResourceUnits describes all available resources types for deployment/node etc @@ -167,12 +167,12 @@ export const ResourceUnits = { if (message.storage) { obj.storage = message.storage.map(e => e ? Storage.toAmino(e, useInterfaces) : undefined); } else { - obj.storage = []; + obj.storage = message.storage; } if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e, useInterfaces) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/cert/v1beta2/cert.ts b/__fixtures__/v-next/outputv3/akash/cert/v1beta2/cert.ts index df3e5c6ab6..411ef164e9 100644 --- a/__fixtures__/v-next/outputv3/akash/cert/v1beta2/cert.ts +++ b/__fixtures__/v-next/outputv3/akash/cert/v1beta2/cert.ts @@ -54,8 +54,8 @@ export interface CertificateIDProtoMsg { } /** CertificateID stores owner and sequence number */ export interface CertificateIDAmino { - owner?: string; - serial?: string; + owner: string; + serial: string; } /** CertificateID stores owner and sequence number */ export interface CertificateIDSDKType { @@ -74,9 +74,9 @@ export interface CertificateProtoMsg { } /** Certificate stores state, certificate and it's public key */ export interface CertificateAmino { - state?: Certificate_State; - cert?: string; - pubkey?: string; + state: Certificate_State; + cert: string; + pubkey: string; } /** Certificate stores state, certificate and it's public key */ export interface CertificateSDKType { @@ -96,9 +96,9 @@ export interface CertificateFilterProtoMsg { } /** CertificateFilter defines filters used to filter certificates */ export interface CertificateFilterAmino { - owner?: string; - serial?: string; - state?: string; + owner: string; + serial: string; + state: string; } /** CertificateFilter defines filters used to filter certificates */ export interface CertificateFilterSDKType { @@ -118,9 +118,9 @@ export interface MsgCreateCertificateProtoMsg { } /** MsgCreateCertificate defines an SDK message for creating certificate */ export interface MsgCreateCertificateAmino { - owner?: string; - cert?: string; - pubkey?: string; + owner: string; + cert: string; + pubkey: string; } /** MsgCreateCertificate defines an SDK message for creating certificate */ export interface MsgCreateCertificateSDKType { @@ -148,7 +148,7 @@ export interface MsgRevokeCertificateProtoMsg { } /** MsgRevokeCertificate defines an SDK message for revoking certificate */ export interface MsgRevokeCertificateAmino { - id?: CertificateIDAmino; + id: CertificateIDAmino; } /** MsgRevokeCertificate defines an SDK message for revoking certificate */ export interface MsgRevokeCertificateSDKType { @@ -243,8 +243,8 @@ export const CertificateID = { }, toAmino(message: CertificateID, useInterfaces: boolean = true): CertificateIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.serial = message.serial; + obj.owner = message.owner ?? ""; + obj.serial = message.serial ?? ""; return obj; }, fromProtoMsg(message: CertificateIDProtoMsg, useInterfaces: boolean = true): CertificateID { @@ -342,7 +342,7 @@ export const Certificate = { fromAmino(object: CertificateAmino): Certificate { const message = createBaseCertificate(); if (object.state !== undefined && object.state !== null) { - message.state = certificate_StateFromJSON(object.state); + message.state = object.state; } if (object.cert !== undefined && object.cert !== null) { message.cert = bytesFromBase64(object.cert); @@ -354,9 +354,9 @@ export const Certificate = { }, toAmino(message: Certificate, useInterfaces: boolean = true): CertificateAmino { const obj: any = {}; - obj.state = message.state; - obj.cert = message.cert ? base64FromBytes(message.cert) : undefined; - obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : undefined; + obj.state = message.state ?? 0; + obj.cert = message.cert ? base64FromBytes(message.cert) : ""; + obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : ""; return obj; }, fromProtoMsg(message: CertificateProtoMsg, useInterfaces: boolean = true): Certificate { @@ -466,9 +466,9 @@ export const CertificateFilter = { }, toAmino(message: CertificateFilter, useInterfaces: boolean = true): CertificateFilterAmino { const obj: any = {}; - obj.owner = message.owner; - obj.serial = message.serial; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.serial = message.serial ?? ""; + obj.state = message.state ?? ""; return obj; }, fromProtoMsg(message: CertificateFilterProtoMsg, useInterfaces: boolean = true): CertificateFilter { @@ -578,9 +578,9 @@ export const MsgCreateCertificate = { }, toAmino(message: MsgCreateCertificate, useInterfaces: boolean = true): MsgCreateCertificateAmino { const obj: any = {}; - obj.owner = message.owner; - obj.cert = message.cert ? base64FromBytes(message.cert) : undefined; - obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : undefined; + obj.owner = message.owner ?? ""; + obj.cert = message.cert ? base64FromBytes(message.cert) : ""; + obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : ""; return obj; }, fromProtoMsg(message: MsgCreateCertificateProtoMsg, useInterfaces: boolean = true): MsgCreateCertificate { @@ -724,7 +724,7 @@ export const MsgRevokeCertificate = { }, toAmino(message: MsgRevokeCertificate, useInterfaces: boolean = true): MsgRevokeCertificateAmino { const obj: any = {}; - obj.id = message.id ? CertificateID.toAmino(message.id, useInterfaces) : undefined; + obj.id = message.id ? CertificateID.toAmino(message.id, useInterfaces) : CertificateID.toAmino(CertificateID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgRevokeCertificateProtoMsg, useInterfaces: boolean = true): MsgRevokeCertificate { diff --git a/__fixtures__/v-next/outputv3/akash/cert/v1beta2/genesis.ts b/__fixtures__/v-next/outputv3/akash/cert/v1beta2/genesis.ts index 36069c0ea5..5d6688b24e 100644 --- a/__fixtures__/v-next/outputv3/akash/cert/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv3/akash/cert/v1beta2/genesis.ts @@ -13,8 +13,8 @@ export interface GenesisCertificateProtoMsg { } /** GenesisCertificate defines certificate entry at genesis */ export interface GenesisCertificateAmino { - owner?: string; - certificate?: CertificateAmino; + owner: string; + certificate: CertificateAmino; } /** GenesisCertificate defines certificate entry at genesis */ export interface GenesisCertificateSDKType { @@ -31,7 +31,7 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by cert module */ export interface GenesisStateAmino { - certificates?: GenesisCertificateAmino[]; + certificates: GenesisCertificateAmino[]; } /** GenesisState defines the basic genesis state used by cert module */ export interface GenesisStateSDKType { @@ -118,8 +118,8 @@ export const GenesisCertificate = { }, toAmino(message: GenesisCertificate, useInterfaces: boolean = true): GenesisCertificateAmino { const obj: any = {}; - obj.owner = message.owner; - obj.certificate = message.certificate ? Certificate.toAmino(message.certificate, useInterfaces) : undefined; + obj.owner = message.owner ?? ""; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate, useInterfaces) : Certificate.toAmino(Certificate.fromPartial({})); return obj; }, fromProtoMsg(message: GenesisCertificateProtoMsg, useInterfaces: boolean = true): GenesisCertificate { @@ -208,7 +208,7 @@ export const GenesisState = { if (message.certificates) { obj.certificates = message.certificates.map(e => e ? GenesisCertificate.toAmino(e, useInterfaces) : undefined); } else { - obj.certificates = []; + obj.certificates = message.certificates; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/cert/v1beta2/query.ts b/__fixtures__/v-next/outputv3/akash/cert/v1beta2/query.ts index b05f2cdca2..ce2484d1e6 100644 --- a/__fixtures__/v-next/outputv3/akash/cert/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv3/akash/cert/v1beta2/query.ts @@ -14,8 +14,8 @@ export interface CertificateResponseProtoMsg { } /** CertificateResponse contains a single X509 certificate and its serial number */ export interface CertificateResponseAmino { - certificate?: CertificateAmino; - serial?: string; + certificate: CertificateAmino; + serial: string; } /** CertificateResponse contains a single X509 certificate and its serial number */ export interface CertificateResponseSDKType { @@ -141,8 +141,8 @@ export const CertificateResponse = { }, toAmino(message: CertificateResponse, useInterfaces: boolean = true): CertificateResponseAmino { const obj: any = {}; - obj.certificate = message.certificate ? Certificate.toAmino(message.certificate, useInterfaces) : undefined; - obj.serial = message.serial; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate, useInterfaces) : Certificate.toAmino(Certificate.fromPartial({})); + obj.serial = message.serial ?? ""; return obj; }, fromProtoMsg(message: CertificateResponseProtoMsg, useInterfaces: boolean = true): CertificateResponse { @@ -348,7 +348,7 @@ export const QueryCertificatesResponse = { if (message.certificates) { obj.certificates = message.certificates.map(e => e ? CertificateResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.certificates = []; + obj.certificates = message.certificates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/authz.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/authz.ts index fc66bc9603..6af87ba9c7 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/authz.ts @@ -27,7 +27,7 @@ export interface DepositDeploymentAuthorizationAmino { * SpendLimit is the amount the grantee is authorized to spend from the granter's account for * the purpose of deployment. */ - spend_limit?: CoinAmino; + spend_limit: CoinAmino; } /** * DepositDeploymentAuthorization allows the grantee to deposit up to spend_limit coins from @@ -104,7 +104,7 @@ export const DepositDeploymentAuthorization = { }, toAmino(message: DepositDeploymentAuthorization, useInterfaces: boolean = true): DepositDeploymentAuthorizationAmino { const obj: any = {}; - obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit, useInterfaces) : undefined; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromProtoMsg(message: DepositDeploymentAuthorizationProtoMsg, useInterfaces: boolean = true): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/deployment.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/deployment.ts index aec8a89743..a5d6ca3247 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/deployment.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/deployment.ts @@ -60,10 +60,10 @@ export interface MsgCreateDeploymentProtoMsg { } /** MsgCreateDeployment defines an SDK message for creating deployment */ export interface MsgCreateDeploymentAmino { - id?: DeploymentIDAmino; - groups?: GroupSpecAmino[]; - version?: string; - deposit?: CoinAmino; + id: DeploymentIDAmino; + groups: GroupSpecAmino[]; + version: string; + deposit: CoinAmino; } /** MsgCreateDeployment defines an SDK message for creating deployment */ export interface MsgCreateDeploymentSDKType { @@ -93,8 +93,8 @@ export interface MsgDepositDeploymentProtoMsg { } /** MsgDepositDeployment deposits more funds into the deposit account */ export interface MsgDepositDeploymentAmino { - id?: DeploymentIDAmino; - amount?: CoinAmino; + id: DeploymentIDAmino; + amount: CoinAmino; } /** MsgDepositDeployment deposits more funds into the deposit account */ export interface MsgDepositDeploymentSDKType { @@ -123,9 +123,9 @@ export interface MsgUpdateDeploymentProtoMsg { } /** MsgUpdateDeployment defines an SDK message for updating deployment */ export interface MsgUpdateDeploymentAmino { - id?: DeploymentIDAmino; - groups?: GroupSpecAmino[]; - version?: string; + id: DeploymentIDAmino; + groups: GroupSpecAmino[]; + version: string; } /** MsgUpdateDeployment defines an SDK message for updating deployment */ export interface MsgUpdateDeploymentSDKType { @@ -153,7 +153,7 @@ export interface MsgCloseDeploymentProtoMsg { } /** MsgCloseDeployment defines an SDK message for closing deployment */ export interface MsgCloseDeploymentAmino { - id?: DeploymentIDAmino; + id: DeploymentIDAmino; } /** MsgCloseDeployment defines an SDK message for closing deployment */ export interface MsgCloseDeploymentSDKType { @@ -180,8 +180,8 @@ export interface DeploymentIDProtoMsg { } /** DeploymentID stores owner and sequence number */ export interface DeploymentIDAmino { - owner?: string; - dseq?: string; + owner: string; + dseq: string; } /** DeploymentID stores owner and sequence number */ export interface DeploymentIDSDKType { @@ -201,9 +201,9 @@ export interface DeploymentProtoMsg { } /** Deployment stores deploymentID, state and version details */ export interface DeploymentAmino { - deployment_id?: DeploymentIDAmino; - state?: Deployment_State; - version?: string; + deployment_id: DeploymentIDAmino; + state: Deployment_State; + version: string; created_at?: string; } /** Deployment stores deploymentID, state and version details */ @@ -225,9 +225,9 @@ export interface DeploymentFiltersProtoMsg { } /** DeploymentFilters defines filters used to filter deployments */ export interface DeploymentFiltersAmino { - owner?: string; - dseq?: string; - state?: string; + owner: string; + dseq: string; + state: string; } /** DeploymentFilters defines filters used to filter deployments */ export interface DeploymentFiltersSDKType { @@ -354,14 +354,14 @@ export const MsgCreateDeployment = { }, toAmino(message: MsgCreateDeployment, useInterfaces: boolean = true): MsgCreateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e, useInterfaces) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.deposit = message.deposit ? Coin.toAmino(message.deposit, useInterfaces) : undefined; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromProtoMsg(message: MsgCreateDeploymentProtoMsg, useInterfaces: boolean = true): MsgCreateDeployment { @@ -522,8 +522,8 @@ export const MsgDepositDeployment = { }, toAmino(message: MsgDepositDeployment, useInterfaces: boolean = true): MsgDepositDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : undefined; - obj.amount = message.amount ? Coin.toAmino(message.amount, useInterfaces) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.amount = message.amount ? Coin.toAmino(message.amount, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromProtoMsg(message: MsgDepositDeploymentProtoMsg, useInterfaces: boolean = true): MsgDepositDeployment { @@ -703,13 +703,13 @@ export const MsgUpdateDeployment = { }, toAmino(message: MsgUpdateDeployment, useInterfaces: boolean = true): MsgUpdateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e, useInterfaces) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; + obj.version = message.version ? base64FromBytes(message.version) : ""; return obj; }, fromProtoMsg(message: MsgUpdateDeploymentProtoMsg, useInterfaces: boolean = true): MsgUpdateDeployment { @@ -853,7 +853,7 @@ export const MsgCloseDeployment = { }, toAmino(message: MsgCloseDeployment, useInterfaces: boolean = true): MsgCloseDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : DeploymentID.toAmino(DeploymentID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgCloseDeploymentProtoMsg, useInterfaces: boolean = true): MsgCloseDeployment { @@ -1012,8 +1012,8 @@ export const DeploymentID = { }, toAmino(message: DeploymentID, useInterfaces: boolean = true): DeploymentIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; return obj; }, fromProtoMsg(message: DeploymentIDProtoMsg, useInterfaces: boolean = true): DeploymentID { @@ -1130,7 +1130,7 @@ export const Deployment = { message.deploymentId = DeploymentID.fromAmino(object.deployment_id); } if (object.state !== undefined && object.state !== null) { - message.state = deployment_StateFromJSON(object.state); + message.state = object.state; } if (object.version !== undefined && object.version !== null) { message.version = bytesFromBase64(object.version); @@ -1142,10 +1142,10 @@ export const Deployment = { }, toAmino(message: Deployment, useInterfaces: boolean = true): DeploymentAmino { const obj: any = {}; - obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId, useInterfaces) : undefined; - obj.state = message.state; - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId, useInterfaces) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.state = message.state ?? 0; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromProtoMsg(message: DeploymentProtoMsg, useInterfaces: boolean = true): Deployment { @@ -1257,9 +1257,9 @@ export const DeploymentFilters = { }, toAmino(message: DeploymentFilters, useInterfaces: boolean = true): DeploymentFiltersAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.state = message.state ?? ""; return obj; }, fromProtoMsg(message: DeploymentFiltersProtoMsg, useInterfaces: boolean = true): DeploymentFilters { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/genesis.ts index 17423e6cac..015f96f71d 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/genesis.ts @@ -15,8 +15,8 @@ export interface GenesisDeploymentProtoMsg { } /** GenesisDeployment defines the basic genesis state used by deployment module */ export interface GenesisDeploymentAmino { - deployment?: DeploymentAmino; - groups?: GroupAmino[]; + deployment: DeploymentAmino; + groups: GroupAmino[]; } /** GenesisDeployment defines the basic genesis state used by deployment module */ export interface GenesisDeploymentSDKType { @@ -34,8 +34,8 @@ export interface GenesisStateProtoMsg { } /** GenesisState stores slice of genesis deployment instance */ export interface GenesisStateAmino { - deployments?: GenesisDeploymentAmino[]; - params?: ParamsAmino; + deployments: GenesisDeploymentAmino[]; + params: ParamsAmino; } /** GenesisState stores slice of genesis deployment instance */ export interface GenesisStateSDKType { @@ -129,11 +129,11 @@ export const GenesisDeployment = { }, toAmino(message: GenesisDeployment, useInterfaces: boolean = true): GenesisDeploymentAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment, useInterfaces) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment, useInterfaces) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e, useInterfaces) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } return obj; }, @@ -240,9 +240,9 @@ export const GenesisState = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e, useInterfaces) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } - obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : undefined; + obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : Params.toAmino(Params.fromPartial({})); return obj; }, fromProtoMsg(message: GenesisStateProtoMsg, useInterfaces: boolean = true): GenesisState { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/group.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/group.ts index 188c4c2a34..82da35b049 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/group.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/group.ts @@ -70,7 +70,7 @@ export interface MsgCloseGroupProtoMsg { } /** MsgCloseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgCloseGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } /** MsgCloseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgCloseGroupSDKType { @@ -96,7 +96,7 @@ export interface MsgPauseGroupProtoMsg { } /** MsgPauseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgPauseGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } /** MsgPauseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgPauseGroupSDKType { @@ -122,7 +122,7 @@ export interface MsgStartGroupProtoMsg { } /** MsgStartGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgStartGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } /** MsgStartGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgStartGroupSDKType { @@ -150,9 +150,9 @@ export interface GroupIDProtoMsg { } /** GroupID stores owner, deployment sequence number and group sequence number */ export interface GroupIDAmino { - owner?: string; - dseq?: string; - gseq?: number; + owner: string; + dseq: string; + gseq: number; } /** GroupID stores owner, deployment sequence number and group sequence number */ export interface GroupIDSDKType { @@ -172,9 +172,9 @@ export interface GroupSpecProtoMsg { } /** GroupSpec stores group specifications */ export interface GroupSpecAmino { - name?: string; - requirements?: PlacementRequirementsAmino; - resources?: ResourceAmino[]; + name: string; + requirements: PlacementRequirementsAmino; + resources: ResourceAmino[]; } /** GroupSpec stores group specifications */ export interface GroupSpecSDKType { @@ -195,9 +195,9 @@ export interface GroupProtoMsg { } /** Group stores group id, state and specifications of group */ export interface GroupAmino { - group_id?: GroupIDAmino; - state?: Group_State; - group_spec?: GroupSpecAmino; + group_id: GroupIDAmino; + state: Group_State; + group_spec: GroupSpecAmino; created_at?: string; } /** Group stores group id, state and specifications of group */ @@ -219,9 +219,9 @@ export interface ResourceProtoMsg { } /** Resource stores unit, total count and price of resource */ export interface ResourceAmino { - resources?: ResourceUnitsAmino; - count?: number; - price?: CoinAmino; + resources: ResourceUnitsAmino; + count: number; + price: CoinAmino; } /** Resource stores unit, total count and price of resource */ export interface ResourceSDKType { @@ -295,7 +295,7 @@ export const MsgCloseGroup = { }, toAmino(message: MsgCloseGroup, useInterfaces: boolean = true): MsgCloseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id, useInterfaces) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id, useInterfaces) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgCloseGroupProtoMsg, useInterfaces: boolean = true): MsgCloseGroup { @@ -439,7 +439,7 @@ export const MsgPauseGroup = { }, toAmino(message: MsgPauseGroup, useInterfaces: boolean = true): MsgPauseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id, useInterfaces) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id, useInterfaces) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgPauseGroupProtoMsg, useInterfaces: boolean = true): MsgPauseGroup { @@ -583,7 +583,7 @@ export const MsgStartGroup = { }, toAmino(message: MsgStartGroup, useInterfaces: boolean = true): MsgStartGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id, useInterfaces) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id, useInterfaces) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgStartGroupProtoMsg, useInterfaces: boolean = true): MsgStartGroup { @@ -757,9 +757,9 @@ export const GroupID = { }, toAmino(message: GroupID, useInterfaces: boolean = true): GroupIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.gseq = message.gseq; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; return obj; }, fromProtoMsg(message: GroupIDProtoMsg, useInterfaces: boolean = true): GroupID { @@ -877,12 +877,12 @@ export const GroupSpec = { }, toAmino(message: GroupSpec, useInterfaces: boolean = true): GroupSpecAmino { const obj: any = {}; - obj.name = message.name; - obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements, useInterfaces) : undefined; + obj.name = message.name ?? ""; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements, useInterfaces) : PlacementRequirements.toAmino(PlacementRequirements.fromPartial({})); if (message.resources) { obj.resources = message.resources.map(e => e ? Resource.toAmino(e, useInterfaces) : undefined); } else { - obj.resources = []; + obj.resources = message.resources; } return obj; }, @@ -1002,7 +1002,7 @@ export const Group = { message.groupId = GroupID.fromAmino(object.group_id); } if (object.state !== undefined && object.state !== null) { - message.state = group_StateFromJSON(object.state); + message.state = object.state; } if (object.group_spec !== undefined && object.group_spec !== null) { message.groupSpec = GroupSpec.fromAmino(object.group_spec); @@ -1014,10 +1014,10 @@ export const Group = { }, toAmino(message: Group, useInterfaces: boolean = true): GroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? GroupID.toAmino(message.groupId, useInterfaces) : undefined; - obj.state = message.state; - obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec, useInterfaces) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId, useInterfaces) : GroupID.toAmino(GroupID.fromPartial({})); + obj.state = message.state ?? 0; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec, useInterfaces) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromProtoMsg(message: GroupProtoMsg, useInterfaces: boolean = true): Group { @@ -1131,9 +1131,9 @@ export const Resource = { }, toAmino(message: Resource, useInterfaces: boolean = true): ResourceAmino { const obj: any = {}; - obj.resources = message.resources ? ResourceUnits.toAmino(message.resources, useInterfaces) : undefined; - obj.count = message.count; - obj.price = message.price ? Coin.toAmino(message.price, useInterfaces) : undefined; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources, useInterfaces) : ResourceUnits.toAmino(ResourceUnits.fromPartial({})); + obj.count = message.count ?? 0; + obj.price = message.price ? Coin.toAmino(message.price, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromProtoMsg(message: ResourceProtoMsg, useInterfaces: boolean = true): Resource { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/params.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/params.ts index 881d3929f4..9b7285e7f8 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/params.ts @@ -12,7 +12,7 @@ export interface ParamsProtoMsg { } /** Params defines the parameters for the x/deployment package */ export interface ParamsAmino { - deployment_min_deposit?: CoinAmino; + deployment_min_deposit: CoinAmino; } /** Params defines the parameters for the x/deployment package */ export interface ParamsSDKType { @@ -84,7 +84,7 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit, useInterfaces) : undefined; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/query.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/query.ts index c207bc0dfb..7319ad88ec 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/query.ts @@ -71,8 +71,8 @@ export interface QueryDeploymentResponseProtoMsg { } /** QueryDeploymentResponse is response type for the Query/Deployment RPC method */ export interface QueryDeploymentResponseAmino { - deployment?: DeploymentAmino; - groups?: GroupAmino[]; + deployment: DeploymentAmino; + groups: GroupAmino[]; escrow_account?: AccountAmino; } /** QueryDeploymentResponse is response type for the Query/Deployment RPC method */ @@ -303,7 +303,7 @@ export const QueryDeploymentsResponse = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -507,11 +507,11 @@ export const QueryDeploymentResponse = { }, toAmino(message: QueryDeploymentResponse, useInterfaces: boolean = true): QueryDeploymentResponseAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment, useInterfaces) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment, useInterfaces) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e, useInterfaces) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/authz.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/authz.ts index 3964ff2a7a..29c6135bb0 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/authz.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/authz.ts @@ -27,7 +27,7 @@ export interface DepositDeploymentAuthorizationAmino { * SpendLimit is the amount the grantee is authorized to spend from the granter's account for * the purpose of deployment. */ - spend_limit?: CoinAmino; + spend_limit: CoinAmino; } /** * DepositDeploymentAuthorization allows the grantee to deposit up to spend_limit coins from @@ -104,7 +104,7 @@ export const DepositDeploymentAuthorization = { }, toAmino(message: DepositDeploymentAuthorization, useInterfaces: boolean = true): DepositDeploymentAuthorizationAmino { const obj: any = {}; - obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit, useInterfaces) : undefined; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromProtoMsg(message: DepositDeploymentAuthorizationProtoMsg, useInterfaces: boolean = true): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/deployment.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/deployment.ts index fc01402e36..41ea1f79cc 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/deployment.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/deployment.ts @@ -54,8 +54,8 @@ export interface DeploymentIDProtoMsg { } /** DeploymentID stores owner and sequence number */ export interface DeploymentIDAmino { - owner?: string; - dseq?: string; + owner: string; + dseq: string; } /** DeploymentID stores owner and sequence number */ export interface DeploymentIDSDKType { @@ -75,9 +75,9 @@ export interface DeploymentProtoMsg { } /** Deployment stores deploymentID, state and version details */ export interface DeploymentAmino { - deployment_id?: DeploymentIDAmino; - state?: Deployment_State; - version?: string; + deployment_id: DeploymentIDAmino; + state: Deployment_State; + version: string; created_at?: string; } /** Deployment stores deploymentID, state and version details */ @@ -99,9 +99,9 @@ export interface DeploymentFiltersProtoMsg { } /** DeploymentFilters defines filters used to filter deployments */ export interface DeploymentFiltersAmino { - owner?: string; - dseq?: string; - state?: string; + owner: string; + dseq: string; + state: string; } /** DeploymentFilters defines filters used to filter deployments */ export interface DeploymentFiltersSDKType { @@ -190,8 +190,8 @@ export const DeploymentID = { }, toAmino(message: DeploymentID, useInterfaces: boolean = true): DeploymentIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; return obj; }, fromProtoMsg(message: DeploymentIDProtoMsg, useInterfaces: boolean = true): DeploymentID { @@ -308,7 +308,7 @@ export const Deployment = { message.deploymentId = DeploymentID.fromAmino(object.deployment_id); } if (object.state !== undefined && object.state !== null) { - message.state = deployment_StateFromJSON(object.state); + message.state = object.state; } if (object.version !== undefined && object.version !== null) { message.version = bytesFromBase64(object.version); @@ -320,10 +320,10 @@ export const Deployment = { }, toAmino(message: Deployment, useInterfaces: boolean = true): DeploymentAmino { const obj: any = {}; - obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId, useInterfaces) : undefined; - obj.state = message.state; - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId, useInterfaces) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.state = message.state ?? 0; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromProtoMsg(message: DeploymentProtoMsg, useInterfaces: boolean = true): Deployment { @@ -435,9 +435,9 @@ export const DeploymentFilters = { }, toAmino(message: DeploymentFilters, useInterfaces: boolean = true): DeploymentFiltersAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.state = message.state ?? ""; return obj; }, fromProtoMsg(message: DeploymentFiltersProtoMsg, useInterfaces: boolean = true): DeploymentFilters { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/deploymentmsg.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/deploymentmsg.ts index e5966259ce..198d1b4573 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/deploymentmsg.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/deploymentmsg.ts @@ -19,12 +19,12 @@ export interface MsgCreateDeploymentProtoMsg { } /** MsgCreateDeployment defines an SDK message for creating deployment */ export interface MsgCreateDeploymentAmino { - id?: DeploymentIDAmino; - groups?: GroupSpecAmino[]; - version?: string; - deposit?: CoinAmino; + id: DeploymentIDAmino; + groups: GroupSpecAmino[]; + version: string; + deposit: CoinAmino; /** Depositor pays for the deposit */ - depositor?: string; + depositor: string; } /** MsgCreateDeployment defines an SDK message for creating deployment */ export interface MsgCreateDeploymentSDKType { @@ -57,10 +57,10 @@ export interface MsgDepositDeploymentProtoMsg { } /** MsgDepositDeployment deposits more funds into the deposit account */ export interface MsgDepositDeploymentAmino { - id?: DeploymentIDAmino; - amount?: CoinAmino; + id: DeploymentIDAmino; + amount: CoinAmino; /** Depositor pays for the deposit */ - depositor?: string; + depositor: string; } /** MsgDepositDeployment deposits more funds into the deposit account */ export interface MsgDepositDeploymentSDKType { @@ -89,8 +89,8 @@ export interface MsgUpdateDeploymentProtoMsg { } /** MsgUpdateDeployment defines an SDK message for updating deployment */ export interface MsgUpdateDeploymentAmino { - id?: DeploymentIDAmino; - version?: string; + id: DeploymentIDAmino; + version: string; } /** MsgUpdateDeployment defines an SDK message for updating deployment */ export interface MsgUpdateDeploymentSDKType { @@ -117,7 +117,7 @@ export interface MsgCloseDeploymentProtoMsg { } /** MsgCloseDeployment defines an SDK message for closing deployment */ export interface MsgCloseDeploymentAmino { - id?: DeploymentIDAmino; + id: DeploymentIDAmino; } /** MsgCloseDeployment defines an SDK message for closing deployment */ export interface MsgCloseDeploymentSDKType { @@ -267,15 +267,15 @@ export const MsgCreateDeployment = { }, toAmino(message: MsgCreateDeployment, useInterfaces: boolean = true): MsgCreateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e, useInterfaces) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.deposit = message.deposit ? Coin.toAmino(message.deposit, useInterfaces) : undefined; - obj.depositor = message.depositor; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); + obj.depositor = message.depositor ?? ""; return obj; }, fromProtoMsg(message: MsgCreateDeploymentProtoMsg, useInterfaces: boolean = true): MsgCreateDeployment { @@ -451,9 +451,9 @@ export const MsgDepositDeployment = { }, toAmino(message: MsgDepositDeployment, useInterfaces: boolean = true): MsgDepositDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : undefined; - obj.amount = message.amount ? Coin.toAmino(message.amount, useInterfaces) : undefined; - obj.depositor = message.depositor; + obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.amount = message.amount ? Coin.toAmino(message.amount, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); + obj.depositor = message.depositor ?? ""; return obj; }, fromProtoMsg(message: MsgDepositDeploymentProtoMsg, useInterfaces: boolean = true): MsgDepositDeployment { @@ -612,8 +612,8 @@ export const MsgUpdateDeployment = { }, toAmino(message: MsgUpdateDeployment, useInterfaces: boolean = true): MsgUpdateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : undefined; - obj.version = message.version ? base64FromBytes(message.version) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.version = message.version ? base64FromBytes(message.version) : ""; return obj; }, fromProtoMsg(message: MsgUpdateDeploymentProtoMsg, useInterfaces: boolean = true): MsgUpdateDeployment { @@ -757,7 +757,7 @@ export const MsgCloseDeployment = { }, toAmino(message: MsgCloseDeployment, useInterfaces: boolean = true): MsgCloseDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id, useInterfaces) : DeploymentID.toAmino(DeploymentID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgCloseDeploymentProtoMsg, useInterfaces: boolean = true): MsgCloseDeployment { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/genesis.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/genesis.ts index ac3d1e2809..ed04c1e901 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/genesis.ts @@ -15,8 +15,8 @@ export interface GenesisDeploymentProtoMsg { } /** GenesisDeployment defines the basic genesis state used by deployment module */ export interface GenesisDeploymentAmino { - deployment?: DeploymentAmino; - groups?: GroupAmino[]; + deployment: DeploymentAmino; + groups: GroupAmino[]; } /** GenesisDeployment defines the basic genesis state used by deployment module */ export interface GenesisDeploymentSDKType { @@ -34,8 +34,8 @@ export interface GenesisStateProtoMsg { } /** GenesisState stores slice of genesis deployment instance */ export interface GenesisStateAmino { - deployments?: GenesisDeploymentAmino[]; - params?: ParamsAmino; + deployments: GenesisDeploymentAmino[]; + params: ParamsAmino; } /** GenesisState stores slice of genesis deployment instance */ export interface GenesisStateSDKType { @@ -129,11 +129,11 @@ export const GenesisDeployment = { }, toAmino(message: GenesisDeployment, useInterfaces: boolean = true): GenesisDeploymentAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment, useInterfaces) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment, useInterfaces) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e, useInterfaces) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } return obj; }, @@ -240,9 +240,9 @@ export const GenesisState = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e, useInterfaces) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } - obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : undefined; + obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : Params.toAmino(Params.fromPartial({})); return obj; }, fromProtoMsg(message: GenesisStateProtoMsg, useInterfaces: boolean = true): GenesisState { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/group.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/group.ts index 52e4ffaff5..f03d8837a3 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/group.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/group.ts @@ -72,9 +72,9 @@ export interface GroupProtoMsg { } /** Group stores group id, state and specifications of group */ export interface GroupAmino { - group_id?: GroupIDAmino; - state?: Group_State; - group_spec?: GroupSpecAmino; + group_id: GroupIDAmino; + state: Group_State; + group_spec: GroupSpecAmino; created_at?: string; } /** Group stores group id, state and specifications of group */ @@ -187,7 +187,7 @@ export const Group = { message.groupId = GroupID.fromAmino(object.group_id); } if (object.state !== undefined && object.state !== null) { - message.state = group_StateFromJSON(object.state); + message.state = object.state; } if (object.group_spec !== undefined && object.group_spec !== null) { message.groupSpec = GroupSpec.fromAmino(object.group_spec); @@ -199,10 +199,10 @@ export const Group = { }, toAmino(message: Group, useInterfaces: boolean = true): GroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? GroupID.toAmino(message.groupId, useInterfaces) : undefined; - obj.state = message.state; - obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec, useInterfaces) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId, useInterfaces) : GroupID.toAmino(GroupID.fromPartial({})); + obj.state = message.state ?? 0; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec, useInterfaces) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromProtoMsg(message: GroupProtoMsg, useInterfaces: boolean = true): Group { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/groupid.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/groupid.ts index c8d721e74b..ee0d7bfd86 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/groupid.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/groupid.ts @@ -13,9 +13,9 @@ export interface GroupIDProtoMsg { } /** GroupID stores owner, deployment sequence number and group sequence number */ export interface GroupIDAmino { - owner?: string; - dseq?: string; - gseq?: number; + owner: string; + dseq: string; + gseq: number; } /** GroupID stores owner, deployment sequence number and group sequence number */ export interface GroupIDSDKType { @@ -119,9 +119,9 @@ export const GroupID = { }, toAmino(message: GroupID, useInterfaces: boolean = true): GroupIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.gseq = message.gseq; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; return obj; }, fromProtoMsg(message: GroupIDProtoMsg, useInterfaces: boolean = true): GroupID { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/groupmsg.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/groupmsg.ts index 976830553c..2a1c368baf 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/groupmsg.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/groupmsg.ts @@ -12,7 +12,7 @@ export interface MsgCloseGroupProtoMsg { } /** MsgCloseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgCloseGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } /** MsgCloseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgCloseGroupSDKType { @@ -38,7 +38,7 @@ export interface MsgPauseGroupProtoMsg { } /** MsgPauseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgPauseGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } /** MsgPauseGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgPauseGroupSDKType { @@ -64,7 +64,7 @@ export interface MsgStartGroupProtoMsg { } /** MsgStartGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgStartGroupAmino { - id?: GroupIDAmino; + id: GroupIDAmino; } /** MsgStartGroup defines SDK message to close a single Group within a Deployment. */ export interface MsgStartGroupSDKType { @@ -146,7 +146,7 @@ export const MsgCloseGroup = { }, toAmino(message: MsgCloseGroup, useInterfaces: boolean = true): MsgCloseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id, useInterfaces) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id, useInterfaces) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgCloseGroupProtoMsg, useInterfaces: boolean = true): MsgCloseGroup { @@ -290,7 +290,7 @@ export const MsgPauseGroup = { }, toAmino(message: MsgPauseGroup, useInterfaces: boolean = true): MsgPauseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id, useInterfaces) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id, useInterfaces) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgPauseGroupProtoMsg, useInterfaces: boolean = true): MsgPauseGroup { @@ -434,7 +434,7 @@ export const MsgStartGroup = { }, toAmino(message: MsgStartGroup, useInterfaces: boolean = true): MsgStartGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id, useInterfaces) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id, useInterfaces) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgStartGroupProtoMsg, useInterfaces: boolean = true): MsgStartGroup { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/groupspec.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/groupspec.ts index 4e82a44cce..f83e1f3722 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/groupspec.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/groupspec.ts @@ -15,9 +15,9 @@ export interface GroupSpecProtoMsg { } /** GroupSpec stores group specifications */ export interface GroupSpecAmino { - name?: string; - requirements?: PlacementRequirementsAmino; - resources?: ResourceAmino[]; + name: string; + requirements: PlacementRequirementsAmino; + resources: ResourceAmino[]; } /** GroupSpec stores group specifications */ export interface GroupSpecSDKType { @@ -127,12 +127,12 @@ export const GroupSpec = { }, toAmino(message: GroupSpec, useInterfaces: boolean = true): GroupSpecAmino { const obj: any = {}; - obj.name = message.name; - obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements, useInterfaces) : undefined; + obj.name = message.name ?? ""; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements, useInterfaces) : PlacementRequirements.toAmino(PlacementRequirements.fromPartial({})); if (message.resources) { obj.resources = message.resources.map(e => e ? Resource.toAmino(e, useInterfaces) : undefined); } else { - obj.resources = []; + obj.resources = message.resources; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/params.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/params.ts index 07c5b7a8bf..9135c984f8 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/params.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/params.ts @@ -12,7 +12,7 @@ export interface ParamsProtoMsg { } /** Params defines the parameters for the x/deployment package */ export interface ParamsAmino { - deployment_min_deposit?: CoinAmino; + deployment_min_deposit: CoinAmino; } /** Params defines the parameters for the x/deployment package */ export interface ParamsSDKType { @@ -84,7 +84,7 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit, useInterfaces) : undefined; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/query.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/query.ts index fce7e669f7..a85038d365 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/query.ts @@ -72,8 +72,8 @@ export interface QueryDeploymentResponseProtoMsg { } /** QueryDeploymentResponse is response type for the Query/Deployment RPC method */ export interface QueryDeploymentResponseAmino { - deployment?: DeploymentAmino; - groups?: GroupAmino[]; + deployment: DeploymentAmino; + groups: GroupAmino[]; escrow_account?: AccountAmino; } /** QueryDeploymentResponse is response type for the Query/Deployment RPC method */ @@ -304,7 +304,7 @@ export const QueryDeploymentsResponse = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -508,11 +508,11 @@ export const QueryDeploymentResponse = { }, toAmino(message: QueryDeploymentResponse, useInterfaces: boolean = true): QueryDeploymentResponseAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment, useInterfaces) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment, useInterfaces) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e, useInterfaces) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/resource.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/resource.ts index c9d31e4690..a4892694e9 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/resource.ts @@ -15,9 +15,9 @@ export interface ResourceProtoMsg { } /** Resource stores unit, total count and price of resource */ export interface ResourceAmino { - resources?: ResourceUnitsAmino; - count?: number; - price?: DecCoinAmino; + resources: ResourceUnitsAmino; + count: number; + price: DecCoinAmino; } /** Resource stores unit, total count and price of resource */ export interface ResourceSDKType { @@ -123,9 +123,9 @@ export const Resource = { }, toAmino(message: Resource, useInterfaces: boolean = true): ResourceAmino { const obj: any = {}; - obj.resources = message.resources ? ResourceUnits.toAmino(message.resources, useInterfaces) : undefined; - obj.count = message.count; - obj.price = message.price ? DecCoin.toAmino(message.price, useInterfaces) : undefined; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources, useInterfaces) : ResourceUnits.toAmino(ResourceUnits.fromPartial({})); + obj.count = message.count ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price, useInterfaces) : DecCoin.toAmino(DecCoin.fromPartial({})); return obj; }, fromProtoMsg(message: ResourceProtoMsg, useInterfaces: boolean = true): Resource { diff --git a/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/genesis.ts index 9b7373141b..63c8e90894 100644 --- a/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/genesis.ts @@ -13,8 +13,8 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by escrow module */ export interface GenesisStateAmino { - accounts?: AccountAmino[]; - payments?: PaymentAmino[]; + accounts: AccountAmino[]; + payments: PaymentAmino[]; } /** GenesisState defines the basic genesis state used by escrow module */ export interface GenesisStateSDKType { @@ -115,12 +115,12 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e, useInterfaces) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } if (message.payments) { obj.payments = message.payments.map(e => e ? Payment.toAmino(e, useInterfaces) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/query.ts b/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/query.ts index e73e475c41..fd9ba4e8c0 100644 --- a/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/query.ts @@ -226,10 +226,10 @@ export const QueryAccountsRequest = { }, toAmino(message: QueryAccountsRequest, useInterfaces: boolean = true): QueryAccountsRequestAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; - obj.owner = message.owner; - obj.state = message.state; + obj.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -336,7 +336,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e, useInterfaces) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -495,11 +495,11 @@ export const QueryPaymentsRequest = { }, toAmino(message: QueryPaymentsRequest, useInterfaces: boolean = true): 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.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -606,7 +606,7 @@ export const QueryPaymentsResponse = { if (message.payments) { obj.payments = message.payments.map(e => e ? Payment.toAmino(e, useInterfaces) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/types.ts b/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/types.ts index 4924fc8bb5..e874222de5 100644 --- a/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/types.ts +++ b/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/types.ts @@ -111,8 +111,8 @@ export interface AccountIDProtoMsg { } /** AccountID is the account identifier */ export interface AccountIDAmino { - scope?: string; - xid?: string; + scope: string; + xid: string; } /** AccountID is the account identifier */ export interface AccountIDSDKType { @@ -141,17 +141,17 @@ export interface AccountProtoMsg { /** Account stores state for an escrow account */ export interface AccountAmino { /** unique identifier for this escrow account */ - id?: AccountIDAmino; + id: AccountIDAmino; /** bech32 encoded account address of the owner of this escrow account */ - owner?: string; + owner: string; /** current state of this escrow account */ - state?: Account_State; + state: Account_State; /** unspent coins received from the owner's wallet */ - balance?: CoinAmino; + balance: CoinAmino; /** total coins spent by this account */ - transferred?: CoinAmino; + transferred: CoinAmino; /** block height at which this account was last settled */ - settled_at?: string; + settled_at: string; } /** Account stores state for an escrow account */ export interface AccountSDKType { @@ -178,13 +178,13 @@ export interface PaymentProtoMsg { } /** Payment stores state for a payment */ export interface PaymentAmino { - account_id?: AccountIDAmino; - payment_id?: string; - owner?: string; - state?: Payment_State; - rate?: CoinAmino; - balance?: CoinAmino; - withdrawn?: CoinAmino; + account_id: AccountIDAmino; + payment_id: string; + owner: string; + state: Payment_State; + rate: CoinAmino; + balance: CoinAmino; + withdrawn: CoinAmino; } /** Payment stores state for a payment */ export interface PaymentSDKType { @@ -275,8 +275,8 @@ export const AccountID = { }, toAmino(message: AccountID, useInterfaces: boolean = true): AccountIDAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; + obj.scope = message.scope ?? ""; + obj.xid = message.xid ?? ""; return obj; }, fromProtoMsg(message: AccountIDProtoMsg, useInterfaces: boolean = true): AccountID { @@ -424,7 +424,7 @@ export const Account = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = account_StateFromJSON(object.state); + message.state = object.state; } if (object.balance !== undefined && object.balance !== null) { message.balance = Coin.fromAmino(object.balance); @@ -439,12 +439,12 @@ export const Account = { }, toAmino(message: Account, useInterfaces: boolean = true): AccountAmino { const obj: any = {}; - obj.id = message.id ? AccountID.toAmino(message.id, useInterfaces) : undefined; - obj.owner = message.owner; - obj.state = message.state; - obj.balance = message.balance ? Coin.toAmino(message.balance, useInterfaces) : undefined; - obj.transferred = message.transferred ? Coin.toAmino(message.transferred, useInterfaces) : undefined; - obj.settled_at = message.settledAt ? message.settledAt.toString() : undefined; + obj.id = message.id ? AccountID.toAmino(message.id, useInterfaces) : AccountID.toAmino(AccountID.fromPartial({})); + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.balance = message.balance ? Coin.toAmino(message.balance, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); + obj.transferred = message.transferred ? Coin.toAmino(message.transferred, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); + obj.settled_at = message.settledAt ? message.settledAt.toString() : "0"; return obj; }, fromProtoMsg(message: AccountProtoMsg, useInterfaces: boolean = true): Account { @@ -607,7 +607,7 @@ export const Payment = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = payment_StateFromJSON(object.state); + message.state = object.state; } if (object.rate !== undefined && object.rate !== null) { message.rate = Coin.fromAmino(object.rate); @@ -622,13 +622,13 @@ export const Payment = { }, toAmino(message: Payment, useInterfaces: boolean = true): PaymentAmino { const obj: any = {}; - obj.account_id = message.accountId ? AccountID.toAmino(message.accountId, useInterfaces) : undefined; - obj.payment_id = message.paymentId; - obj.owner = message.owner; - obj.state = message.state; - obj.rate = message.rate ? Coin.toAmino(message.rate, useInterfaces) : undefined; - obj.balance = message.balance ? Coin.toAmino(message.balance, useInterfaces) : undefined; - obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn, useInterfaces) : undefined; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId, useInterfaces) : AccountID.toAmino(AccountID.fromPartial({})); + obj.payment_id = message.paymentId ?? ""; + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.rate = message.rate ? Coin.toAmino(message.rate, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); + obj.balance = message.balance ? Coin.toAmino(message.balance, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromProtoMsg(message: PaymentProtoMsg, useInterfaces: boolean = true): Payment { diff --git a/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/genesis.ts b/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/genesis.ts index 14a08613b9..8e1f6e4cd1 100644 --- a/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/genesis.ts @@ -13,8 +13,8 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by escrow module */ export interface GenesisStateAmino { - accounts?: AccountAmino[]; - payments?: FractionalPaymentAmino[]; + accounts: AccountAmino[]; + payments: FractionalPaymentAmino[]; } /** GenesisState defines the basic genesis state used by escrow module */ export interface GenesisStateSDKType { @@ -115,12 +115,12 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e, useInterfaces) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } if (message.payments) { obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e, useInterfaces) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/query.ts b/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/query.ts index 7e19dac08f..598aaae55b 100644 --- a/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/query.ts @@ -226,10 +226,10 @@ export const QueryAccountsRequest = { }, toAmino(message: QueryAccountsRequest, useInterfaces: boolean = true): QueryAccountsRequestAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; - obj.owner = message.owner; - obj.state = message.state; + obj.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -336,7 +336,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e, useInterfaces) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -495,11 +495,11 @@ export const QueryPaymentsRequest = { }, toAmino(message: QueryPaymentsRequest, useInterfaces: boolean = true): 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.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -606,7 +606,7 @@ export const QueryPaymentsResponse = { if (message.payments) { obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e, useInterfaces) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/types.ts b/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/types.ts index a07e85ba47..c9a7283950 100644 --- a/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/types.ts +++ b/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/types.ts @@ -111,8 +111,8 @@ export interface AccountIDProtoMsg { } /** AccountID is the account identifier */ export interface AccountIDAmino { - scope?: string; - xid?: string; + scope: string; + xid: string; } /** AccountID is the account identifier */ export interface AccountIDSDKType { @@ -152,28 +152,28 @@ export interface AccountProtoMsg { /** Account stores state for an escrow account */ export interface AccountAmino { /** unique identifier for this escrow account */ - id?: AccountIDAmino; + id: AccountIDAmino; /** bech32 encoded account address of the owner of this escrow account */ - owner?: string; + owner: string; /** current state of this escrow account */ - state?: Account_State; + state: Account_State; /** unspent coins received from the owner's wallet */ - balance?: DecCoinAmino; + balance: DecCoinAmino; /** total coins spent by this account */ - transferred?: DecCoinAmino; + transferred: DecCoinAmino; /** block height at which this account was last settled */ - settled_at?: string; + settled_at: string; /** * bech32 encoded account address of the depositor. * If depositor is same as the owner, then any incoming coins are added to the Balance. * If depositor isn't same as the owner, then any incoming coins are added to the Funds. */ - depositor?: string; + depositor: string; /** * Funds are unspent coins received from the (non-Owner) Depositor's wallet. * If there are any funds, they should be spent before spending the Balance. */ - funds?: DecCoinAmino; + funds: DecCoinAmino; } /** Account stores state for an escrow account */ export interface AccountSDKType { @@ -202,13 +202,13 @@ export interface FractionalPaymentProtoMsg { } /** Payment stores state for a payment */ export interface FractionalPaymentAmino { - account_id?: AccountIDAmino; - payment_id?: string; - owner?: string; - state?: FractionalPayment_State; - rate?: DecCoinAmino; - balance?: DecCoinAmino; - withdrawn?: CoinAmino; + account_id: AccountIDAmino; + payment_id: string; + owner: string; + state: FractionalPayment_State; + rate: DecCoinAmino; + balance: DecCoinAmino; + withdrawn: CoinAmino; } /** Payment stores state for a payment */ export interface FractionalPaymentSDKType { @@ -299,8 +299,8 @@ export const AccountID = { }, toAmino(message: AccountID, useInterfaces: boolean = true): AccountIDAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; + obj.scope = message.scope ?? ""; + obj.xid = message.xid ?? ""; return obj; }, fromProtoMsg(message: AccountIDProtoMsg, useInterfaces: boolean = true): AccountID { @@ -474,7 +474,7 @@ export const Account = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = account_StateFromJSON(object.state); + message.state = object.state; } if (object.balance !== undefined && object.balance !== null) { message.balance = DecCoin.fromAmino(object.balance); @@ -495,14 +495,14 @@ export const Account = { }, toAmino(message: Account, useInterfaces: boolean = true): AccountAmino { const obj: any = {}; - obj.id = message.id ? AccountID.toAmino(message.id, useInterfaces) : undefined; - obj.owner = message.owner; - obj.state = message.state; - obj.balance = message.balance ? DecCoin.toAmino(message.balance, useInterfaces) : undefined; - obj.transferred = message.transferred ? DecCoin.toAmino(message.transferred, useInterfaces) : undefined; - obj.settled_at = message.settledAt ? message.settledAt.toString() : undefined; - obj.depositor = message.depositor; - obj.funds = message.funds ? DecCoin.toAmino(message.funds, useInterfaces) : undefined; + obj.id = message.id ? AccountID.toAmino(message.id, useInterfaces) : AccountID.toAmino(AccountID.fromPartial({})); + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.balance = message.balance ? DecCoin.toAmino(message.balance, useInterfaces) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.transferred = message.transferred ? DecCoin.toAmino(message.transferred, useInterfaces) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.settled_at = message.settledAt ? message.settledAt.toString() : "0"; + obj.depositor = message.depositor ?? ""; + obj.funds = message.funds ? DecCoin.toAmino(message.funds, useInterfaces) : DecCoin.toAmino(DecCoin.fromPartial({})); return obj; }, fromProtoMsg(message: AccountProtoMsg, useInterfaces: boolean = true): Account { @@ -665,7 +665,7 @@ export const FractionalPayment = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = fractionalPayment_StateFromJSON(object.state); + message.state = object.state; } if (object.rate !== undefined && object.rate !== null) { message.rate = DecCoin.fromAmino(object.rate); @@ -680,13 +680,13 @@ export const FractionalPayment = { }, toAmino(message: FractionalPayment, useInterfaces: boolean = true): FractionalPaymentAmino { const obj: any = {}; - obj.account_id = message.accountId ? AccountID.toAmino(message.accountId, useInterfaces) : undefined; - obj.payment_id = message.paymentId; - obj.owner = message.owner; - obj.state = message.state; - obj.rate = message.rate ? DecCoin.toAmino(message.rate, useInterfaces) : undefined; - obj.balance = message.balance ? DecCoin.toAmino(message.balance, useInterfaces) : undefined; - obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn, useInterfaces) : undefined; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId, useInterfaces) : AccountID.toAmino(AccountID.fromPartial({})); + obj.payment_id = message.paymentId ?? ""; + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.rate = message.rate ? DecCoin.toAmino(message.rate, useInterfaces) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.balance = message.balance ? DecCoin.toAmino(message.balance, useInterfaces) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromProtoMsg(message: FractionalPaymentProtoMsg, useInterfaces: boolean = true): FractionalPayment { diff --git a/__fixtures__/v-next/outputv3/akash/inflation/v1beta2/genesis.ts b/__fixtures__/v-next/outputv3/akash/inflation/v1beta2/genesis.ts index 7a009abb30..f4dcedb829 100644 --- a/__fixtures__/v-next/outputv3/akash/inflation/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv3/akash/inflation/v1beta2/genesis.ts @@ -12,7 +12,7 @@ export interface GenesisStateProtoMsg { } /** GenesisState stores slice of genesis deployment instance */ export interface GenesisStateAmino { - params?: ParamsAmino; + params: ParamsAmino; } /** GenesisState stores slice of genesis deployment instance */ export interface GenesisStateSDKType { @@ -84,7 +84,7 @@ export const GenesisState = { }, toAmino(message: GenesisState, useInterfaces: boolean = true): GenesisStateAmino { const obj: any = {}; - obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : undefined; + obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : Params.toAmino(Params.fromPartial({})); return obj; }, fromProtoMsg(message: GenesisStateProtoMsg, useInterfaces: boolean = true): GenesisState { diff --git a/__fixtures__/v-next/outputv3/akash/inflation/v1beta2/params.ts b/__fixtures__/v-next/outputv3/akash/inflation/v1beta2/params.ts index 84748b5f36..55898b7cf3 100644 --- a/__fixtures__/v-next/outputv3/akash/inflation/v1beta2/params.ts +++ b/__fixtures__/v-next/outputv3/akash/inflation/v1beta2/params.ts @@ -24,17 +24,17 @@ export interface ParamsProtoMsg { /** Params defines the parameters for the x/deployment package */ export interface ParamsAmino { /** InflationDecayFactor is the number of years it takes inflation to halve. */ - inflation_decay_factor?: string; + inflation_decay_factor: string; /** * InitialInflation is the rate at which inflation starts at genesis. * It is a decimal value in the range [0.0, 100.0]. */ - initial_inflation?: string; + initial_inflation: string; /** * Variance defines the fraction by which inflation can vary from ideal inflation in a block. * It is a decimal value in the range [0.0, 1.0]. */ - variance?: string; + variance: string; } /** Params defines the parameters for the x/deployment package */ export interface ParamsSDKType { @@ -136,9 +136,9 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.inflation_decay_factor = message.inflationDecayFactor; - obj.initial_inflation = message.initialInflation; - obj.variance = message.variance; + obj.inflation_decay_factor = message.inflationDecayFactor ?? ""; + obj.initial_inflation = message.initialInflation ?? ""; + obj.variance = message.variance ?? ""; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/akash/market/v1beta2/bid.ts b/__fixtures__/v-next/outputv3/akash/market/v1beta2/bid.ts index 2febf5c63d..7c480275b9 100644 --- a/__fixtures__/v-next/outputv3/akash/market/v1beta2/bid.ts +++ b/__fixtures__/v-next/outputv3/akash/market/v1beta2/bid.ts @@ -72,10 +72,10 @@ export interface MsgCreateBidProtoMsg { } /** MsgCreateBid defines an SDK message for creating Bid */ export interface MsgCreateBidAmino { - order?: OrderIDAmino; - provider?: string; - price?: DecCoinAmino; - deposit?: CoinAmino; + order: OrderIDAmino; + provider: string; + price: DecCoinAmino; + deposit: CoinAmino; } /** MsgCreateBid defines an SDK message for creating Bid */ export interface MsgCreateBidSDKType { @@ -104,7 +104,7 @@ export interface MsgCloseBidProtoMsg { } /** MsgCloseBid defines an SDK message for closing bid */ export interface MsgCloseBidAmino { - bid_id?: BidIDAmino; + bid_id: BidIDAmino; } /** MsgCloseBid defines an SDK message for closing bid */ export interface MsgCloseBidSDKType { @@ -140,11 +140,11 @@ export interface BidIDProtoMsg { * A successful bid becomes a Lease(ID). */ export interface BidIDAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - provider?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + provider: string; } /** * BidID stores owner and all other seq numbers @@ -170,9 +170,9 @@ export interface BidProtoMsg { } /** Bid stores BidID, state of bid and price */ export interface BidAmino { - bid_id?: BidIDAmino; - state?: Bid_State; - price?: DecCoinAmino; + bid_id: BidIDAmino; + state: Bid_State; + price: DecCoinAmino; created_at?: string; } /** Bid stores BidID, state of bid and price */ @@ -197,12 +197,12 @@ export interface BidFiltersProtoMsg { } /** BidFilters defines flags for bid list filter */ export interface BidFiltersAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - provider?: string; - state?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + provider: string; + state: string; } /** BidFilters defines flags for bid list filter */ export interface BidFiltersSDKType { @@ -328,10 +328,10 @@ export const MsgCreateBid = { }, toAmino(message: MsgCreateBid, useInterfaces: boolean = true): MsgCreateBidAmino { const obj: any = {}; - obj.order = message.order ? OrderID.toAmino(message.order, useInterfaces) : undefined; - obj.provider = message.provider; - obj.price = message.price ? DecCoin.toAmino(message.price, useInterfaces) : undefined; - obj.deposit = message.deposit ? Coin.toAmino(message.deposit, useInterfaces) : undefined; + obj.order = message.order ? OrderID.toAmino(message.order, useInterfaces) : OrderID.toAmino(OrderID.fromPartial({})); + obj.provider = message.provider ?? ""; + obj.price = message.price ? DecCoin.toAmino(message.price, useInterfaces) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.deposit = message.deposit ? Coin.toAmino(message.deposit, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromProtoMsg(message: MsgCreateBidProtoMsg, useInterfaces: boolean = true): MsgCreateBid { @@ -475,7 +475,7 @@ export const MsgCloseBid = { }, toAmino(message: MsgCloseBid, useInterfaces: boolean = true): MsgCloseBidAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId, useInterfaces) : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId, useInterfaces) : BidID.toAmino(BidID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgCloseBidProtoMsg, useInterfaces: boolean = true): MsgCloseBid { @@ -679,11 +679,11 @@ export const BidID = { }, toAmino(message: BidID, useInterfaces: boolean = true): 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; return obj; }, fromProtoMsg(message: BidIDProtoMsg, useInterfaces: boolean = true): BidID { @@ -802,7 +802,7 @@ export const Bid = { message.bidId = BidID.fromAmino(object.bid_id); } if (object.state !== undefined && object.state !== null) { - message.state = bid_StateFromJSON(object.state); + message.state = object.state; } if (object.price !== undefined && object.price !== null) { message.price = DecCoin.fromAmino(object.price); @@ -814,10 +814,10 @@ export const Bid = { }, toAmino(message: Bid, useInterfaces: boolean = true): BidAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId, useInterfaces) : undefined; - obj.state = message.state; - obj.price = message.price ? DecCoin.toAmino(message.price, useInterfaces) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId, useInterfaces) : BidID.toAmino(BidID.fromPartial({})); + obj.state = message.state ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price, useInterfaces) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromProtoMsg(message: BidProtoMsg, useInterfaces: boolean = true): Bid { @@ -974,12 +974,12 @@ export const BidFilters = { }, toAmino(message: BidFilters, useInterfaces: boolean = true): 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; + obj.state = message.state ?? ""; return obj; }, fromProtoMsg(message: BidFiltersProtoMsg, useInterfaces: boolean = true): BidFilters { diff --git a/__fixtures__/v-next/outputv3/akash/market/v1beta2/genesis.ts b/__fixtures__/v-next/outputv3/akash/market/v1beta2/genesis.ts index 9e860c8bfa..de613c50e2 100644 --- a/__fixtures__/v-next/outputv3/akash/market/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv3/akash/market/v1beta2/genesis.ts @@ -16,9 +16,9 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by market module */ export interface GenesisStateAmino { - orders?: OrderAmino[]; - leases?: LeaseAmino[]; - params?: ParamsAmino; + orders: OrderAmino[]; + leases: LeaseAmino[]; + params: ParamsAmino; } /** GenesisState defines the basic genesis state used by market module */ export interface GenesisStateSDKType { @@ -137,14 +137,14 @@ export const GenesisState = { if (message.orders) { obj.orders = message.orders.map(e => e ? Order.toAmino(e, useInterfaces) : undefined); } else { - obj.orders = []; + obj.orders = message.orders; } if (message.leases) { obj.leases = message.leases.map(e => e ? Lease.toAmino(e, useInterfaces) : undefined); } else { - obj.leases = []; + obj.leases = message.leases; } - obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : undefined; + obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : Params.toAmino(Params.fromPartial({})); return obj; }, fromProtoMsg(message: GenesisStateProtoMsg, useInterfaces: boolean = true): GenesisState { diff --git a/__fixtures__/v-next/outputv3/akash/market/v1beta2/lease.ts b/__fixtures__/v-next/outputv3/akash/market/v1beta2/lease.ts index 1204b1a755..3d419163f0 100644 --- a/__fixtures__/v-next/outputv3/akash/market/v1beta2/lease.ts +++ b/__fixtures__/v-next/outputv3/akash/market/v1beta2/lease.ts @@ -66,11 +66,11 @@ export interface LeaseIDProtoMsg { } /** LeaseID stores bid details of lease */ export interface LeaseIDAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - provider?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + provider: string; } /** LeaseID stores bid details of lease */ export interface LeaseIDSDKType { @@ -94,9 +94,9 @@ export interface LeaseProtoMsg { } /** Lease stores LeaseID, state of lease and price */ export interface LeaseAmino { - lease_id?: LeaseIDAmino; - state?: Lease_State; - price?: DecCoinAmino; + lease_id: LeaseIDAmino; + state: Lease_State; + price: DecCoinAmino; created_at?: string; closed_on?: string; } @@ -123,12 +123,12 @@ export interface LeaseFiltersProtoMsg { } /** LeaseFilters defines flags for lease list filter */ export interface LeaseFiltersAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - provider?: string; - state?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + provider: string; + state: string; } /** LeaseFilters defines flags for lease list filter */ export interface LeaseFiltersSDKType { @@ -149,7 +149,7 @@ export interface MsgCreateLeaseProtoMsg { } /** MsgCreateLease is sent to create a lease */ export interface MsgCreateLeaseAmino { - bid_id?: BidIDAmino; + bid_id: BidIDAmino; } /** MsgCreateLease is sent to create a lease */ export interface MsgCreateLeaseSDKType { @@ -175,7 +175,7 @@ export interface MsgWithdrawLeaseProtoMsg { } /** MsgWithdrawLease defines an SDK message for closing bid */ export interface MsgWithdrawLeaseAmino { - bid_id?: LeaseIDAmino; + bid_id: LeaseIDAmino; } /** MsgWithdrawLease defines an SDK message for closing bid */ export interface MsgWithdrawLeaseSDKType { @@ -201,7 +201,7 @@ export interface MsgCloseLeaseProtoMsg { } /** MsgCloseLease defines an SDK message for closing order */ export interface MsgCloseLeaseAmino { - lease_id?: LeaseIDAmino; + lease_id: LeaseIDAmino; } /** MsgCloseLease defines an SDK message for closing order */ export interface MsgCloseLeaseSDKType { @@ -343,11 +343,11 @@ export const LeaseID = { }, toAmino(message: LeaseID, useInterfaces: boolean = true): 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; return obj; }, fromProtoMsg(message: LeaseIDProtoMsg, useInterfaces: boolean = true): LeaseID { @@ -480,7 +480,7 @@ export const Lease = { message.leaseId = LeaseID.fromAmino(object.lease_id); } if (object.state !== undefined && object.state !== null) { - message.state = lease_StateFromJSON(object.state); + message.state = object.state; } if (object.price !== undefined && object.price !== null) { message.price = DecCoin.fromAmino(object.price); @@ -495,11 +495,11 @@ export const Lease = { }, toAmino(message: Lease, useInterfaces: boolean = true): LeaseAmino { const obj: any = {}; - obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId, useInterfaces) : undefined; - obj.state = message.state; - obj.price = message.price ? DecCoin.toAmino(message.price, useInterfaces) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; - obj.closed_on = message.closedOn ? message.closedOn.toString() : undefined; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId, useInterfaces) : LeaseID.toAmino(LeaseID.fromPartial({})); + obj.state = message.state ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price, useInterfaces) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; + obj.closed_on = message.closedOn !== BigInt(0) ? message.closedOn.toString() : undefined; return obj; }, fromProtoMsg(message: LeaseProtoMsg, useInterfaces: boolean = true): Lease { @@ -656,12 +656,12 @@ export const LeaseFilters = { }, toAmino(message: LeaseFilters, useInterfaces: boolean = true): 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; + obj.state = message.state ?? ""; return obj; }, fromProtoMsg(message: LeaseFiltersProtoMsg, useInterfaces: boolean = true): LeaseFilters { @@ -743,7 +743,7 @@ export const MsgCreateLease = { }, toAmino(message: MsgCreateLease, useInterfaces: boolean = true): MsgCreateLeaseAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId, useInterfaces) : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId, useInterfaces) : BidID.toAmino(BidID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgCreateLeaseProtoMsg, useInterfaces: boolean = true): MsgCreateLease { @@ -887,7 +887,7 @@ export const MsgWithdrawLease = { }, toAmino(message: MsgWithdrawLease, useInterfaces: boolean = true): MsgWithdrawLeaseAmino { const obj: any = {}; - obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId, useInterfaces) : undefined; + obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId, useInterfaces) : LeaseID.toAmino(LeaseID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgWithdrawLeaseProtoMsg, useInterfaces: boolean = true): MsgWithdrawLease { @@ -1031,7 +1031,7 @@ export const MsgCloseLease = { }, toAmino(message: MsgCloseLease, useInterfaces: boolean = true): MsgCloseLeaseAmino { const obj: any = {}; - obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId, useInterfaces) : undefined; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId, useInterfaces) : LeaseID.toAmino(LeaseID.fromPartial({})); return obj; }, fromProtoMsg(message: MsgCloseLeaseProtoMsg, useInterfaces: boolean = true): MsgCloseLease { diff --git a/__fixtures__/v-next/outputv3/akash/market/v1beta2/order.ts b/__fixtures__/v-next/outputv3/akash/market/v1beta2/order.ts index 47c53e8eec..31d6c66929 100644 --- a/__fixtures__/v-next/outputv3/akash/market/v1beta2/order.ts +++ b/__fixtures__/v-next/outputv3/akash/market/v1beta2/order.ts @@ -64,10 +64,10 @@ export interface OrderIDProtoMsg { } /** OrderID stores owner and all other seq numbers */ export interface OrderIDAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; + owner: string; + dseq: string; + gseq: number; + oseq: number; } /** OrderID stores owner and all other seq numbers */ export interface OrderIDSDKType { @@ -89,9 +89,9 @@ export interface OrderProtoMsg { } /** Order stores orderID, state of order and other details */ export interface OrderAmino { - order_id?: OrderIDAmino; - state?: Order_State; - spec?: GroupSpecAmino; + order_id: OrderIDAmino; + state: Order_State; + spec: GroupSpecAmino; created_at?: string; } /** Order stores orderID, state of order and other details */ @@ -115,11 +115,11 @@ export interface OrderFiltersProtoMsg { } /** OrderFilters defines flags for order list filter */ export interface OrderFiltersAmino { - owner?: string; - dseq?: string; - gseq?: number; - oseq?: number; - state?: string; + owner: string; + dseq: string; + gseq: number; + oseq: number; + state: string; } /** OrderFilters defines flags for order list filter */ export interface OrderFiltersSDKType { @@ -240,10 +240,10 @@ export const OrderID = { }, toAmino(message: OrderID, useInterfaces: boolean = true): OrderIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.gseq = message.gseq; - obj.oseq = message.oseq; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; return obj; }, fromProtoMsg(message: OrderIDProtoMsg, useInterfaces: boolean = true): OrderID { @@ -362,7 +362,7 @@ export const Order = { message.orderId = OrderID.fromAmino(object.order_id); } if (object.state !== undefined && object.state !== null) { - message.state = order_StateFromJSON(object.state); + message.state = object.state; } if (object.spec !== undefined && object.spec !== null) { message.spec = GroupSpec.fromAmino(object.spec); @@ -374,10 +374,10 @@ export const Order = { }, toAmino(message: Order, useInterfaces: boolean = true): OrderAmino { const obj: any = {}; - obj.order_id = message.orderId ? OrderID.toAmino(message.orderId, useInterfaces) : undefined; - obj.state = message.state; - obj.spec = message.spec ? GroupSpec.toAmino(message.spec, useInterfaces) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.order_id = message.orderId ? OrderID.toAmino(message.orderId, useInterfaces) : OrderID.toAmino(OrderID.fromPartial({})); + obj.state = message.state ?? 0; + obj.spec = message.spec ? GroupSpec.toAmino(message.spec, useInterfaces) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromProtoMsg(message: OrderProtoMsg, useInterfaces: boolean = true): Order { @@ -519,11 +519,11 @@ export const OrderFilters = { }, toAmino(message: OrderFilters, useInterfaces: boolean = true): 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.state = message.state ?? ""; return obj; }, fromProtoMsg(message: OrderFiltersProtoMsg, useInterfaces: boolean = true): OrderFilters { diff --git a/__fixtures__/v-next/outputv3/akash/market/v1beta2/params.ts b/__fixtures__/v-next/outputv3/akash/market/v1beta2/params.ts index 57f8ad485c..5908dcc74b 100644 --- a/__fixtures__/v-next/outputv3/akash/market/v1beta2/params.ts +++ b/__fixtures__/v-next/outputv3/akash/market/v1beta2/params.ts @@ -13,8 +13,8 @@ export interface ParamsProtoMsg { } /** Params is the params for the x/market module */ export interface ParamsAmino { - bid_min_deposit?: CoinAmino; - order_max_bids?: number; + bid_min_deposit: CoinAmino; + order_max_bids: number; } /** Params is the params for the x/market module */ export interface ParamsSDKType { @@ -102,8 +102,8 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit, useInterfaces) : undefined; - obj.order_max_bids = message.orderMaxBids; + obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit, useInterfaces) : Coin.toAmino(Coin.fromPartial({})); + obj.order_max_bids = message.orderMaxBids ?? 0; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/akash/market/v1beta2/query.ts b/__fixtures__/v-next/outputv3/akash/market/v1beta2/query.ts index 929a4caede..61c686c881 100644 --- a/__fixtures__/v-next/outputv3/akash/market/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv3/akash/market/v1beta2/query.ts @@ -412,7 +412,7 @@ export const QueryOrdersResponse = { if (message.orders) { obj.orders = message.orders.map(e => e ? Order.toAmino(e, useInterfaces) : undefined); } else { - obj.orders = []; + obj.orders = message.orders; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -784,7 +784,7 @@ export const QueryBidsResponse = { if (message.bids) { obj.bids = message.bids.map(e => e ? QueryBidResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.bids = []; + obj.bids = message.bids; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1174,7 +1174,7 @@ export const QueryLeasesResponse = { if (message.leases) { obj.leases = message.leases.map(e => e ? QueryLeaseResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.leases = []; + obj.leases = message.leases; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/akash/provider/v1beta1/provider.ts b/__fixtures__/v-next/outputv3/akash/provider/v1beta1/provider.ts index 632e61277c..2cbe545c0f 100644 --- a/__fixtures__/v-next/outputv3/akash/provider/v1beta1/provider.ts +++ b/__fixtures__/v-next/outputv3/akash/provider/v1beta1/provider.ts @@ -13,8 +13,8 @@ export interface ProviderInfoProtoMsg { } /** ProviderInfo */ export interface ProviderInfoAmino { - email?: string; - website?: string; + email: string; + website: string; } /** ProviderInfo */ export interface ProviderInfoSDKType { @@ -34,10 +34,10 @@ export interface MsgCreateProviderProtoMsg { } /** MsgCreateProvider defines an SDK message for creating a provider */ export interface MsgCreateProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } /** MsgCreateProvider defines an SDK message for creating a provider */ export interface MsgCreateProviderSDKType { @@ -69,10 +69,10 @@ export interface MsgUpdateProviderProtoMsg { } /** MsgUpdateProvider defines an SDK message for updating a provider */ export interface MsgUpdateProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } /** MsgUpdateProvider defines an SDK message for updating a provider */ export interface MsgUpdateProviderSDKType { @@ -101,7 +101,7 @@ export interface MsgDeleteProviderProtoMsg { } /** MsgDeleteProvider defines an SDK message for deleting a provider */ export interface MsgDeleteProviderAmino { - owner?: string; + owner: string; } /** MsgDeleteProvider defines an SDK message for deleting a provider */ export interface MsgDeleteProviderSDKType { @@ -130,10 +130,10 @@ export interface ProviderProtoMsg { } /** Provider stores owner and host details */ export interface ProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } /** Provider stores owner and host details */ export interface ProviderSDKType { @@ -221,8 +221,8 @@ export const ProviderInfo = { }, toAmino(message: ProviderInfo, useInterfaces: boolean = true): ProviderInfoAmino { const obj: any = {}; - obj.email = message.email; - obj.website = message.website; + obj.email = message.email ?? ""; + obj.website = message.website ?? ""; return obj; }, fromProtoMsg(message: ProviderInfoProtoMsg, useInterfaces: boolean = true): ProviderInfo { @@ -355,14 +355,14 @@ export const MsgCreateProvider = { }, toAmino(message: MsgCreateProvider, useInterfaces: boolean = true): MsgCreateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + obj.owner = message.owner ?? ""; + obj.host_uri = message.hostUri ?? ""; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info, useInterfaces) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info, useInterfaces) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromProtoMsg(message: MsgCreateProviderProtoMsg, useInterfaces: boolean = true): MsgCreateProvider { @@ -557,14 +557,14 @@ export const MsgUpdateProvider = { }, toAmino(message: MsgUpdateProvider, useInterfaces: boolean = true): MsgUpdateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + obj.owner = message.owner ?? ""; + obj.host_uri = message.hostUri ?? ""; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info, useInterfaces) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info, useInterfaces) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromProtoMsg(message: MsgUpdateProviderProtoMsg, useInterfaces: boolean = true): MsgUpdateProvider { @@ -706,7 +706,7 @@ export const MsgDeleteProvider = { }, toAmino(message: MsgDeleteProvider, useInterfaces: boolean = true): MsgDeleteProviderAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner ?? ""; return obj; }, fromProtoMsg(message: MsgDeleteProviderProtoMsg, useInterfaces: boolean = true): MsgDeleteProvider { @@ -901,14 +901,14 @@ export const Provider = { }, toAmino(message: Provider, useInterfaces: boolean = true): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + obj.owner = message.owner ?? ""; + obj.host_uri = message.hostUri ?? ""; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info, useInterfaces) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info, useInterfaces) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromProtoMsg(message: ProviderProtoMsg, useInterfaces: boolean = true): Provider { diff --git a/__fixtures__/v-next/outputv3/akash/provider/v1beta2/genesis.ts b/__fixtures__/v-next/outputv3/akash/provider/v1beta2/genesis.ts index ea3f3cc602..f8181f9e56 100644 --- a/__fixtures__/v-next/outputv3/akash/provider/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv3/akash/provider/v1beta2/genesis.ts @@ -12,7 +12,7 @@ export interface GenesisStateProtoMsg { } /** GenesisState defines the basic genesis state used by provider module */ export interface GenesisStateAmino { - providers?: ProviderAmino[]; + providers: ProviderAmino[]; } /** GenesisState defines the basic genesis state used by provider module */ export interface GenesisStateSDKType { @@ -91,7 +91,7 @@ export const GenesisState = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e, useInterfaces) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/akash/provider/v1beta2/provider.ts b/__fixtures__/v-next/outputv3/akash/provider/v1beta2/provider.ts index f26ba9bcfe..e05d6c1eaa 100644 --- a/__fixtures__/v-next/outputv3/akash/provider/v1beta2/provider.ts +++ b/__fixtures__/v-next/outputv3/akash/provider/v1beta2/provider.ts @@ -13,8 +13,8 @@ export interface ProviderInfoProtoMsg { } /** ProviderInfo */ export interface ProviderInfoAmino { - email?: string; - website?: string; + email: string; + website: string; } /** ProviderInfo */ export interface ProviderInfoSDKType { @@ -34,10 +34,10 @@ export interface MsgCreateProviderProtoMsg { } /** MsgCreateProvider defines an SDK message for creating a provider */ export interface MsgCreateProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } /** MsgCreateProvider defines an SDK message for creating a provider */ export interface MsgCreateProviderSDKType { @@ -69,10 +69,10 @@ export interface MsgUpdateProviderProtoMsg { } /** MsgUpdateProvider defines an SDK message for updating a provider */ export interface MsgUpdateProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } /** MsgUpdateProvider defines an SDK message for updating a provider */ export interface MsgUpdateProviderSDKType { @@ -101,7 +101,7 @@ export interface MsgDeleteProviderProtoMsg { } /** MsgDeleteProvider defines an SDK message for deleting a provider */ export interface MsgDeleteProviderAmino { - owner?: string; + owner: string; } /** MsgDeleteProvider defines an SDK message for deleting a provider */ export interface MsgDeleteProviderSDKType { @@ -130,10 +130,10 @@ export interface ProviderProtoMsg { } /** Provider stores owner and host details */ export interface ProviderAmino { - owner?: string; - host_uri?: string; - attributes?: AttributeAmino[]; - info?: ProviderInfoAmino; + owner: string; + host_uri: string; + attributes: AttributeAmino[]; + info: ProviderInfoAmino; } /** Provider stores owner and host details */ export interface ProviderSDKType { @@ -221,8 +221,8 @@ export const ProviderInfo = { }, toAmino(message: ProviderInfo, useInterfaces: boolean = true): ProviderInfoAmino { const obj: any = {}; - obj.email = message.email; - obj.website = message.website; + obj.email = message.email ?? ""; + obj.website = message.website ?? ""; return obj; }, fromProtoMsg(message: ProviderInfoProtoMsg, useInterfaces: boolean = true): ProviderInfo { @@ -355,14 +355,14 @@ export const MsgCreateProvider = { }, toAmino(message: MsgCreateProvider, useInterfaces: boolean = true): MsgCreateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + obj.owner = message.owner ?? ""; + obj.host_uri = message.hostUri ?? ""; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info, useInterfaces) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info, useInterfaces) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromProtoMsg(message: MsgCreateProviderProtoMsg, useInterfaces: boolean = true): MsgCreateProvider { @@ -557,14 +557,14 @@ export const MsgUpdateProvider = { }, toAmino(message: MsgUpdateProvider, useInterfaces: boolean = true): MsgUpdateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + obj.owner = message.owner ?? ""; + obj.host_uri = message.hostUri ?? ""; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info, useInterfaces) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info, useInterfaces) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromProtoMsg(message: MsgUpdateProviderProtoMsg, useInterfaces: boolean = true): MsgUpdateProvider { @@ -706,7 +706,7 @@ export const MsgDeleteProvider = { }, toAmino(message: MsgDeleteProvider, useInterfaces: boolean = true): MsgDeleteProviderAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner ?? ""; return obj; }, fromProtoMsg(message: MsgDeleteProviderProtoMsg, useInterfaces: boolean = true): MsgDeleteProvider { @@ -901,14 +901,14 @@ export const Provider = { }, toAmino(message: Provider, useInterfaces: boolean = true): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + obj.owner = message.owner ?? ""; + obj.host_uri = message.hostUri ?? ""; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info, useInterfaces) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info, useInterfaces) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromProtoMsg(message: ProviderProtoMsg, useInterfaces: boolean = true): Provider { diff --git a/__fixtures__/v-next/outputv3/akash/provider/v1beta2/query.ts b/__fixtures__/v-next/outputv3/akash/provider/v1beta2/query.ts index 41aa7dc465..e699f21bce 100644 --- a/__fixtures__/v-next/outputv3/akash/provider/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv3/akash/provider/v1beta2/query.ts @@ -242,7 +242,7 @@ export const QueryProvidersResponse = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e, useInterfaces) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -324,7 +324,7 @@ export const QueryProviderRequest = { }, toAmino(message: QueryProviderRequest, useInterfaces: boolean = true): QueryProviderRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromProtoMsg(message: QueryProviderRequestProtoMsg, useInterfaces: boolean = true): QueryProviderRequest { diff --git a/__fixtures__/v-next/outputv3/confio/proofs.ts b/__fixtures__/v-next/outputv3/confio/proofs.ts index 94982af6af..57da071210 100644 --- a/__fixtures__/v-next/outputv3/confio/proofs.ts +++ b/__fixtures__/v-next/outputv3/confio/proofs.ts @@ -825,7 +825,7 @@ export const ExistenceProof = { if (message.path) { obj.path = message.path.map(e => e ? InnerOp.toAmino(e, useInterfaces) : undefined); } else { - obj.path = []; + obj.path = message.path; } return obj; }, @@ -1200,16 +1200,16 @@ export const LeafOp = { fromAmino(object: LeafOpAmino): LeafOp { const message = createBaseLeafOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prehash_key !== undefined && object.prehash_key !== null) { - message.prehashKey = hashOpFromJSON(object.prehash_key); + message.prehashKey = object.prehash_key; } if (object.prehash_value !== undefined && object.prehash_value !== null) { - message.prehashValue = hashOpFromJSON(object.prehash_value); + message.prehashValue = object.prehash_value; } if (object.length !== undefined && object.length !== null) { - message.length = lengthOpFromJSON(object.length); + message.length = object.length; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1218,10 +1218,10 @@ export const LeafOp = { }, toAmino(message: LeafOp, useInterfaces: boolean = true): LeafOpAmino { const obj: any = {}; - obj.hash = message.hash; - obj.prehash_key = message.prehashKey; - obj.prehash_value = message.prehashValue; - obj.length = message.length; + obj.hash = message.hash === 0 ? undefined : message.hash; + obj.prehash_key = message.prehashKey === 0 ? undefined : message.prehashKey; + obj.prehash_value = message.prehashValue === 0 ? undefined : message.prehashValue; + obj.length = message.length === 0 ? undefined : message.length; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; }, @@ -1320,7 +1320,7 @@ export const InnerOp = { fromAmino(object: InnerOpAmino): InnerOp { const message = createBaseInnerOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1332,7 +1332,7 @@ export const InnerOp = { }, toAmino(message: InnerOp, useInterfaces: boolean = true): InnerOpAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; obj.suffix = message.suffix ? base64FromBytes(message.suffix) : undefined; return obj; @@ -1465,8 +1465,8 @@ export const ProofSpec = { const obj: any = {}; obj.leaf_spec = message.leafSpec ? LeafOp.toAmino(message.leafSpec, useInterfaces) : undefined; obj.inner_spec = message.innerSpec ? InnerSpec.toAmino(message.innerSpec, useInterfaces) : undefined; - obj.max_depth = message.maxDepth; - obj.min_depth = message.minDepth; + obj.max_depth = message.maxDepth === 0 ? undefined : message.maxDepth; + obj.min_depth = message.minDepth === 0 ? undefined : message.minDepth; return obj; }, fromProtoMsg(message: ProofSpecProtoMsg, useInterfaces: boolean = true): ProofSpec { @@ -1630,7 +1630,7 @@ export const InnerSpec = { message.emptyChild = bytesFromBase64(object.empty_child); } if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } return message; }, @@ -1639,13 +1639,13 @@ export const InnerSpec = { if (message.childOrder) { obj.child_order = message.childOrder.map(e => e); } else { - obj.child_order = []; + obj.child_order = message.childOrder; } - obj.child_size = message.childSize; - obj.min_prefix_length = message.minPrefixLength; - obj.max_prefix_length = message.maxPrefixLength; + obj.child_size = message.childSize === 0 ? undefined : message.childSize; + obj.min_prefix_length = message.minPrefixLength === 0 ? undefined : message.minPrefixLength; + obj.max_prefix_length = message.maxPrefixLength === 0 ? undefined : message.maxPrefixLength; obj.empty_child = message.emptyChild ? base64FromBytes(message.emptyChild) : undefined; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; return obj; }, fromProtoMsg(message: InnerSpecProtoMsg, useInterfaces: boolean = true): InnerSpec { @@ -1734,7 +1734,7 @@ export const BatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? BatchEntry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1945,12 +1945,12 @@ export const CompressedBatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? CompressedBatchEntry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.lookupInners) { obj.lookup_inners = message.lookupInners.map(e => e ? InnerOp.toAmino(e, useInterfaces) : undefined); } else { - obj.lookup_inners = []; + obj.lookup_inners = message.lookupInners; } return obj; }, @@ -2199,7 +2199,7 @@ export const CompressedExistenceProof = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/app/v1alpha1/config.ts b/__fixtures__/v-next/outputv3/cosmos/app/v1alpha1/config.ts index b05158d742..b1355e16c8 100644 --- a/__fixtures__/v-next/outputv3/cosmos/app/v1alpha1/config.ts +++ b/__fixtures__/v-next/outputv3/cosmos/app/v1alpha1/config.ts @@ -169,7 +169,7 @@ export const Config = { if (message.modules) { obj.modules = message.modules.map(e => e ? ModuleConfig.toAmino(e, useInterfaces) : undefined); } else { - obj.modules = []; + obj.modules = message.modules; } return obj; }, @@ -268,7 +268,7 @@ export const ModuleConfig = { }, toAmino(message: ModuleConfig, useInterfaces: boolean = true): ModuleConfigAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.config = message.config ? Any.toAmino(message.config, useInterfaces) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/app/v1alpha1/module.ts b/__fixtures__/v-next/outputv3/cosmos/app/v1alpha1/module.ts index d5be8dfaa4..dcb7e04d72 100644 --- a/__fixtures__/v-next/outputv3/cosmos/app/v1alpha1/module.ts +++ b/__fixtures__/v-next/outputv3/cosmos/app/v1alpha1/module.ts @@ -302,16 +302,16 @@ export const ModuleDescriptor = { }, toAmino(message: ModuleDescriptor, useInterfaces: boolean = true): ModuleDescriptorAmino { const obj: any = {}; - obj.go_import = message.goImport; + obj.go_import = message.goImport === "" ? undefined : message.goImport; if (message.usePackage) { obj.use_package = message.usePackage.map(e => e ? PackageReference.toAmino(e, useInterfaces) : undefined); } else { - obj.use_package = []; + obj.use_package = message.usePackage; } if (message.canMigrateFrom) { obj.can_migrate_from = message.canMigrateFrom.map(e => e ? MigrateFromInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.can_migrate_from = []; + obj.can_migrate_from = message.canMigrateFrom; } return obj; }, @@ -408,8 +408,8 @@ export const PackageReference = { }, toAmino(message: PackageReference, useInterfaces: boolean = true): PackageReferenceAmino { const obj: any = {}; - obj.name = message.name; - obj.revision = message.revision; + obj.name = message.name === "" ? undefined : message.name; + obj.revision = message.revision === 0 ? undefined : message.revision; return obj; }, fromProtoMsg(message: PackageReferenceProtoMsg, useInterfaces: boolean = true): PackageReference { @@ -490,7 +490,7 @@ export const MigrateFromInfo = { }, toAmino(message: MigrateFromInfo, useInterfaces: boolean = true): MigrateFromInfoAmino { const obj: any = {}; - obj.module = message.module; + obj.module = message.module === "" ? undefined : message.module; return obj; }, fromProtoMsg(message: MigrateFromInfoProtoMsg, useInterfaces: boolean = true): MigrateFromInfo { diff --git a/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/auth.ts b/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/auth.ts index de7697f308..f396528284 100644 --- a/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/auth.ts +++ b/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/auth.ts @@ -210,10 +210,10 @@ export const BaseAccount = { }, toAmino(message: BaseAccount, useInterfaces: boolean = true): BaseAccountAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pub_key = message.pubKey ? Any.toAmino(message.pubKey, useInterfaces) : undefined; - obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromProtoMsg(message: BaseAccountProtoMsg, useInterfaces: boolean = true): BaseAccount { @@ -334,11 +334,11 @@ export const ModuleAccount = { toAmino(message: ModuleAccount, useInterfaces: boolean = true): ModuleAccountAmino { const obj: any = {}; obj.base_account = message.baseAccount ? BaseAccount.toAmino(message.baseAccount, useInterfaces) : undefined; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.permissions) { obj.permissions = message.permissions.map(e => e); } else { - obj.permissions = []; + obj.permissions = message.permissions; } return obj; }, @@ -490,11 +490,11 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): 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; + obj.max_memo_characters = message.maxMemoCharacters !== BigInt(0) ? message.maxMemoCharacters.toString() : undefined; + obj.tx_sig_limit = message.txSigLimit !== BigInt(0) ? message.txSigLimit.toString() : undefined; + obj.tx_size_cost_per_byte = message.txSizeCostPerByte !== BigInt(0) ? message.txSizeCostPerByte.toString() : undefined; + obj.sig_verify_cost_ed25519 = message.sigVerifyCostEd25519 !== BigInt(0) ? message.sigVerifyCostEd25519.toString() : undefined; + obj.sig_verify_cost_secp256k1 = message.sigVerifyCostSecp256k1 !== BigInt(0) ? message.sigVerifyCostSecp256k1.toString() : undefined; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/genesis.ts index 9f66d7f0d9..9922e38d17 100644 --- a/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/genesis.ts @@ -118,7 +118,7 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/query.ts index 848dca150d..197150c5bb 100644 --- a/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/query.ts @@ -432,7 +432,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? AccountI_ToAmino((e as Any), useInterfaces) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -515,7 +515,7 @@ export const QueryAccountRequest = { }, toAmino(message: QueryAccountRequest, useInterfaces: boolean = true): QueryAccountRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: QueryAccountRequestProtoMsg, useInterfaces: boolean = true): QueryAccountRequest { @@ -897,7 +897,7 @@ export const QueryModuleAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? ModuleAccountI_ToAmino((e as Any), useInterfaces) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } return obj; }, @@ -1042,7 +1042,7 @@ export const Bech32PrefixResponse = { }, toAmino(message: Bech32PrefixResponse, useInterfaces: boolean = true): Bech32PrefixResponseAmino { const obj: any = {}; - obj.bech32_prefix = message.bech32Prefix; + obj.bech32_prefix = message.bech32Prefix === "" ? undefined : message.bech32Prefix; return obj; }, fromProtoMsg(message: Bech32PrefixResponseProtoMsg, useInterfaces: boolean = true): Bech32PrefixResponse { @@ -1204,7 +1204,7 @@ export const AddressBytesToStringResponse = { }, toAmino(message: AddressBytesToStringResponse, useInterfaces: boolean = true): AddressBytesToStringResponseAmino { const obj: any = {}; - obj.address_string = message.addressString; + obj.address_string = message.addressString === "" ? undefined : message.addressString; return obj; }, fromProtoMsg(message: AddressBytesToStringResponseProtoMsg, useInterfaces: boolean = true): AddressBytesToStringResponse { @@ -1285,7 +1285,7 @@ export const AddressStringToBytesRequest = { }, toAmino(message: AddressStringToBytesRequest, useInterfaces: boolean = true): AddressStringToBytesRequestAmino { const obj: any = {}; - obj.address_string = message.addressString; + obj.address_string = message.addressString === "" ? undefined : message.addressString; return obj; }, fromProtoMsg(message: AddressStringToBytesRequestProtoMsg, useInterfaces: boolean = true): AddressStringToBytesRequest { @@ -1392,7 +1392,7 @@ export const AccountI_InterfaceDecoder = (input: BinaryReader | Uint8Array): Bas return data; } }; -export const AccountI_FromAmino = (content: AnyAmino) => { +export const AccountI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/BaseAccount": return Any.fromPartial({ @@ -1424,7 +1424,7 @@ export const ModuleAccountI_InterfaceDecoder = (input: BinaryReader | Uint8Array return data; } }; -export const ModuleAccountI_FromAmino = (content: AnyAmino) => { +export const ModuleAccountI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/ModuleAccount": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/authz.ts b/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/authz.ts index 2903c1e51c..82be218cbf 100644 --- a/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/authz.ts @@ -202,7 +202,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization, useInterfaces: boolean = true): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromProtoMsg(message: GenericAuthorizationProtoMsg, useInterfaces: boolean = true): GenericAuthorization { @@ -429,8 +429,8 @@ export const GrantAuthorization = { }, toAmino(message: GrantAuthorization, useInterfaces: boolean = true): GrantAuthorizationAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.authorization = message.authorization ? Authorization_ToAmino((message.authorization as Any), useInterfaces) : undefined; obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -522,7 +522,7 @@ export const GrantQueueItem = { if (message.msgTypeUrls) { obj.msg_type_urls = message.msgTypeUrls.map(e => e); } else { - obj.msg_type_urls = []; + obj.msg_type_urls = message.msgTypeUrls; } return obj; }, @@ -557,7 +557,7 @@ export const Authorization_InterfaceDecoder = (input: BinaryReader | Uint8Array) return data; } }; -export const Authorization_FromAmino = (content: AnyAmino) => { +export const Authorization_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "/akash.deployment.v1beta1.DepositDeploymentAuthorization": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/genesis.ts index d4b18d51eb..ef75d039b7 100644 --- a/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.authorization) { obj.authorization = message.authorization.map(e => e ? GrantAuthorization.toAmino(e, useInterfaces) : undefined); } else { - obj.authorization = []; + obj.authorization = message.authorization; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/query.ts index e02499eecb..65e969324d 100644 --- a/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/query.ts @@ -255,9 +255,9 @@ export const QueryGrantsRequest = { }, toAmino(message: QueryGrantsRequest, useInterfaces: boolean = true): QueryGrantsRequestAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -365,7 +365,7 @@ export const QueryGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? Grant.toAmino(e, useInterfaces) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -465,7 +465,7 @@ export const QueryGranterGrantsRequest = { }, toAmino(message: QueryGranterGrantsRequest, useInterfaces: boolean = true): QueryGranterGrantsRequestAmino { const obj: any = {}; - obj.granter = message.granter; + obj.granter = message.granter === "" ? undefined : message.granter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -573,7 +573,7 @@ export const QueryGranterGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e, useInterfaces) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -673,7 +673,7 @@ export const QueryGranteeGrantsRequest = { }, toAmino(message: QueryGranteeGrantsRequest, useInterfaces: boolean = true): QueryGranteeGrantsRequestAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -781,7 +781,7 @@ export const QueryGranteeGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e, useInterfaces) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/tx.ts index 0349dfd7d3..b084ecd9ed 100644 --- a/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/tx.ts @@ -247,8 +247,8 @@ export const MsgGrant = { }, toAmino(message: MsgGrant, useInterfaces: boolean = true): MsgGrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.grant = message.grant ? Grant.toAmino(message.grant, useInterfaces) : undefined; return obj; }, @@ -339,7 +339,7 @@ export const MsgExecResponse = { if (message.results) { obj.results = message.results.map(e => base64FromBytes(e)); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -442,11 +442,11 @@ export const MsgExec = { }, toAmino(message: MsgExec, useInterfaces: boolean = true): MsgExecAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? Sdk_MsgauthzAuthorization_ToAmino((e as Any), useInterfaces) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -621,9 +621,9 @@ export const MsgRevoke = { }, toAmino(message: MsgRevoke, useInterfaces: boolean = true): MsgRevokeAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromProtoMsg(message: MsgRevokeProtoMsg, useInterfaces: boolean = true): MsgRevoke { @@ -710,7 +710,7 @@ export const Sdk_Msg_InterfaceDecoder = (input: BinaryReader | Uint8Array): Any return data; } }; -export const Sdk_Msg_FromAmino = (content: AnyAmino) => { +export const Sdk_Msg_FromAmino = (content: AnyAmino): Any => { return Any.fromAmino(content); }; export const Sdk_Msg_ToAmino = (content: Any, useInterfaces: boolean = true) => { @@ -724,7 +724,7 @@ export const Authz_Authorization_InterfaceDecoder = (input: BinaryReader | Uint8 return data; } }; -export const Authz_Authorization_FromAmino = (content: AnyAmino) => { +export const Authz_Authorization_FromAmino = (content: AnyAmino): Any => { return Any.fromAmino(content); }; export const Authz_Authorization_ToAmino = (content: Any, useInterfaces: boolean = true) => { diff --git a/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/authz.ts b/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/authz.ts index 68c7869848..d31a627c45 100644 --- a/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/authz.ts @@ -110,7 +110,7 @@ export const SendAuthorization = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/bank.ts b/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/bank.ts index 518fa30392..fa82edeaba 100644 --- a/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/bank.ts +++ b/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/bank.ts @@ -360,9 +360,9 @@ export const Params = { if (message.sendEnabled) { obj.send_enabled = message.sendEnabled.map(e => e ? SendEnabled.toAmino(e, useInterfaces) : undefined); } else { - obj.send_enabled = []; + obj.send_enabled = message.sendEnabled; } - obj.default_send_enabled = message.defaultSendEnabled; + obj.default_send_enabled = message.defaultSendEnabled === false ? undefined : message.defaultSendEnabled; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { @@ -458,8 +458,8 @@ export const SendEnabled = { }, toAmino(message: SendEnabled, useInterfaces: boolean = true): SendEnabledAmino { const obj: any = {}; - obj.denom = message.denom; - obj.enabled = message.enabled; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.enabled = message.enabled === false ? undefined : message.enabled; return obj; }, fromProtoMsg(message: SendEnabledProtoMsg, useInterfaces: boolean = true): SendEnabled { @@ -561,11 +561,11 @@ export const Input = { }, toAmino(message: Input, useInterfaces: boolean = true): InputAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -668,11 +668,11 @@ export const Output = { }, toAmino(message: Output, useInterfaces: boolean = true): OutputAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -764,7 +764,7 @@ export const Supply = { if (message.total) { obj.total = message.total.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.total = []; + obj.total = message.total; } return obj; }, @@ -882,12 +882,12 @@ export const DenomUnit = { }, toAmino(message: DenomUnit, useInterfaces: boolean = true): DenomUnitAmino { const obj: any = {}; - obj.denom = message.denom; - obj.exponent = message.exponent; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.exponent = message.exponent === 0 ? undefined : message.exponent; if (message.aliases) { obj.aliases = message.aliases.map(e => e); } else { - obj.aliases = []; + obj.aliases = message.aliases; } return obj; }, @@ -1080,18 +1080,18 @@ export const Metadata = { }, toAmino(message: Metadata, useInterfaces: boolean = true): MetadataAmino { const obj: any = {}; - obj.description = message.description; + obj.description = message.description === "" ? undefined : message.description; if (message.denomUnits) { obj.denom_units = message.denomUnits.map(e => e ? DenomUnit.toAmino(e, useInterfaces) : undefined); } else { - obj.denom_units = []; + obj.denom_units = message.denomUnits; } - 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; + obj.base = message.base === "" ? undefined : message.base; + obj.display = message.display === "" ? undefined : message.display; + obj.name = message.name === "" ? undefined : message.name; + obj.symbol = message.symbol === "" ? undefined : message.symbol; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; return obj; }, fromProtoMsg(message: MetadataProtoMsg, useInterfaces: boolean = true): Metadata { diff --git a/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/genesis.ts index 858face94c..f622f6b3ac 100644 --- a/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/genesis.ts @@ -208,17 +208,17 @@ export const GenesisState = { if (message.balances) { obj.balances = message.balances.map(e => e ? Balance.toAmino(e, useInterfaces) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } if (message.supply) { obj.supply = message.supply.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.supply = []; + obj.supply = message.supply; } if (message.denomMetadata) { obj.denom_metadata = message.denomMetadata.map(e => e ? Metadata.toAmino(e, useInterfaces) : undefined); } else { - obj.denom_metadata = []; + obj.denom_metadata = message.denomMetadata; } return obj; }, @@ -321,11 +321,11 @@ export const Balance = { }, toAmino(message: Balance, useInterfaces: boolean = true): BalanceAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/query.ts index 777c48b740..f4ccc4b2ae 100644 --- a/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/query.ts @@ -567,8 +567,8 @@ export const QueryBalanceRequest = { }, toAmino(message: QueryBalanceRequest, useInterfaces: boolean = true): QueryBalanceRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.denom = message.denom; + obj.address = message.address === "" ? undefined : message.address; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: QueryBalanceRequestProtoMsg, useInterfaces: boolean = true): QueryBalanceRequest { @@ -749,7 +749,7 @@ export const QueryAllBalancesRequest = { }, toAmino(message: QueryAllBalancesRequest, useInterfaces: boolean = true): QueryAllBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -857,7 +857,7 @@ export const QueryAllBalancesResponse = { if (message.balances) { obj.balances = message.balances.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -957,7 +957,7 @@ export const QuerySpendableBalancesRequest = { }, toAmino(message: QuerySpendableBalancesRequest, useInterfaces: boolean = true): QuerySpendableBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1065,7 +1065,7 @@ export const QuerySpendableBalancesResponse = { if (message.balances) { obj.balances = message.balances.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1257,7 +1257,7 @@ export const QueryTotalSupplyResponse = { if (message.supply) { obj.supply = message.supply.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.supply = []; + obj.supply = message.supply; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1340,7 +1340,7 @@ export const QuerySupplyOfRequest = { }, toAmino(message: QuerySupplyOfRequest, useInterfaces: boolean = true): QuerySupplyOfRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: QuerySupplyOfRequestProtoMsg, useInterfaces: boolean = true): QuerySupplyOfRequest { @@ -1759,7 +1759,7 @@ export const QueryDenomsMetadataResponse = { if (message.metadatas) { obj.metadatas = message.metadatas.map(e => e ? Metadata.toAmino(e, useInterfaces) : undefined); } else { - obj.metadatas = []; + obj.metadatas = message.metadatas; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1842,7 +1842,7 @@ export const QueryDenomMetadataRequest = { }, toAmino(message: QueryDenomMetadataRequest, useInterfaces: boolean = true): QueryDenomMetadataRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: QueryDenomMetadataRequestProtoMsg, useInterfaces: boolean = true): QueryDenomMetadataRequest { @@ -2023,7 +2023,7 @@ export const QueryDenomOwnersRequest = { }, toAmino(message: QueryDenomOwnersRequest, useInterfaces: boolean = true): QueryDenomOwnersRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -2122,7 +2122,7 @@ export const DenomOwner = { }, toAmino(message: DenomOwner, useInterfaces: boolean = true): DenomOwnerAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.balance = message.balance ? Coin.toAmino(message.balance, useInterfaces) : undefined; return obj; }, @@ -2230,7 +2230,7 @@ export const QueryDenomOwnersResponse = { if (message.denomOwners) { obj.denom_owners = message.denomOwners.map(e => e ? DenomOwner.toAmino(e, useInterfaces) : undefined); } else { - obj.denom_owners = []; + obj.denom_owners = message.denomOwners; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/tx.ts index 9966b31cea..6e05bb4ef4 100644 --- a/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/tx.ts @@ -165,12 +165,12 @@ export const MsgSend = { }, toAmino(message: MsgSend, useInterfaces: boolean = true): MsgSendAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -345,12 +345,12 @@ export const MsgMultiSend = { if (message.inputs) { obj.inputs = message.inputs.map(e => e ? Input.toAmino(e, useInterfaces) : undefined); } else { - obj.inputs = []; + obj.inputs = message.inputs; } if (message.outputs) { obj.outputs = message.outputs.map(e => e ? Output.toAmino(e, useInterfaces) : undefined); } else { - obj.outputs = []; + obj.outputs = message.outputs; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/base/abci/v1beta1/abci.ts b/__fixtures__/v-next/outputv3/cosmos/base/abci/v1beta1/abci.ts index ed858302a2..b6eba89d05 100644 --- a/__fixtures__/v-next/outputv3/cosmos/base/abci/v1beta1/abci.ts +++ b/__fixtures__/v-next/outputv3/cosmos/base/abci/v1beta1/abci.ts @@ -134,7 +134,7 @@ export interface ABCIMessageLogProtoMsg { } /** ABCIMessageLog defines a structure containing an indexed tx ABCI message log. */ export interface ABCIMessageLogAmino { - msg_index?: number; + msg_index: number; log?: string; /** * Events contains a slice of Event objects that were emitted during some @@ -697,26 +697,26 @@ export const TxResponse = { }, toAmino(message: TxResponse, useInterfaces: boolean = true): 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; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.txhash = message.txhash === "" ? undefined : message.txhash; + obj.codespace = message.codespace === "" ? undefined : message.codespace; + obj.code = message.code === 0 ? undefined : message.code; + obj.data = message.data === "" ? undefined : message.data; + obj.raw_log = message.rawLog === "" ? undefined : message.rawLog; if (message.logs) { obj.logs = message.logs.map(e => e ? ABCIMessageLog.toAmino(e, useInterfaces) : undefined); } else { - obj.logs = []; + obj.logs = message.logs; } - obj.info = message.info; - obj.gas_wanted = message.gasWanted ? message.gasWanted.toString() : undefined; - obj.gas_used = message.gasUsed ? message.gasUsed.toString() : undefined; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; obj.tx = message.tx ? Any.toAmino(message.tx, useInterfaces) : undefined; - obj.timestamp = message.timestamp; + obj.timestamp = message.timestamp === "" ? undefined : message.timestamp; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e, useInterfaces) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -834,12 +834,12 @@ export const ABCIMessageLog = { }, toAmino(message: ABCIMessageLog, useInterfaces: boolean = true): ABCIMessageLogAmino { const obj: any = {}; - obj.msg_index = message.msgIndex; - obj.log = message.log; + obj.msg_index = message.msgIndex ?? 0; + obj.log = message.log === "" ? undefined : message.log; if (message.events) { obj.events = message.events.map(e => e ? StringEvent.toAmino(e, useInterfaces) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -942,11 +942,11 @@ export const StringEvent = { }, toAmino(message: StringEvent, useInterfaces: boolean = true): StringEventAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -1043,8 +1043,8 @@ export const Attribute = { }, toAmino(message: Attribute, useInterfaces: boolean = true): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: AttributeProtoMsg, useInterfaces: boolean = true): Attribute { @@ -1144,8 +1144,8 @@ export const GasInfo = { }, toAmino(message: GasInfo, useInterfaces: boolean = true): GasInfoAmino { const obj: any = {}; - obj.gas_wanted = message.gasWanted ? message.gasWanted.toString() : undefined; - obj.gas_used = message.gasUsed ? message.gasUsed.toString() : undefined; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; return obj; }, fromProtoMsg(message: GasInfoProtoMsg, useInterfaces: boolean = true): GasInfo { @@ -1284,16 +1284,16 @@ export const Result = { toAmino(message: Result, useInterfaces: boolean = true): ResultAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.log = message.log; + obj.log = message.log === "" ? undefined : message.log; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e, useInterfaces) : undefined); } else { - obj.events = []; + obj.events = message.events; } if (message.msgResponses) { obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.msg_responses = []; + obj.msg_responses = message.msgResponses; } return obj; }, @@ -1491,7 +1491,7 @@ export const MsgData = { }, toAmino(message: MsgData, useInterfaces: boolean = true): MsgDataAmino { const obj: any = {}; - obj.msg_type = message.msgType; + obj.msg_type = message.msgType === "" ? undefined : message.msgType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1603,12 +1603,12 @@ export const TxMsgData = { if (message.data) { obj.data = message.data.map(e => e ? MsgData.toAmino(e, useInterfaces) : undefined); } else { - obj.data = []; + obj.data = message.data; } if (message.msgResponses) { obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.msg_responses = []; + obj.msg_responses = message.msgResponses; } return obj; }, @@ -1781,15 +1781,15 @@ export const SearchTxsResult = { }, toAmino(message: SearchTxsResult, useInterfaces: boolean = true): 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; + obj.total_count = message.totalCount !== BigInt(0) ? message.totalCount.toString() : undefined; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.page_number = message.pageNumber !== BigInt(0) ? message.pageNumber.toString() : undefined; + obj.page_total = message.pageTotal !== BigInt(0) ? message.pageTotal.toString() : undefined; + obj.limit = message.limit !== BigInt(0) ? message.limit.toString() : undefined; if (message.txs) { obj.txs = message.txs.map(e => e ? TxResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/base/kv/v1beta1/kv.ts b/__fixtures__/v-next/outputv3/cosmos/base/kv/v1beta1/kv.ts index aa0bf78fa8..103a0853aa 100644 --- a/__fixtures__/v-next/outputv3/cosmos/base/kv/v1beta1/kv.ts +++ b/__fixtures__/v-next/outputv3/cosmos/base/kv/v1beta1/kv.ts @@ -110,7 +110,7 @@ export const Pairs = { if (message.pairs) { obj.pairs = message.pairs.map(e => e ? Pair.toAmino(e, useInterfaces) : undefined); } else { - obj.pairs = []; + obj.pairs = message.pairs; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/base/query/v1beta1/pagination.ts b/__fixtures__/v-next/outputv3/cosmos/base/query/v1beta1/pagination.ts index 5127a1a536..da38d0423d 100644 --- a/__fixtures__/v-next/outputv3/cosmos/base/query/v1beta1/pagination.ts +++ b/__fixtures__/v-next/outputv3/cosmos/base/query/v1beta1/pagination.ts @@ -294,10 +294,10 @@ export const PageRequest = { toAmino(message: PageRequest, useInterfaces: boolean = true): PageRequestAmino { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; - 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; + obj.offset = message.offset !== BigInt(0) ? message.offset.toString() : undefined; + obj.limit = message.limit !== BigInt(0) ? message.limit.toString() : undefined; + obj.count_total = message.countTotal === false ? undefined : message.countTotal; + obj.reverse = message.reverse === false ? undefined : message.reverse; return obj; }, fromProtoMsg(message: PageRequestProtoMsg, useInterfaces: boolean = true): PageRequest { @@ -396,7 +396,7 @@ export const PageResponse = { toAmino(message: PageResponse, useInterfaces: boolean = true): PageResponseAmino { const obj: any = {}; obj.next_key = message.nextKey ? base64FromBytes(message.nextKey) : undefined; - obj.total = message.total ? message.total.toString() : undefined; + obj.total = message.total !== BigInt(0) ? message.total.toString() : undefined; return obj; }, fromProtoMsg(message: PageResponseProtoMsg, useInterfaces: boolean = true): PageResponse { diff --git a/__fixtures__/v-next/outputv3/cosmos/base/reflection/v1beta1/reflection.ts b/__fixtures__/v-next/outputv3/cosmos/base/reflection/v1beta1/reflection.ts index 889952902a..de33d05fd0 100644 --- a/__fixtures__/v-next/outputv3/cosmos/base/reflection/v1beta1/reflection.ts +++ b/__fixtures__/v-next/outputv3/cosmos/base/reflection/v1beta1/reflection.ts @@ -218,7 +218,7 @@ export const ListAllInterfacesResponse = { if (message.interfaceNames) { obj.interface_names = message.interfaceNames.map(e => e); } else { - obj.interface_names = []; + obj.interface_names = message.interfaceNames; } return obj; }, @@ -300,7 +300,7 @@ export const ListImplementationsRequest = { }, toAmino(message: ListImplementationsRequest, useInterfaces: boolean = true): ListImplementationsRequestAmino { const obj: any = {}; - obj.interface_name = message.interfaceName; + obj.interface_name = message.interfaceName === "" ? undefined : message.interfaceName; return obj; }, fromProtoMsg(message: ListImplementationsRequestProtoMsg, useInterfaces: boolean = true): ListImplementationsRequest { @@ -390,7 +390,7 @@ export const ListImplementationsResponse = { if (message.implementationMessageNames) { obj.implementation_message_names = message.implementationMessageNames.map(e => e); } else { - obj.implementation_message_names = []; + obj.implementation_message_names = message.implementationMessageNames; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/base/reflection/v2alpha1/reflection.ts b/__fixtures__/v-next/outputv3/cosmos/base/reflection/v2alpha1/reflection.ts index 736e399c42..3a221f8f54 100644 --- a/__fixtures__/v-next/outputv3/cosmos/base/reflection/v2alpha1/reflection.ts +++ b/__fixtures__/v-next/outputv3/cosmos/base/reflection/v2alpha1/reflection.ts @@ -856,11 +856,11 @@ export const TxDescriptor = { }, toAmino(message: TxDescriptor, useInterfaces: boolean = true): TxDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? MsgDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -951,7 +951,7 @@ export const AuthnDescriptor = { if (message.signModes) { obj.sign_modes = message.signModes.map(e => e ? SigningModeDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.sign_modes = []; + obj.sign_modes = message.signModes; } return obj; }, @@ -1063,9 +1063,9 @@ export const SigningModeDescriptor = { }, toAmino(message: SigningModeDescriptor, useInterfaces: boolean = true): SigningModeDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; - obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname === "" ? undefined : message.authnInfoProviderMethodFullname; return obj; }, fromProtoMsg(message: SigningModeDescriptorProtoMsg, useInterfaces: boolean = true): SigningModeDescriptor { @@ -1146,7 +1146,7 @@ export const ChainDescriptor = { }, toAmino(message: ChainDescriptor, useInterfaces: boolean = true): ChainDescriptorAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromProtoMsg(message: ChainDescriptorProtoMsg, useInterfaces: boolean = true): ChainDescriptor { @@ -1236,7 +1236,7 @@ export const CodecDescriptor = { if (message.interfaces) { obj.interfaces = message.interfaces.map(e => e ? InterfaceDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.interfaces = []; + obj.interfaces = message.interfaces; } return obj; }, @@ -1360,16 +1360,16 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor, useInterfaces: boolean = true): InterfaceDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.interfaceAcceptingMessages) { obj.interface_accepting_messages = message.interfaceAcceptingMessages.map(e => e ? InterfaceAcceptingMessageDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.interface_accepting_messages = []; + obj.interface_accepting_messages = message.interfaceAcceptingMessages; } if (message.interfaceImplementers) { obj.interface_implementers = message.interfaceImplementers.map(e => e ? InterfaceImplementerDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.interface_implementers = []; + obj.interface_implementers = message.interfaceImplementers; } return obj; }, @@ -1466,8 +1466,8 @@ export const InterfaceImplementerDescriptor = { }, toAmino(message: InterfaceImplementerDescriptor, useInterfaces: boolean = true): InterfaceImplementerDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; - obj.type_url = message.typeUrl; + obj.fullname = message.fullname === "" ? undefined : message.fullname; + obj.type_url = message.typeUrl === "" ? undefined : message.typeUrl; return obj; }, fromProtoMsg(message: InterfaceImplementerDescriptorProtoMsg, useInterfaces: boolean = true): InterfaceImplementerDescriptor { @@ -1569,11 +1569,11 @@ export const InterfaceAcceptingMessageDescriptor = { }, toAmino(message: InterfaceAcceptingMessageDescriptor, useInterfaces: boolean = true): InterfaceAcceptingMessageDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.fieldDescriptorNames) { obj.field_descriptor_names = message.fieldDescriptorNames.map(e => e); } else { - obj.field_descriptor_names = []; + obj.field_descriptor_names = message.fieldDescriptorNames; } return obj; }, @@ -1655,7 +1655,7 @@ export const ConfigurationDescriptor = { }, toAmino(message: ConfigurationDescriptor, useInterfaces: boolean = true): ConfigurationDescriptorAmino { const obj: any = {}; - obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix; + obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix === "" ? undefined : message.bech32AccountAddressPrefix; return obj; }, fromProtoMsg(message: ConfigurationDescriptorProtoMsg, useInterfaces: boolean = true): ConfigurationDescriptor { @@ -1736,7 +1736,7 @@ export const MsgDescriptor = { }, toAmino(message: MsgDescriptor, useInterfaces: boolean = true): MsgDescriptorAmino { const obj: any = {}; - obj.msg_type_url = message.msgTypeUrl; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromProtoMsg(message: MsgDescriptorProtoMsg, useInterfaces: boolean = true): MsgDescriptor { @@ -2702,7 +2702,7 @@ export const QueryServicesDescriptor = { if (message.queryServices) { obj.query_services = message.queryServices.map(e => e ? QueryServiceDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.query_services = []; + obj.query_services = message.queryServices; } return obj; }, @@ -2820,12 +2820,12 @@ export const QueryServiceDescriptor = { }, toAmino(message: QueryServiceDescriptor, useInterfaces: boolean = true): QueryServiceDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; - obj.is_module = message.isModule; + obj.fullname = message.fullname === "" ? undefined : message.fullname; + obj.is_module = message.isModule === false ? undefined : message.isModule; if (message.methods) { obj.methods = message.methods.map(e => e ? QueryMethodDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.methods = []; + obj.methods = message.methods; } return obj; }, @@ -2922,8 +2922,8 @@ export const QueryMethodDescriptor = { }, toAmino(message: QueryMethodDescriptor, useInterfaces: boolean = true): QueryMethodDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.full_query_path = message.fullQueryPath; + obj.name = message.name === "" ? undefined : message.name; + obj.full_query_path = message.fullQueryPath === "" ? undefined : message.fullQueryPath; return obj; }, fromProtoMsg(message: QueryMethodDescriptorProtoMsg, useInterfaces: boolean = true): QueryMethodDescriptor { diff --git a/__fixtures__/v-next/outputv3/cosmos/base/snapshots/v1beta1/snapshot.ts b/__fixtures__/v-next/outputv3/cosmos/base/snapshots/v1beta1/snapshot.ts index 8239345be5..4b79f44286 100644 --- a/__fixtures__/v-next/outputv3/cosmos/base/snapshots/v1beta1/snapshot.ts +++ b/__fixtures__/v-next/outputv3/cosmos/base/snapshots/v1beta1/snapshot.ts @@ -322,9 +322,9 @@ export const Snapshot = { }, toAmino(message: Snapshot, useInterfaces: boolean = true): SnapshotAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunks = message.chunks; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunks = message.chunks === 0 ? undefined : message.chunks; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata, useInterfaces) : undefined; return obj; @@ -416,7 +416,7 @@ export const Metadata = { if (message.chunkHashes) { obj.chunk_hashes = message.chunkHashes.map(e => base64FromBytes(e)); } else { - obj.chunk_hashes = []; + obj.chunk_hashes = message.chunkHashes; } return obj; }, @@ -671,7 +671,7 @@ export const SnapshotStoreItem = { }, toAmino(message: SnapshotStoreItem, useInterfaces: boolean = true): SnapshotStoreItemAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: SnapshotStoreItemProtoMsg, useInterfaces: boolean = true): SnapshotStoreItem { @@ -801,8 +801,8 @@ export const SnapshotIAVLItem = { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; - obj.version = message.version ? message.version.toString() : undefined; - obj.height = message.height; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; + obj.height = message.height === 0 ? undefined : message.height; return obj; }, fromProtoMsg(message: SnapshotIAVLItemProtoMsg, useInterfaces: boolean = true): SnapshotIAVLItem { @@ -898,8 +898,8 @@ export const SnapshotExtensionMeta = { }, toAmino(message: SnapshotExtensionMeta, useInterfaces: boolean = true): SnapshotExtensionMetaAmino { const obj: any = {}; - obj.name = message.name; - obj.format = message.format; + obj.name = message.name === "" ? undefined : message.name; + obj.format = message.format === 0 ? undefined : message.format; return obj; }, fromProtoMsg(message: SnapshotExtensionMetaProtoMsg, useInterfaces: boolean = true): SnapshotExtensionMeta { @@ -1167,7 +1167,7 @@ export const SnapshotSchema = { if (message.keys) { obj.keys = message.keys.map(e => base64FromBytes(e)); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/base/store/v1beta1/commit_info.ts b/__fixtures__/v-next/outputv3/cosmos/base/store/v1beta1/commit_info.ts index 672cbfc44d..bdd0c093cc 100644 --- a/__fixtures__/v-next/outputv3/cosmos/base/store/v1beta1/commit_info.ts +++ b/__fixtures__/v-next/outputv3/cosmos/base/store/v1beta1/commit_info.ts @@ -173,11 +173,11 @@ export const CommitInfo = { }, toAmino(message: CommitInfo, useInterfaces: boolean = true): CommitInfoAmino { const obj: any = {}; - obj.version = message.version ? message.version.toString() : undefined; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; if (message.storeInfos) { obj.store_infos = message.storeInfos.map(e => e ? StoreInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.store_infos = []; + obj.store_infos = message.storeInfos; } return obj; }, @@ -276,7 +276,7 @@ export const StoreInfo = { }, toAmino(message: StoreInfo, useInterfaces: boolean = true): StoreInfoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.commit_id = message.commitId ? CommitID.toAmino(message.commitId, useInterfaces) : undefined; return obj; }, @@ -375,7 +375,7 @@ export const CommitID = { }, toAmino(message: CommitID, useInterfaces: boolean = true): CommitIDAmino { const obj: any = {}; - obj.version = message.version ? message.version.toString() : undefined; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/base/store/v1beta1/listening.ts b/__fixtures__/v-next/outputv3/cosmos/base/store/v1beta1/listening.ts index 085ebedf4c..193741954f 100644 --- a/__fixtures__/v-next/outputv3/cosmos/base/store/v1beta1/listening.ts +++ b/__fixtures__/v-next/outputv3/cosmos/base/store/v1beta1/listening.ts @@ -158,8 +158,8 @@ export const StoreKVPair = { }, toAmino(message: StoreKVPair, useInterfaces: boolean = true): StoreKVPairAmino { const obj: any = {}; - obj.store_key = message.storeKey; - obj.delete = message.delete; + obj.store_key = message.storeKey === "" ? undefined : message.storeKey; + obj.delete = message.delete === false ? undefined : message.delete; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/cosmos/base/tendermint/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/base/tendermint/v1beta1/query.ts index ddd23a3aa2..f808e04ea3 100644 --- a/__fixtures__/v-next/outputv3/cosmos/base/tendermint/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/base/tendermint/v1beta1/query.ts @@ -388,7 +388,7 @@ export const GetValidatorSetByHeightRequest = { }, toAmino(message: GetValidatorSetByHeightRequest, useInterfaces: boolean = true): GetValidatorSetByHeightRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -510,11 +510,11 @@ export const GetValidatorSetByHeightResponse = { }, toAmino(message: GetValidatorSetByHeightResponse, useInterfaces: boolean = true): GetValidatorSetByHeightResponseAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e, useInterfaces) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -720,11 +720,11 @@ export const GetLatestValidatorSetResponse = { }, toAmino(message: GetLatestValidatorSetResponse, useInterfaces: boolean = true): GetLatestValidatorSetResponseAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e, useInterfaces) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -858,10 +858,10 @@ export const Validator = { }, toAmino(message: Validator, useInterfaces: boolean = true): ValidatorAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pub_key = message.pubKey ? Any.toAmino(message.pubKey, useInterfaces) : undefined; - obj.voting_power = message.votingPower ? message.votingPower.toString() : undefined; - obj.proposer_priority = message.proposerPriority ? message.proposerPriority.toString() : undefined; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority !== BigInt(0) ? message.proposerPriority.toString() : undefined; return obj; }, fromProtoMsg(message: ValidatorProtoMsg, useInterfaces: boolean = true): Validator { @@ -944,7 +944,7 @@ export const GetBlockByHeightRequest = { }, toAmino(message: GetBlockByHeightRequest, useInterfaces: boolean = true): GetBlockByHeightRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromProtoMsg(message: GetBlockByHeightRequestProtoMsg, useInterfaces: boolean = true): GetBlockByHeightRequest { @@ -1353,7 +1353,7 @@ export const GetSyncingResponse = { }, toAmino(message: GetSyncingResponse, useInterfaces: boolean = true): GetSyncingResponseAmino { const obj: any = {}; - obj.syncing = message.syncing; + obj.syncing = message.syncing === false ? undefined : message.syncing; return obj; }, fromProtoMsg(message: GetSyncingResponseProtoMsg, useInterfaces: boolean = true): GetSyncingResponse { @@ -1709,18 +1709,18 @@ export const VersionInfo = { }, toAmino(message: VersionInfo, useInterfaces: boolean = true): 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; + obj.name = message.name === "" ? undefined : message.name; + obj.app_name = message.appName === "" ? undefined : message.appName; + obj.version = message.version === "" ? undefined : message.version; + obj.git_commit = message.gitCommit === "" ? undefined : message.gitCommit; + obj.build_tags = message.buildTags === "" ? undefined : message.buildTags; + obj.go_version = message.goVersion === "" ? undefined : message.goVersion; if (message.buildDeps) { obj.build_deps = message.buildDeps.map(e => e ? Module.toAmino(e, useInterfaces) : undefined); } else { - obj.build_deps = []; + obj.build_deps = message.buildDeps; } - obj.cosmos_sdk_version = message.cosmosSdkVersion; + obj.cosmos_sdk_version = message.cosmosSdkVersion === "" ? undefined : message.cosmosSdkVersion; return obj; }, fromProtoMsg(message: VersionInfoProtoMsg, useInterfaces: boolean = true): VersionInfo { @@ -1831,9 +1831,9 @@ export const Module = { }, toAmino(message: Module, useInterfaces: boolean = true): ModuleAmino { const obj: any = {}; - obj.path = message.path; - obj.version = message.version; - obj.sum = message.sum; + obj.path = message.path === "" ? undefined : message.path; + obj.version = message.version === "" ? undefined : message.version; + obj.sum = message.sum === "" ? undefined : message.sum; return obj; }, fromProtoMsg(message: ModuleProtoMsg, useInterfaces: boolean = true): Module { diff --git a/__fixtures__/v-next/outputv3/cosmos/base/v1beta1/coin.ts b/__fixtures__/v-next/outputv3/cosmos/base/v1beta1/coin.ts index 3b55fea655..fa08cef7d8 100644 --- a/__fixtures__/v-next/outputv3/cosmos/base/v1beta1/coin.ts +++ b/__fixtures__/v-next/outputv3/cosmos/base/v1beta1/coin.ts @@ -181,8 +181,8 @@ export const Coin = { }, toAmino(message: Coin, useInterfaces: boolean = true): CoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromProtoMsg(message: CoinProtoMsg, useInterfaces: boolean = true): Coin { @@ -278,8 +278,8 @@ export const DecCoin = { }, toAmino(message: DecCoin, useInterfaces: boolean = true): DecCoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromProtoMsg(message: DecCoinProtoMsg, useInterfaces: boolean = true): DecCoin { @@ -360,7 +360,7 @@ export const IntProto = { }, toAmino(message: IntProto, useInterfaces: boolean = true): IntProtoAmino { const obj: any = {}; - obj.int = message.int; + obj.int = message.int === "" ? undefined : message.int; return obj; }, fromProtoMsg(message: IntProtoProtoMsg, useInterfaces: boolean = true): IntProto { @@ -441,7 +441,7 @@ export const DecProto = { }, toAmino(message: DecProto, useInterfaces: boolean = true): DecProtoAmino { const obj: any = {}; - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; return obj; }, fromProtoMsg(message: DecProtoProtoMsg, useInterfaces: boolean = true): DecProto { diff --git a/__fixtures__/v-next/outputv3/cosmos/capability/v1beta1/capability.ts b/__fixtures__/v-next/outputv3/cosmos/capability/v1beta1/capability.ts index 1acc6fa76b..a589279e21 100644 --- a/__fixtures__/v-next/outputv3/cosmos/capability/v1beta1/capability.ts +++ b/__fixtures__/v-next/outputv3/cosmos/capability/v1beta1/capability.ts @@ -146,7 +146,7 @@ export const Capability = { }, toAmino(message: Capability, useInterfaces: boolean = true): CapabilityAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; return obj; }, fromProtoMsg(message: CapabilityProtoMsg, useInterfaces: boolean = true): Capability { @@ -242,8 +242,8 @@ export const Owner = { }, toAmino(message: Owner, useInterfaces: boolean = true): OwnerAmino { const obj: any = {}; - obj.module = message.module; - obj.name = message.name; + obj.module = message.module === "" ? undefined : message.module; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: OwnerProtoMsg, useInterfaces: boolean = true): Owner { @@ -333,7 +333,7 @@ export const CapabilityOwners = { if (message.owners) { obj.owners = message.owners.map(e => e ? Owner.toAmino(e, useInterfaces) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/capability/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/capability/v1beta1/genesis.ts index 5d7faf69b6..c2e069c1cc 100644 --- a/__fixtures__/v-next/outputv3/cosmos/capability/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/capability/v1beta1/genesis.ts @@ -138,7 +138,7 @@ export const GenesisOwners = { }, toAmino(message: GenesisOwners, useInterfaces: boolean = true): GenesisOwnersAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.index_owners = message.indexOwners ? CapabilityOwners.toAmino(message.indexOwners, useInterfaces) : undefined; return obj; }, @@ -243,11 +243,11 @@ export const GenesisState = { }, toAmino(message: GenesisState, useInterfaces: boolean = true): GenesisStateAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; if (message.owners) { obj.owners = message.owners.map(e => e ? GenesisOwners.toAmino(e, useInterfaces) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/crisis/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/crisis/v1beta1/tx.ts index 34c48b6012..e86471031c 100644 --- a/__fixtures__/v-next/outputv3/cosmos/crisis/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/crisis/v1beta1/tx.ts @@ -128,9 +128,9 @@ export const MsgVerifyInvariant = { }, toAmino(message: MsgVerifyInvariant, useInterfaces: boolean = true): MsgVerifyInvariantAmino { const obj: any = {}; - obj.sender = message.sender; - obj.invariant_module_name = message.invariantModuleName; - obj.invariant_route = message.invariantRoute; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.invariant_module_name = message.invariantModuleName === "" ? undefined : message.invariantModuleName; + obj.invariant_route = message.invariantRoute === "" ? undefined : message.invariantRoute; return obj; }, fromProtoMsg(message: MsgVerifyInvariantProtoMsg, useInterfaces: boolean = true): MsgVerifyInvariant { diff --git a/__fixtures__/v-next/outputv3/cosmos/crypto/hd/v1/hd.ts b/__fixtures__/v-next/outputv3/cosmos/crypto/hd/v1/hd.ts index a88a481782..a92491c4d0 100644 --- a/__fixtures__/v-next/outputv3/cosmos/crypto/hd/v1/hd.ts +++ b/__fixtures__/v-next/outputv3/cosmos/crypto/hd/v1/hd.ts @@ -170,11 +170,11 @@ export const BIP44Params = { }, toAmino(message: BIP44Params, useInterfaces: boolean = true): 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; + obj.purpose = message.purpose === 0 ? undefined : message.purpose; + obj.coin_type = message.coinType === 0 ? undefined : message.coinType; + obj.account = message.account === 0 ? undefined : message.account; + obj.change = message.change === false ? undefined : message.change; + obj.address_index = message.addressIndex === 0 ? undefined : message.addressIndex; return obj; }, fromProtoMsg(message: BIP44ParamsProtoMsg, useInterfaces: boolean = true): BIP44Params { diff --git a/__fixtures__/v-next/outputv3/cosmos/crypto/keyring/v1/record.ts b/__fixtures__/v-next/outputv3/cosmos/crypto/keyring/v1/record.ts index ec1361f76a..7753d92e12 100644 --- a/__fixtures__/v-next/outputv3/cosmos/crypto/keyring/v1/record.ts +++ b/__fixtures__/v-next/outputv3/cosmos/crypto/keyring/v1/record.ts @@ -260,7 +260,7 @@ export const Record = { }, toAmino(message: Record, useInterfaces: boolean = true): RecordAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.pub_key = message.pubKey ? Any.toAmino(message.pubKey, useInterfaces) : undefined; obj.local = message.local ? Record_Local.toAmino(message.local, useInterfaces) : undefined; obj.ledger = message.ledger ? Record_Ledger.toAmino(message.ledger, useInterfaces) : undefined; @@ -364,7 +364,7 @@ export const Record_Local = { toAmino(message: Record_Local, useInterfaces: boolean = true): Record_LocalAmino { const obj: any = {}; obj.priv_key = message.privKey ? Any.toAmino(message.privKey, useInterfaces) : undefined; - obj.priv_key_type = message.privKeyType; + obj.priv_key_type = message.privKeyType === "" ? undefined : message.privKeyType; return obj; }, fromProtoMsg(message: Record_LocalProtoMsg, useInterfaces: boolean = true): Record_Local { diff --git a/__fixtures__/v-next/outputv3/cosmos/crypto/multisig/keys.ts b/__fixtures__/v-next/outputv3/cosmos/crypto/multisig/keys.ts index 5983cf71fd..8e699350c7 100644 --- a/__fixtures__/v-next/outputv3/cosmos/crypto/multisig/keys.ts +++ b/__fixtures__/v-next/outputv3/cosmos/crypto/multisig/keys.ts @@ -119,11 +119,11 @@ export const LegacyAminoPubKey = { }, toAmino(message: LegacyAminoPubKey, useInterfaces: boolean = true): LegacyAminoPubKeyAmino { const obj: any = {}; - obj.threshold = message.threshold; + obj.threshold = message.threshold === 0 ? undefined : message.threshold; if (message.publicKeys) { obj.public_keys = message.publicKeys.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.public_keys = []; + obj.public_keys = message.publicKeys; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/crypto/multisig/v1beta1/multisig.ts b/__fixtures__/v-next/outputv3/cosmos/crypto/multisig/v1beta1/multisig.ts index 4105c7f302..b13eee3990 100644 --- a/__fixtures__/v-next/outputv3/cosmos/crypto/multisig/v1beta1/multisig.ts +++ b/__fixtures__/v-next/outputv3/cosmos/crypto/multisig/v1beta1/multisig.ts @@ -137,7 +137,7 @@ export const MultiSignature = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -234,7 +234,7 @@ export const CompactBitArray = { }, toAmino(message: CompactBitArray, useInterfaces: boolean = true): CompactBitArrayAmino { const obj: any = {}; - obj.extra_bits_stored = message.extraBitsStored; + obj.extra_bits_stored = message.extraBitsStored === 0 ? undefined : message.extraBitsStored; obj.elems = message.elems ? base64FromBytes(message.elems) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/distribution.ts b/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/distribution.ts index 192801ed7e..1213ab682c 100644 --- a/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/distribution.ts +++ b/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/distribution.ts @@ -298,7 +298,7 @@ export interface DelegatorStartingInfoProtoMsg { export interface DelegatorStartingInfoAmino { previous_period?: string; stake?: string; - height?: string; + height: string; } /** * DelegatorStartingInfo represents the starting info for a delegator reward @@ -488,10 +488,10 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): 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; + obj.community_tax = message.communityTax === "" ? undefined : message.communityTax; + obj.base_proposer_reward = message.baseProposerReward === "" ? undefined : message.baseProposerReward; + obj.bonus_proposer_reward = message.bonusProposerReward === "" ? undefined : message.bonusProposerReward; + obj.withdraw_addr_enabled = message.withdrawAddrEnabled === false ? undefined : message.withdrawAddrEnabled; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { @@ -596,9 +596,9 @@ export const ValidatorHistoricalRewards = { if (message.cumulativeRewardRatio) { obj.cumulative_reward_ratio = message.cumulativeRewardRatio.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.cumulative_reward_ratio = []; + obj.cumulative_reward_ratio = message.cumulativeRewardRatio; } - obj.reference_count = message.referenceCount; + obj.reference_count = message.referenceCount === 0 ? undefined : message.referenceCount; return obj; }, fromProtoMsg(message: ValidatorHistoricalRewardsProtoMsg, useInterfaces: boolean = true): ValidatorHistoricalRewards { @@ -705,9 +705,9 @@ export const ValidatorCurrentRewards = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } - obj.period = message.period ? message.period.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; return obj; }, fromProtoMsg(message: ValidatorCurrentRewardsProtoMsg, useInterfaces: boolean = true): ValidatorCurrentRewards { @@ -797,7 +797,7 @@ export const ValidatorAccumulatedCommission = { if (message.commission) { obj.commission = message.commission.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.commission = []; + obj.commission = message.commission; } return obj; }, @@ -888,7 +888,7 @@ export const ValidatorOutstandingRewards = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, @@ -987,8 +987,8 @@ export const ValidatorSlashEvent = { }, toAmino(message: ValidatorSlashEvent, useInterfaces: boolean = true): ValidatorSlashEventAmino { const obj: any = {}; - obj.validator_period = message.validatorPeriod ? message.validatorPeriod.toString() : undefined; - obj.fraction = message.fraction; + obj.validator_period = message.validatorPeriod !== BigInt(0) ? message.validatorPeriod.toString() : undefined; + obj.fraction = message.fraction === "" ? undefined : message.fraction; return obj; }, fromProtoMsg(message: ValidatorSlashEventProtoMsg, useInterfaces: boolean = true): ValidatorSlashEvent { @@ -1078,7 +1078,7 @@ export const ValidatorSlashEvents = { if (message.validatorSlashEvents) { obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEvent.toAmino(e, useInterfaces) : undefined); } else { - obj.validator_slash_events = []; + obj.validator_slash_events = message.validatorSlashEvents; } return obj; }, @@ -1169,7 +1169,7 @@ export const FeePool = { if (message.communityPool) { obj.community_pool = message.communityPool.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.community_pool = []; + obj.community_pool = message.communityPool; } return obj; }, @@ -1302,13 +1302,13 @@ export const CommunityPoolSpendProposal = { }, toAmino(message: CommunityPoolSpendProposal, useInterfaces: boolean = true): CommunityPoolSpendProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.recipient = message.recipient; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.recipient = message.recipient === "" ? undefined : message.recipient; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -1424,9 +1424,9 @@ export const DelegatorStartingInfo = { }, toAmino(message: DelegatorStartingInfo, useInterfaces: boolean = true): 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; + obj.previous_period = message.previousPeriod !== BigInt(0) ? message.previousPeriod.toString() : undefined; + obj.stake = message.stake === "" ? undefined : message.stake; + obj.height = message.height ? message.height.toString() : "0"; return obj; }, fromProtoMsg(message: DelegatorStartingInfoProtoMsg, useInterfaces: boolean = true): DelegatorStartingInfo { @@ -1528,11 +1528,11 @@ export const DelegationDelegatorReward = { }, toAmino(message: DelegationDelegatorReward, useInterfaces: boolean = true): DelegationDelegatorRewardAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.reward) { obj.reward = message.reward.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.reward = []; + obj.reward = message.reward; } return obj; }, @@ -1674,11 +1674,11 @@ export const CommunityPoolSpendProposalWithDeposit = { }, toAmino(message: CommunityPoolSpendProposalWithDeposit, useInterfaces: boolean = true): CommunityPoolSpendProposalWithDepositAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.recipient = message.recipient; - obj.amount = message.amount; - obj.deposit = message.deposit; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.recipient = message.recipient === "" ? undefined : message.recipient; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.deposit = message.deposit === "" ? undefined : message.deposit; return obj; }, fromProtoMsg(message: CommunityPoolSpendProposalWithDepositProtoMsg, useInterfaces: boolean = true): CommunityPoolSpendProposalWithDeposit { diff --git a/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/genesis.ts index b7df22e639..d52acabb4f 100644 --- a/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/genesis.ts @@ -357,8 +357,8 @@ export const DelegatorWithdrawInfo = { }, toAmino(message: DelegatorWithdrawInfo, useInterfaces: boolean = true): DelegatorWithdrawInfoAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.withdraw_address = message.withdrawAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromProtoMsg(message: DelegatorWithdrawInfoProtoMsg, useInterfaces: boolean = true): DelegatorWithdrawInfo { @@ -460,11 +460,11 @@ export const ValidatorOutstandingRewardsRecord = { }, toAmino(message: ValidatorOutstandingRewardsRecord, useInterfaces: boolean = true): ValidatorOutstandingRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.outstandingRewards) { obj.outstanding_rewards = message.outstandingRewards.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.outstanding_rewards = []; + obj.outstanding_rewards = message.outstandingRewards; } return obj; }, @@ -563,7 +563,7 @@ export const ValidatorAccumulatedCommissionRecord = { }, toAmino(message: ValidatorAccumulatedCommissionRecord, useInterfaces: boolean = true): ValidatorAccumulatedCommissionRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.accumulated = message.accumulated ? ValidatorAccumulatedCommission.toAmino(message.accumulated, useInterfaces) : undefined; return obj; }, @@ -679,8 +679,8 @@ export const ValidatorHistoricalRewardsRecord = { }, toAmino(message: ValidatorHistoricalRewardsRecord, useInterfaces: boolean = true): ValidatorHistoricalRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.period = message.period ? message.period.toString() : undefined; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; obj.rewards = message.rewards ? ValidatorHistoricalRewards.toAmino(message.rewards, useInterfaces) : undefined; return obj; }, @@ -779,7 +779,7 @@ export const ValidatorCurrentRewardsRecord = { }, toAmino(message: ValidatorCurrentRewardsRecord, useInterfaces: boolean = true): ValidatorCurrentRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.rewards = message.rewards ? ValidatorCurrentRewards.toAmino(message.rewards, useInterfaces) : undefined; return obj; }, @@ -893,8 +893,8 @@ export const DelegatorStartingInfoRecord = { }, toAmino(message: DelegatorStartingInfoRecord, useInterfaces: boolean = true): DelegatorStartingInfoRecordAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.starting_info = message.startingInfo ? DelegatorStartingInfo.toAmino(message.startingInfo, useInterfaces) : undefined; return obj; }, @@ -1027,9 +1027,9 @@ export const ValidatorSlashEventRecord = { }, toAmino(message: ValidatorSlashEventRecord, useInterfaces: boolean = true): 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_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; obj.validator_slash_event = message.validatorSlashEvent ? ValidatorSlashEvent.toAmino(message.validatorSlashEvent, useInterfaces) : undefined; return obj; }, @@ -1297,38 +1297,38 @@ export const GenesisState = { if (message.delegatorWithdrawInfos) { obj.delegator_withdraw_infos = message.delegatorWithdrawInfos.map(e => e ? DelegatorWithdrawInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.delegator_withdraw_infos = []; + obj.delegator_withdraw_infos = message.delegatorWithdrawInfos; } - obj.previous_proposer = message.previousProposer; + obj.previous_proposer = message.previousProposer === "" ? undefined : message.previousProposer; if (message.outstandingRewards) { obj.outstanding_rewards = message.outstandingRewards.map(e => e ? ValidatorOutstandingRewardsRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.outstanding_rewards = []; + obj.outstanding_rewards = message.outstandingRewards; } if (message.validatorAccumulatedCommissions) { obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions.map(e => e ? ValidatorAccumulatedCommissionRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.validator_accumulated_commissions = []; + obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions; } if (message.validatorHistoricalRewards) { obj.validator_historical_rewards = message.validatorHistoricalRewards.map(e => e ? ValidatorHistoricalRewardsRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.validator_historical_rewards = []; + obj.validator_historical_rewards = message.validatorHistoricalRewards; } if (message.validatorCurrentRewards) { obj.validator_current_rewards = message.validatorCurrentRewards.map(e => e ? ValidatorCurrentRewardsRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.validator_current_rewards = []; + obj.validator_current_rewards = message.validatorCurrentRewards; } if (message.delegatorStartingInfos) { obj.delegator_starting_infos = message.delegatorStartingInfos.map(e => e ? DelegatorStartingInfoRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.delegator_starting_infos = []; + obj.delegator_starting_infos = message.delegatorStartingInfos; } if (message.validatorSlashEvents) { obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEventRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.validator_slash_events = []; + obj.validator_slash_events = message.validatorSlashEvents; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/query.ts index e8e1f2bbe7..ede248d568 100644 --- a/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/query.ts @@ -695,7 +695,7 @@ export const QueryValidatorOutstandingRewardsRequest = { }, toAmino(message: QueryValidatorOutstandingRewardsRequest, useInterfaces: boolean = true): QueryValidatorOutstandingRewardsRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromProtoMsg(message: QueryValidatorOutstandingRewardsRequestProtoMsg, useInterfaces: boolean = true): QueryValidatorOutstandingRewardsRequest { @@ -859,7 +859,7 @@ export const QueryValidatorCommissionRequest = { }, toAmino(message: QueryValidatorCommissionRequest, useInterfaces: boolean = true): QueryValidatorCommissionRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromProtoMsg(message: QueryValidatorCommissionRequestProtoMsg, useInterfaces: boolean = true): QueryValidatorCommissionRequest { @@ -1074,9 +1074,9 @@ export const QueryValidatorSlashesRequest = { }, toAmino(message: QueryValidatorSlashesRequest, useInterfaces: boolean = true): 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.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.starting_height = message.startingHeight !== BigInt(0) ? message.startingHeight.toString() : undefined; + obj.ending_height = message.endingHeight !== BigInt(0) ? message.endingHeight.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1184,7 +1184,7 @@ export const QueryValidatorSlashesResponse = { if (message.slashes) { obj.slashes = message.slashes.map(e => e ? ValidatorSlashEvent.toAmino(e, useInterfaces) : undefined); } else { - obj.slashes = []; + obj.slashes = message.slashes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1282,8 +1282,8 @@ export const QueryDelegationRewardsRequest = { }, toAmino(message: QueryDelegationRewardsRequest, useInterfaces: boolean = true): QueryDelegationRewardsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromProtoMsg(message: QueryDelegationRewardsRequestProtoMsg, useInterfaces: boolean = true): QueryDelegationRewardsRequest { @@ -1373,7 +1373,7 @@ export const QueryDelegationRewardsResponse = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, @@ -1455,7 +1455,7 @@ export const QueryDelegationTotalRewardsRequest = { }, toAmino(message: QueryDelegationTotalRewardsRequest, useInterfaces: boolean = true): QueryDelegationTotalRewardsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromProtoMsg(message: QueryDelegationTotalRewardsRequestProtoMsg, useInterfaces: boolean = true): QueryDelegationTotalRewardsRequest { @@ -1566,12 +1566,12 @@ export const QueryDelegationTotalRewardsResponse = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DelegationDelegatorReward.toAmino(e, useInterfaces) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } if (message.total) { obj.total = message.total.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.total = []; + obj.total = message.total; } return obj; }, @@ -1653,7 +1653,7 @@ export const QueryDelegatorValidatorsRequest = { }, toAmino(message: QueryDelegatorValidatorsRequest, useInterfaces: boolean = true): QueryDelegatorValidatorsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromProtoMsg(message: QueryDelegatorValidatorsRequestProtoMsg, useInterfaces: boolean = true): QueryDelegatorValidatorsRequest { @@ -1743,7 +1743,7 @@ export const QueryDelegatorValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e); } else { - obj.validators = []; + obj.validators = message.validators; } return obj; }, @@ -1825,7 +1825,7 @@ export const QueryDelegatorWithdrawAddressRequest = { }, toAmino(message: QueryDelegatorWithdrawAddressRequest, useInterfaces: boolean = true): QueryDelegatorWithdrawAddressRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromProtoMsg(message: QueryDelegatorWithdrawAddressRequestProtoMsg, useInterfaces: boolean = true): QueryDelegatorWithdrawAddressRequest { @@ -1906,7 +1906,7 @@ export const QueryDelegatorWithdrawAddressResponse = { }, toAmino(message: QueryDelegatorWithdrawAddressResponse, useInterfaces: boolean = true): QueryDelegatorWithdrawAddressResponseAmino { const obj: any = {}; - obj.withdraw_address = message.withdrawAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromProtoMsg(message: QueryDelegatorWithdrawAddressResponseProtoMsg, useInterfaces: boolean = true): QueryDelegatorWithdrawAddressResponse { @@ -2059,7 +2059,7 @@ export const QueryCommunityPoolResponse = { if (message.pool) { obj.pool = message.pool.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.pool = []; + obj.pool = message.pool; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/tx.ts index 7eb74ff0b2..63db9b0507 100644 --- a/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/tx.ts @@ -243,8 +243,8 @@ export const MsgSetWithdrawAddress = { }, toAmino(message: MsgSetWithdrawAddress, useInterfaces: boolean = true): MsgSetWithdrawAddressAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.withdraw_address = message.withdrawAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromProtoMsg(message: MsgSetWithdrawAddressProtoMsg, useInterfaces: boolean = true): MsgSetWithdrawAddress { @@ -403,8 +403,8 @@ export const MsgWithdrawDelegatorReward = { }, toAmino(message: MsgWithdrawDelegatorReward, useInterfaces: boolean = true): MsgWithdrawDelegatorRewardAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromProtoMsg(message: MsgWithdrawDelegatorRewardProtoMsg, useInterfaces: boolean = true): MsgWithdrawDelegatorReward { @@ -494,7 +494,7 @@ export const MsgWithdrawDelegatorRewardResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -576,7 +576,7 @@ export const MsgWithdrawValidatorCommission = { }, toAmino(message: MsgWithdrawValidatorCommission, useInterfaces: boolean = true): MsgWithdrawValidatorCommissionAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromProtoMsg(message: MsgWithdrawValidatorCommissionProtoMsg, useInterfaces: boolean = true): MsgWithdrawValidatorCommission { @@ -666,7 +666,7 @@ export const MsgWithdrawValidatorCommissionResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -772,9 +772,9 @@ export const MsgFundCommunityPool = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.depositor = message.depositor; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromProtoMsg(message: MsgFundCommunityPoolProtoMsg, useInterfaces: boolean = true): MsgFundCommunityPool { diff --git a/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/evidence.ts b/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/evidence.ts index f600f5e8f6..e93e89326f 100644 --- a/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/evidence.ts +++ b/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/evidence.ts @@ -150,10 +150,10 @@ export const Equivocation = { }, toAmino(message: Equivocation, useInterfaces: boolean = true): EquivocationAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.power = message.power ? message.power.toString() : undefined; - obj.consensus_address = message.consensusAddress; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; + obj.consensus_address = message.consensusAddress === "" ? undefined : message.consensusAddress; return obj; }, fromProtoMsg(message: EquivocationProtoMsg, useInterfaces: boolean = true): Equivocation { diff --git a/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/genesis.ts index 501d56d933..dab9c20494 100644 --- a/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/genesis.ts @@ -94,7 +94,7 @@ export const GenesisState = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/query.ts index b451389527..76357948f7 100644 --- a/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/query.ts @@ -436,7 +436,7 @@ export const QueryAllEvidenceResponse = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/tx.ts index f8d32b099b..5a33e4fdbb 100644 --- a/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/tx.ts @@ -133,7 +133,7 @@ export const MsgSubmitEvidence = { }, toAmino(message: MsgSubmitEvidence, useInterfaces: boolean = true): MsgSubmitEvidenceAmino { const obj: any = {}; - obj.submitter = message.submitter; + obj.submitter = message.submitter === "" ? undefined : message.submitter; obj.evidence = message.evidence ? Evidence_ToAmino((message.evidence as Any), useInterfaces) : undefined; return obj; }, @@ -239,7 +239,7 @@ export const Evidence_InterfaceDecoder = (input: BinaryReader | Uint8Array): Any return data; } }; -export const Evidence_FromAmino = (content: AnyAmino) => { +export const Evidence_FromAmino = (content: AnyAmino): Any => { return Any.fromAmino(content); }; export const Evidence_ToAmino = (content: Any, useInterfaces: boolean = true) => { diff --git a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/feegrant.ts index c55d95600a..948a24ec73 100644 --- a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/feegrant.ts +++ b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/feegrant.ts @@ -265,7 +265,7 @@ export const BasicAllowance = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -430,12 +430,12 @@ export const PeriodicAllowance = { if (message.periodSpendLimit) { obj.period_spend_limit = message.periodSpendLimit.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.period_spend_limit = []; + obj.period_spend_limit = message.periodSpendLimit; } if (message.periodCanSpend) { obj.period_can_spend = message.periodCanSpend.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.period_can_spend = []; + obj.period_can_spend = message.periodCanSpend; } obj.period_reset = message.periodReset ? Timestamp.toAmino(toTimestamp(message.periodReset)) : undefined; return obj; @@ -546,7 +546,7 @@ export const AllowedMsgAllowance = { if (message.allowedMessages) { obj.allowed_messages = message.allowedMessages.map(e => e); } else { - obj.allowed_messages = []; + obj.allowed_messages = message.allowedMessages; } return obj; }, @@ -660,8 +660,8 @@ export const Grant = { }, toAmino(message: Grant, useInterfaces: boolean = true): GrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.allowance = message.allowance ? FeeAllowanceI_ToAmino((message.allowance as Any), useInterfaces) : undefined; return obj; }, @@ -692,7 +692,7 @@ export const FeeAllowanceI_InterfaceDecoder = (input: BinaryReader | Uint8Array) return data; } }; -export const FeeAllowanceI_FromAmino = (content: AnyAmino) => { +export const FeeAllowanceI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/BasicAllowance": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/genesis.ts index eb02b219e7..d19f80811b 100644 --- a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e, useInterfaces) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/query.ts index feac871994..0000a499af 100644 --- a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/query.ts @@ -212,8 +212,8 @@ export const QueryAllowanceRequest = { }, toAmino(message: QueryAllowanceRequest, useInterfaces: boolean = true): QueryAllowanceRequestAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; return obj; }, fromProtoMsg(message: QueryAllowanceRequestProtoMsg, useInterfaces: boolean = true): QueryAllowanceRequest { @@ -394,7 +394,7 @@ export const QueryAllowancesRequest = { }, toAmino(message: QueryAllowancesRequest, useInterfaces: boolean = true): QueryAllowancesRequestAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -502,7 +502,7 @@ export const QueryAllowancesResponse = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e, useInterfaces) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -602,7 +602,7 @@ export const QueryAllowancesByGranterRequest = { }, toAmino(message: QueryAllowancesByGranterRequest, useInterfaces: boolean = true): QueryAllowancesByGranterRequestAmino { const obj: any = {}; - obj.granter = message.granter; + obj.granter = message.granter === "" ? undefined : message.granter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -710,7 +710,7 @@ export const QueryAllowancesByGranterResponse = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e, useInterfaces) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/tx.ts index c388e245a7..96ca706231 100644 --- a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/tx.ts @@ -183,8 +183,8 @@ export const MsgGrantAllowance = { }, toAmino(message: MsgGrantAllowance, useInterfaces: boolean = true): MsgGrantAllowanceAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.allowance = message.allowance ? FeeAllowanceI_ToAmino((message.allowance as Any), useInterfaces) : undefined; return obj; }, @@ -344,8 +344,8 @@ export const MsgRevokeAllowance = { }, toAmino(message: MsgRevokeAllowance, useInterfaces: boolean = true): MsgRevokeAllowanceAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; return obj; }, fromProtoMsg(message: MsgRevokeAllowanceProtoMsg, useInterfaces: boolean = true): MsgRevokeAllowance { @@ -438,7 +438,7 @@ export const FeeAllowanceI_InterfaceDecoder = (input: BinaryReader | Uint8Array) return data; } }; -export const FeeAllowanceI_FromAmino = (content: AnyAmino) => { +export const FeeAllowanceI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/BasicAllowance": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv3/cosmos/genutil/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/genutil/v1beta1/genesis.ts index fc4a5b7c97..22abaf1b56 100644 --- a/__fixtures__/v-next/outputv3/cosmos/genutil/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/genutil/v1beta1/genesis.ts @@ -13,7 +13,7 @@ export interface GenesisStateProtoMsg { /** GenesisState defines the raw genesis transaction in JSON. */ export interface GenesisStateAmino { /** gen_txs defines the genesis transactions. */ - gen_txs?: string[]; + gen_txs: string[]; } /** GenesisState defines the raw genesis transaction in JSON. */ export interface GenesisStateSDKType { @@ -93,7 +93,7 @@ export const GenesisState = { if (message.genTxs) { obj.gen_txs = message.genTxs.map(e => base64FromBytes(e)); } else { - obj.gen_txs = []; + obj.gen_txs = message.genTxs; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1/genesis.ts index 73d6c8db7b..cae0b5b949 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1/genesis.ts @@ -231,21 +231,21 @@ export const GenesisState = { }, toAmino(message: GenesisState, useInterfaces: boolean = true): GenesisStateAmino { const obj: any = {}; - obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + obj.starting_proposal_id = message.startingProposalId !== BigInt(0) ? message.startingProposalId.toString() : undefined; if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e, useInterfaces) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e, useInterfaces) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e, useInterfaces) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams, useInterfaces) : undefined; obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams, useInterfaces) : undefined; diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1/gov.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1/gov.ts index b9d9dc4729..6e83da37d3 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1/gov.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1/gov.ts @@ -463,7 +463,7 @@ export const WeightedVoteOption = { fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { const message = createBaseWeightedVoteOption(); if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.weight !== undefined && object.weight !== null) { message.weight = object.weight; @@ -472,8 +472,8 @@ export const WeightedVoteOption = { }, toAmino(message: WeightedVoteOption, useInterfaces: boolean = true): WeightedVoteOptionAmino { const obj: any = {}; - obj.option = message.option; - obj.weight = message.weight; + obj.option = message.option === 0 ? undefined : message.option; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromProtoMsg(message: WeightedVoteOptionProtoMsg, useInterfaces: boolean = true): WeightedVoteOption { @@ -592,12 +592,12 @@ export const Deposit = { }, toAmino(message: Deposit, useInterfaces: boolean = true): DepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -805,7 +805,7 @@ export const Proposal = { } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -830,24 +830,24 @@ export const Proposal = { }, toAmino(message: Proposal, useInterfaces: boolean = true): ProposalAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.status = message.status; + obj.status = message.status === 0 ? undefined : message.status; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult, useInterfaces) : undefined; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined; if (message.totalDeposit) { obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.total_deposit = []; + obj.total_deposit = message.totalDeposit; } obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined; obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined; - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromProtoMsg(message: ProposalProtoMsg, useInterfaces: boolean = true): Proposal { @@ -973,10 +973,10 @@ export const TallyResult = { }, toAmino(message: TallyResult, useInterfaces: boolean = true): 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; + obj.yes_count = message.yesCount === "" ? undefined : message.yesCount; + obj.abstain_count = message.abstainCount === "" ? undefined : message.abstainCount; + obj.no_count = message.noCount === "" ? undefined : message.noCount; + obj.no_with_veto_count = message.noWithVetoCount === "" ? undefined : message.noWithVetoCount; return obj; }, fromProtoMsg(message: TallyResultProtoMsg, useInterfaces: boolean = true): TallyResult { @@ -1110,14 +1110,14 @@ export const Vote = { }, toAmino(message: Vote, useInterfaces: boolean = true): VoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e, useInterfaces) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromProtoMsg(message: VoteProtoMsg, useInterfaces: boolean = true): Vote { @@ -1224,7 +1224,7 @@ export const DepositParams = { if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod, useInterfaces) : undefined; return obj; @@ -1420,9 +1420,9 @@ export const TallyParams = { }, toAmino(message: TallyParams, useInterfaces: boolean = true): TallyParamsAmino { const obj: any = {}; - obj.quorum = message.quorum; - obj.threshold = message.threshold; - obj.veto_threshold = message.vetoThreshold; + obj.quorum = message.quorum === "" ? undefined : message.quorum; + obj.threshold = message.threshold === "" ? undefined : message.threshold; + obj.veto_threshold = message.vetoThreshold === "" ? undefined : message.vetoThreshold; return obj; }, fromProtoMsg(message: TallyParamsProtoMsg, useInterfaces: boolean = true): TallyParams { diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1/query.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1/query.ts index 467d2e0b37..3494f3d99c 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1/query.ts @@ -427,7 +427,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest, useInterfaces: boolean = true): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryProposalRequestProtoMsg, useInterfaces: boolean = true): QueryProposalRequest { @@ -623,7 +623,7 @@ export const QueryProposalsRequest = { fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { const message = createBaseQueryProposalsRequest(); if (object.proposal_status !== undefined && object.proposal_status !== null) { - message.proposalStatus = proposalStatusFromJSON(object.proposal_status); + message.proposalStatus = object.proposal_status; } if (object.voter !== undefined && object.voter !== null) { message.voter = object.voter; @@ -638,9 +638,9 @@ export const QueryProposalsRequest = { }, toAmino(message: QueryProposalsRequest, useInterfaces: boolean = true): QueryProposalsRequestAmino { const obj: any = {}; - obj.proposal_status = message.proposalStatus; - obj.voter = message.voter; - obj.depositor = message.depositor; + obj.proposal_status = message.proposalStatus === 0 ? undefined : message.proposalStatus; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.depositor = message.depositor === "" ? undefined : message.depositor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -748,7 +748,7 @@ export const QueryProposalsResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e, useInterfaces) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -848,8 +848,8 @@ export const QueryVoteRequest = { }, toAmino(message: QueryVoteRequest, useInterfaces: boolean = true): QueryVoteRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromProtoMsg(message: QueryVoteRequestProtoMsg, useInterfaces: boolean = true): QueryVoteRequest { @@ -1032,7 +1032,7 @@ export const QueryVotesRequest = { }, toAmino(message: QueryVotesRequest, useInterfaces: boolean = true): QueryVotesRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1140,7 +1140,7 @@ export const QueryVotesResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e, useInterfaces) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1223,7 +1223,7 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest, useInterfaces: boolean = true): QueryParamsRequestAmino { const obj: any = {}; - obj.params_type = message.paramsType; + obj.params_type = message.paramsType === "" ? undefined : message.paramsType; return obj; }, fromProtoMsg(message: QueryParamsRequestProtoMsg, useInterfaces: boolean = true): QueryParamsRequest { @@ -1440,8 +1440,8 @@ export const QueryDepositRequest = { }, toAmino(message: QueryDepositRequest, useInterfaces: boolean = true): QueryDepositRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromProtoMsg(message: QueryDepositRequestProtoMsg, useInterfaces: boolean = true): QueryDepositRequest { @@ -1624,7 +1624,7 @@ export const QueryDepositsRequest = { }, toAmino(message: QueryDepositsRequest, useInterfaces: boolean = true): QueryDepositsRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1732,7 +1732,7 @@ export const QueryDepositsResponse = { if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e, useInterfaces) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1817,7 +1817,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest, useInterfaces: boolean = true): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryTallyResultRequestProtoMsg, useInterfaces: boolean = true): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1/tx.ts index cf9088b3aa..4300b59b9d 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1/tx.ts @@ -123,7 +123,7 @@ export interface MsgVoteProtoMsg { } /** MsgVote defines a message to cast a vote. */ export interface MsgVoteAmino { - proposal_id?: string; + proposal_id: string; voter?: string; option?: VoteOption; metadata?: string; @@ -158,7 +158,7 @@ export interface MsgVoteWeightedProtoMsg { } /** MsgVoteWeighted defines a message to cast a vote. */ export interface MsgVoteWeightedAmino { - proposal_id?: string; + proposal_id: string; voter?: string; options?: WeightedVoteOptionAmino[]; metadata?: string; @@ -192,7 +192,7 @@ export interface MsgDepositProtoMsg { } /** MsgDeposit defines a message to submit a deposit to an existing proposal. */ export interface MsgDepositAmino { - proposal_id?: string; + proposal_id: string; depositor?: string; amount?: CoinAmino[]; } @@ -337,15 +337,15 @@ export const MsgSubmitProposal = { if (message.messages) { obj.messages = message.messages.map(e => e ? ProposalContentI_ToAmino((e as Any), useInterfaces) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; - obj.metadata = message.metadata; + obj.proposer = message.proposer === "" ? undefined : message.proposer; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromProtoMsg(message: MsgSubmitProposalProtoMsg, useInterfaces: boolean = true): MsgSubmitProposal { @@ -428,7 +428,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse, useInterfaces: boolean = true): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromProtoMsg(message: MsgSubmitProposalResponseProtoMsg, useInterfaces: boolean = true): MsgSubmitProposalResponse { @@ -527,7 +527,7 @@ export const MsgExecLegacyContent = { toAmino(message: MsgExecLegacyContent, useInterfaces: boolean = true): MsgExecLegacyContentAmino { const obj: any = {}; obj.content = message.content ? ProposalContentI_ToAmino((message.content as Any), useInterfaces) : undefined; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; return obj; }, fromProtoMsg(message: MsgExecLegacyContentProtoMsg, useInterfaces: boolean = true): MsgExecLegacyContent { @@ -709,7 +709,7 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; @@ -718,10 +718,10 @@ export const MsgVote = { }, toAmino(message: MsgVote, useInterfaces: boolean = true): 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.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromProtoMsg(message: MsgVoteProtoMsg, useInterfaces: boolean = true): MsgVote { @@ -918,14 +918,14 @@ export const MsgVoteWeighted = { }, toAmino(message: MsgVoteWeighted, useInterfaces: boolean = true): MsgVoteWeightedAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e, useInterfaces) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromProtoMsg(message: MsgVoteWeightedProtoMsg, useInterfaces: boolean = true): MsgVoteWeighted { @@ -1107,12 +1107,12 @@ export const MsgDeposit = { }, toAmino(message: MsgDeposit, useInterfaces: boolean = true): MsgDepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -1220,7 +1220,7 @@ export const ProposalContentI_InterfaceDecoder = (input: BinaryReader | Uint8Arr return data; } }; -export const ProposalContentI_FromAmino = (content: AnyAmino) => { +export const ProposalContentI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/v1/TextProposal": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/genesis.ts index 6606e0f775..b16de625c1 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/genesis.ts @@ -231,21 +231,21 @@ export const GenesisState = { }, toAmino(message: GenesisState, useInterfaces: boolean = true): GenesisStateAmino { const obj: any = {}; - obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + obj.starting_proposal_id = message.startingProposalId !== BigInt(0) ? message.startingProposalId.toString() : undefined; if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e, useInterfaces) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e, useInterfaces) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e, useInterfaces) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams, useInterfaces) : undefined; obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams, useInterfaces) : undefined; diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/gov.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/gov.ts index 65a1a6849d..b4009e0950 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/gov.ts @@ -341,7 +341,7 @@ export interface VoteProtoMsg { * A Vote consists of a proposal ID, the voter, and the vote option. */ export interface VoteAmino { - proposal_id?: string; + proposal_id: string; voter?: string; /** * Deprecated: Prefer to use `options` instead. This field is set in queries @@ -522,7 +522,7 @@ export const WeightedVoteOption = { fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { const message = createBaseWeightedVoteOption(); if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.weight !== undefined && object.weight !== null) { message.weight = object.weight; @@ -531,8 +531,8 @@ export const WeightedVoteOption = { }, toAmino(message: WeightedVoteOption, useInterfaces: boolean = true): WeightedVoteOptionAmino { const obj: any = {}; - obj.option = message.option; - obj.weight = message.weight; + obj.option = message.option === 0 ? undefined : message.option; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromProtoMsg(message: WeightedVoteOptionProtoMsg, useInterfaces: boolean = true): WeightedVoteOption { @@ -629,8 +629,8 @@ export const TextProposal = { }, toAmino(message: TextProposal, useInterfaces: boolean = true): TextProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromProtoMsg(message: TextProposalProtoMsg, useInterfaces: boolean = true): TextProposal { @@ -749,12 +749,12 @@ export const Deposit = { }, toAmino(message: Deposit, useInterfaces: boolean = true): DepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -946,7 +946,7 @@ export const Proposal = { message.content = ProposalContentI_FromAmino(object.content); } if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -968,16 +968,16 @@ export const Proposal = { }, toAmino(message: Proposal, useInterfaces: boolean = true): ProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.content = message.content ? ProposalContentI_ToAmino((message.content as Any), useInterfaces) : undefined; - obj.status = message.status; + obj.status = message.status === 0 ? undefined : message.status; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult, useInterfaces) : undefined; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined; if (message.totalDeposit) { obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.total_deposit = []; + obj.total_deposit = message.totalDeposit; } obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined; obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined; @@ -1106,10 +1106,10 @@ export const TallyResult = { }, toAmino(message: TallyResult, useInterfaces: boolean = true): TallyResultAmino { const obj: any = {}; - obj.yes = message.yes; - obj.abstain = message.abstain; - obj.no = message.no; - obj.no_with_veto = message.noWithVeto; + obj.yes = message.yes === "" ? undefined : message.yes; + obj.abstain = message.abstain === "" ? undefined : message.abstain; + obj.no = message.no === "" ? undefined : message.no; + obj.no_with_veto = message.noWithVeto === "" ? undefined : message.noWithVeto; return obj; }, fromProtoMsg(message: TallyResultProtoMsg, useInterfaces: boolean = true): TallyResult { @@ -1236,20 +1236,20 @@ export const Vote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } message.options = object.options?.map(e => WeightedVoteOption.fromAmino(e)) || []; return message; }, toAmino(message: Vote, useInterfaces: boolean = true): VoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; - obj.option = message.option; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e, useInterfaces) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -1357,7 +1357,7 @@ export const DepositParams = { if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod, useInterfaces) : undefined; return obj; @@ -1599,7 +1599,7 @@ export const ProposalContentI_InterfaceDecoder = (input: BinaryReader | Uint8Arr return data; } }; -export const ProposalContentI_FromAmino = (content: AnyAmino) => { +export const ProposalContentI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/TextProposal": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/query.ts index 075da0461e..9cc0c43b47 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/query.ts @@ -427,7 +427,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest, useInterfaces: boolean = true): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryProposalRequestProtoMsg, useInterfaces: boolean = true): QueryProposalRequest { @@ -623,7 +623,7 @@ export const QueryProposalsRequest = { fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { const message = createBaseQueryProposalsRequest(); if (object.proposal_status !== undefined && object.proposal_status !== null) { - message.proposalStatus = proposalStatusFromJSON(object.proposal_status); + message.proposalStatus = object.proposal_status; } if (object.voter !== undefined && object.voter !== null) { message.voter = object.voter; @@ -638,9 +638,9 @@ export const QueryProposalsRequest = { }, toAmino(message: QueryProposalsRequest, useInterfaces: boolean = true): QueryProposalsRequestAmino { const obj: any = {}; - obj.proposal_status = message.proposalStatus; - obj.voter = message.voter; - obj.depositor = message.depositor; + obj.proposal_status = message.proposalStatus === 0 ? undefined : message.proposalStatus; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.depositor = message.depositor === "" ? undefined : message.depositor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -748,7 +748,7 @@ export const QueryProposalsResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e, useInterfaces) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -848,8 +848,8 @@ export const QueryVoteRequest = { }, toAmino(message: QueryVoteRequest, useInterfaces: boolean = true): QueryVoteRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromProtoMsg(message: QueryVoteRequestProtoMsg, useInterfaces: boolean = true): QueryVoteRequest { @@ -1032,7 +1032,7 @@ export const QueryVotesRequest = { }, toAmino(message: QueryVotesRequest, useInterfaces: boolean = true): QueryVotesRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1140,7 +1140,7 @@ export const QueryVotesResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e, useInterfaces) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1223,7 +1223,7 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest, useInterfaces: boolean = true): QueryParamsRequestAmino { const obj: any = {}; - obj.params_type = message.paramsType; + obj.params_type = message.paramsType === "" ? undefined : message.paramsType; return obj; }, fromProtoMsg(message: QueryParamsRequestProtoMsg, useInterfaces: boolean = true): QueryParamsRequest { @@ -1440,8 +1440,8 @@ export const QueryDepositRequest = { }, toAmino(message: QueryDepositRequest, useInterfaces: boolean = true): QueryDepositRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromProtoMsg(message: QueryDepositRequestProtoMsg, useInterfaces: boolean = true): QueryDepositRequest { @@ -1624,7 +1624,7 @@ export const QueryDepositsRequest = { }, toAmino(message: QueryDepositsRequest, useInterfaces: boolean = true): QueryDepositsRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1732,7 +1732,7 @@ export const QueryDepositsResponse = { if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e, useInterfaces) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1817,7 +1817,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest, useInterfaces: boolean = true): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryTallyResultRequestProtoMsg, useInterfaces: boolean = true): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/tx.ts index 231ebd6407..482c332e6f 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/tx.ts @@ -53,7 +53,7 @@ export interface MsgSubmitProposalResponseProtoMsg { } /** MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. */ export interface MsgSubmitProposalResponseAmino { - proposal_id?: string; + proposal_id: string; } /** MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. */ export interface MsgSubmitProposalResponseSDKType { @@ -111,7 +111,7 @@ export interface MsgVoteWeightedProtoMsg { * Since: cosmos-sdk 0.43 */ export interface MsgVoteWeightedAmino { - proposal_id?: string; + proposal_id: string; voter?: string; options?: WeightedVoteOptionAmino[]; } @@ -159,7 +159,7 @@ export interface MsgDepositProtoMsg { } /** MsgDeposit defines a message to submit a deposit to an existing proposal. */ export interface MsgDepositAmino { - proposal_id?: string; + proposal_id: string; depositor?: string; amount?: CoinAmino[]; } @@ -286,9 +286,9 @@ export const MsgSubmitProposal = { if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; + obj.proposer = message.proposer === "" ? undefined : message.proposer; return obj; }, fromProtoMsg(message: MsgSubmitProposalProtoMsg, useInterfaces: boolean = true): MsgSubmitProposal { @@ -371,7 +371,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse, useInterfaces: boolean = true): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; return obj; }, fromProtoMsg(message: MsgSubmitProposalResponseProtoMsg, useInterfaces: boolean = true): MsgSubmitProposalResponse { @@ -478,15 +478,15 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } return message; }, toAmino(message: MsgVote, useInterfaces: boolean = true): MsgVoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; - obj.option = message.option; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; return obj; }, fromProtoMsg(message: MsgVoteProtoMsg, useInterfaces: boolean = true): MsgVote { @@ -668,12 +668,12 @@ export const MsgVoteWeighted = { }, toAmino(message: MsgVoteWeighted, useInterfaces: boolean = true): MsgVoteWeightedAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e, useInterfaces) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -856,12 +856,12 @@ export const MsgDeposit = { }, toAmino(message: MsgDeposit, useInterfaces: boolean = true): MsgDepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -969,7 +969,7 @@ export const ProposalContentI_InterfaceDecoder = (input: BinaryReader | Uint8Arr return data; } }; -export const ProposalContentI_FromAmino = (content: AnyAmino) => { +export const ProposalContentI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/TextProposal": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv3/cosmos/group/v1/events.ts b/__fixtures__/v-next/outputv3/cosmos/group/v1/events.ts index c1cb2075e9..da0d9a6fb7 100644 --- a/__fixtures__/v-next/outputv3/cosmos/group/v1/events.ts +++ b/__fixtures__/v-next/outputv3/cosmos/group/v1/events.ts @@ -241,7 +241,7 @@ export const EventCreateGroup = { }, toAmino(message: EventCreateGroup, useInterfaces: boolean = true): EventCreateGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromProtoMsg(message: EventCreateGroupProtoMsg, useInterfaces: boolean = true): EventCreateGroup { @@ -324,7 +324,7 @@ export const EventUpdateGroup = { }, toAmino(message: EventUpdateGroup, useInterfaces: boolean = true): EventUpdateGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromProtoMsg(message: EventUpdateGroupProtoMsg, useInterfaces: boolean = true): EventUpdateGroup { @@ -405,7 +405,7 @@ export const EventCreateGroupPolicy = { }, toAmino(message: EventCreateGroupPolicy, useInterfaces: boolean = true): EventCreateGroupPolicyAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: EventCreateGroupPolicyProtoMsg, useInterfaces: boolean = true): EventCreateGroupPolicy { @@ -486,7 +486,7 @@ export const EventUpdateGroupPolicy = { }, toAmino(message: EventUpdateGroupPolicy, useInterfaces: boolean = true): EventUpdateGroupPolicyAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: EventUpdateGroupPolicyProtoMsg, useInterfaces: boolean = true): EventUpdateGroupPolicy { @@ -569,7 +569,7 @@ export const EventSubmitProposal = { }, toAmino(message: EventSubmitProposal, useInterfaces: boolean = true): EventSubmitProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromProtoMsg(message: EventSubmitProposalProtoMsg, useInterfaces: boolean = true): EventSubmitProposal { @@ -652,7 +652,7 @@ export const EventWithdrawProposal = { }, toAmino(message: EventWithdrawProposal, useInterfaces: boolean = true): EventWithdrawProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromProtoMsg(message: EventWithdrawProposalProtoMsg, useInterfaces: boolean = true): EventWithdrawProposal { @@ -735,7 +735,7 @@ export const EventVote = { }, toAmino(message: EventVote, useInterfaces: boolean = true): EventVoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromProtoMsg(message: EventVoteProtoMsg, useInterfaces: boolean = true): EventVote { @@ -827,14 +827,14 @@ export const EventExec = { message.proposalId = BigInt(object.proposal_id); } if (object.result !== undefined && object.result !== null) { - message.result = proposalExecutorResultFromJSON(object.result); + message.result = object.result; } return message; }, toAmino(message: EventExec, useInterfaces: boolean = true): EventExecAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.result = message.result; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.result = message.result === 0 ? undefined : message.result; return obj; }, fromProtoMsg(message: EventExecProtoMsg, useInterfaces: boolean = true): EventExec { @@ -932,8 +932,8 @@ export const EventLeaveGroup = { }, toAmino(message: EventLeaveGroup, useInterfaces: boolean = true): EventLeaveGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.address = message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: EventLeaveGroupProtoMsg, useInterfaces: boolean = true): EventLeaveGroup { diff --git a/__fixtures__/v-next/outputv3/cosmos/group/v1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/group/v1/genesis.ts index 2cc5ce6f35..1234902b9d 100644 --- a/__fixtures__/v-next/outputv3/cosmos/group/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/group/v1/genesis.ts @@ -279,33 +279,33 @@ export const GenesisState = { }, toAmino(message: GenesisState, useInterfaces: boolean = true): GenesisStateAmino { const obj: any = {}; - obj.group_seq = message.groupSeq ? message.groupSeq.toString() : undefined; + obj.group_seq = message.groupSeq !== BigInt(0) ? message.groupSeq.toString() : undefined; if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } if (message.groupMembers) { obj.group_members = message.groupMembers.map(e => e ? GroupMember.toAmino(e, useInterfaces) : undefined); } else { - obj.group_members = []; + obj.group_members = message.groupMembers; } - obj.group_policy_seq = message.groupPolicySeq ? message.groupPolicySeq.toString() : undefined; + obj.group_policy_seq = message.groupPolicySeq !== BigInt(0) ? message.groupPolicySeq.toString() : undefined; if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } - obj.proposal_seq = message.proposalSeq ? message.proposalSeq.toString() : undefined; + obj.proposal_seq = message.proposalSeq !== BigInt(0) ? message.proposalSeq.toString() : undefined; if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e, useInterfaces) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e, useInterfaces) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/group/v1/query.ts b/__fixtures__/v-next/outputv3/cosmos/group/v1/query.ts index 2586cc80b7..791063eddd 100644 --- a/__fixtures__/v-next/outputv3/cosmos/group/v1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/group/v1/query.ts @@ -623,7 +623,7 @@ export const QueryGroupInfoRequest = { }, toAmino(message: QueryGroupInfoRequest, useInterfaces: boolean = true): QueryGroupInfoRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryGroupInfoRequestProtoMsg, useInterfaces: boolean = true): QueryGroupInfoRequest { @@ -787,7 +787,7 @@ export const QueryGroupPolicyInfoRequest = { }, toAmino(message: QueryGroupPolicyInfoRequest, useInterfaces: boolean = true): QueryGroupPolicyInfoRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: QueryGroupPolicyInfoRequestProtoMsg, useInterfaces: boolean = true): QueryGroupPolicyInfoRequest { @@ -970,7 +970,7 @@ export const QueryGroupMembersRequest = { }, toAmino(message: QueryGroupMembersRequest, useInterfaces: boolean = true): QueryGroupMembersRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1078,7 +1078,7 @@ export const QueryGroupMembersResponse = { if (message.members) { obj.members = message.members.map(e => e ? GroupMember.toAmino(e, useInterfaces) : undefined); } else { - obj.members = []; + obj.members = message.members; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1178,7 +1178,7 @@ export const QueryGroupsByAdminRequest = { }, toAmino(message: QueryGroupsByAdminRequest, useInterfaces: boolean = true): QueryGroupsByAdminRequestAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1286,7 +1286,7 @@ export const QueryGroupsByAdminResponse = { if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1388,7 +1388,7 @@ export const QueryGroupPoliciesByGroupRequest = { }, toAmino(message: QueryGroupPoliciesByGroupRequest, useInterfaces: boolean = true): QueryGroupPoliciesByGroupRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1496,7 +1496,7 @@ export const QueryGroupPoliciesByGroupResponse = { if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1596,7 +1596,7 @@ export const QueryGroupPoliciesByAdminRequest = { }, toAmino(message: QueryGroupPoliciesByAdminRequest, useInterfaces: boolean = true): QueryGroupPoliciesByAdminRequestAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1704,7 +1704,7 @@ export const QueryGroupPoliciesByAdminResponse = { if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1789,7 +1789,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest, useInterfaces: boolean = true): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryProposalRequestProtoMsg, useInterfaces: boolean = true): QueryProposalRequest { @@ -1970,7 +1970,7 @@ export const QueryProposalsByGroupPolicyRequest = { }, toAmino(message: QueryProposalsByGroupPolicyRequest, useInterfaces: boolean = true): QueryProposalsByGroupPolicyRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -2078,7 +2078,7 @@ export const QueryProposalsByGroupPolicyResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e, useInterfaces) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -2178,8 +2178,8 @@ export const QueryVoteByProposalVoterRequest = { }, toAmino(message: QueryVoteByProposalVoterRequest, useInterfaces: boolean = true): QueryVoteByProposalVoterRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromProtoMsg(message: QueryVoteByProposalVoterRequestProtoMsg, useInterfaces: boolean = true): QueryVoteByProposalVoterRequest { @@ -2362,7 +2362,7 @@ export const QueryVotesByProposalRequest = { }, toAmino(message: QueryVotesByProposalRequest, useInterfaces: boolean = true): QueryVotesByProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -2470,7 +2470,7 @@ export const QueryVotesByProposalResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e, useInterfaces) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -2570,7 +2570,7 @@ export const QueryVotesByVoterRequest = { }, toAmino(message: QueryVotesByVoterRequest, useInterfaces: boolean = true): QueryVotesByVoterRequestAmino { const obj: any = {}; - obj.voter = message.voter; + obj.voter = message.voter === "" ? undefined : message.voter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -2678,7 +2678,7 @@ export const QueryVotesByVoterResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e, useInterfaces) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -2778,7 +2778,7 @@ export const QueryGroupsByMemberRequest = { }, toAmino(message: QueryGroupsByMemberRequest, useInterfaces: boolean = true): QueryGroupsByMemberRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -2886,7 +2886,7 @@ export const QueryGroupsByMemberResponse = { if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -2971,7 +2971,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest, useInterfaces: boolean = true): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryTallyResultRequestProtoMsg, useInterfaces: boolean = true): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputv3/cosmos/group/v1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/group/v1/tx.ts index 137d4f4227..df4b60d366 100644 --- a/__fixtures__/v-next/outputv3/cosmos/group/v1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/group/v1/tx.ts @@ -776,13 +776,13 @@ export const MsgCreateGroup = { }, toAmino(message: MsgCreateGroup, useInterfaces: boolean = true): MsgCreateGroupAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e, useInterfaces) : undefined); } else { - obj.members = []; + obj.members = message.members; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromProtoMsg(message: MsgCreateGroupProtoMsg, useInterfaces: boolean = true): MsgCreateGroup { @@ -865,7 +865,7 @@ export const MsgCreateGroupResponse = { }, toAmino(message: MsgCreateGroupResponse, useInterfaces: boolean = true): MsgCreateGroupResponseAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromProtoMsg(message: MsgCreateGroupResponseProtoMsg, useInterfaces: boolean = true): MsgCreateGroupResponse { @@ -984,12 +984,12 @@ export const MsgUpdateGroupMembers = { }, toAmino(message: MsgUpdateGroupMembers, useInterfaces: boolean = true): MsgUpdateGroupMembersAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; if (message.memberUpdates) { obj.member_updates = message.memberUpdates.map(e => e ? Member.toAmino(e, useInterfaces) : undefined); } else { - obj.member_updates = []; + obj.member_updates = message.memberUpdates; } return obj; }, @@ -1166,9 +1166,9 @@ export const MsgUpdateGroupAdmin = { }, toAmino(message: MsgUpdateGroupAdmin, useInterfaces: boolean = true): MsgUpdateGroupAdminAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.new_admin = message.newAdmin; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromProtoMsg(message: MsgUpdateGroupAdminProtoMsg, useInterfaces: boolean = true): MsgUpdateGroupAdmin { @@ -1344,9 +1344,9 @@ export const MsgUpdateGroupMetadata = { }, toAmino(message: MsgUpdateGroupMetadata, useInterfaces: boolean = true): MsgUpdateGroupMetadataAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromProtoMsg(message: MsgUpdateGroupMetadataProtoMsg, useInterfaces: boolean = true): MsgUpdateGroupMetadata { @@ -1539,9 +1539,9 @@ export const MsgCreateGroupPolicy = { }, toAmino(message: MsgCreateGroupPolicy, useInterfaces: boolean = true): MsgCreateGroupPolicyAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.decision_policy = message.decisionPolicy ? DecisionPolicy_ToAmino((message.decisionPolicy as Any), useInterfaces) : undefined; return obj; }, @@ -1623,7 +1623,7 @@ export const MsgCreateGroupPolicyResponse = { }, toAmino(message: MsgCreateGroupPolicyResponse, useInterfaces: boolean = true): MsgCreateGroupPolicyResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: MsgCreateGroupPolicyResponseProtoMsg, useInterfaces: boolean = true): MsgCreateGroupPolicyResponse { @@ -1734,9 +1734,9 @@ export const MsgUpdateGroupPolicyAdmin = { }, toAmino(message: MsgUpdateGroupPolicyAdmin, useInterfaces: boolean = true): MsgUpdateGroupPolicyAdminAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; - obj.new_admin = message.newAdmin; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromProtoMsg(message: MsgUpdateGroupPolicyAdminProtoMsg, useInterfaces: boolean = true): MsgUpdateGroupPolicyAdmin { @@ -1900,15 +1900,15 @@ export const MsgCreateGroupWithPolicy = { }, toAmino(message: MsgCreateGroupWithPolicy, useInterfaces: boolean = true): MsgCreateGroupWithPolicyAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e, useInterfaces) : undefined); } else { - obj.members = []; + obj.members = message.members; } - obj.group_metadata = message.groupMetadata; - obj.group_policy_metadata = message.groupPolicyMetadata; - obj.group_policy_as_admin = message.groupPolicyAsAdmin; + obj.group_metadata = message.groupMetadata === "" ? undefined : message.groupMetadata; + obj.group_policy_metadata = message.groupPolicyMetadata === "" ? undefined : message.groupPolicyMetadata; + obj.group_policy_as_admin = message.groupPolicyAsAdmin === false ? undefined : message.groupPolicyAsAdmin; obj.decision_policy = message.decisionPolicy ? DecisionPolicy_ToAmino((message.decisionPolicy as Any), useInterfaces) : undefined; return obj; }, @@ -2007,8 +2007,8 @@ export const MsgCreateGroupWithPolicyResponse = { }, toAmino(message: MsgCreateGroupWithPolicyResponse, useInterfaces: boolean = true): MsgCreateGroupWithPolicyResponseAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.group_policy_address = message.groupPolicyAddress; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.group_policy_address = message.groupPolicyAddress === "" ? undefined : message.groupPolicyAddress; return obj; }, fromProtoMsg(message: MsgCreateGroupWithPolicyResponseProtoMsg, useInterfaces: boolean = true): MsgCreateGroupWithPolicyResponse { @@ -2184,8 +2184,8 @@ export const MsgUpdateGroupPolicyDecisionPolicy = { }, toAmino(message: MsgUpdateGroupPolicyDecisionPolicy, useInterfaces: boolean = true): MsgUpdateGroupPolicyDecisionPolicyAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; obj.decision_policy = message.decisionPolicy ? DecisionPolicy_ToAmino((message.decisionPolicy as Any), useInterfaces) : undefined; return obj; }, @@ -2360,9 +2360,9 @@ export const MsgUpdateGroupPolicyMetadata = { }, toAmino(message: MsgUpdateGroupPolicyMetadata, useInterfaces: boolean = true): MsgUpdateGroupPolicyMetadataAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromProtoMsg(message: MsgUpdateGroupPolicyMetadataProtoMsg, useInterfaces: boolean = true): MsgUpdateGroupPolicyMetadata { @@ -2572,25 +2572,25 @@ export const MsgSubmitProposal = { } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; if (object.exec !== undefined && object.exec !== null) { - message.exec = execFromJSON(object.exec); + message.exec = object.exec; } return message; }, toAmino(message: MsgSubmitProposal, useInterfaces: boolean = true): MsgSubmitProposalAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.proposers) { obj.proposers = message.proposers.map(e => e); } else { - obj.proposers = []; + obj.proposers = message.proposers; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.exec = message.exec; + obj.exec = message.exec === 0 ? undefined : message.exec; return obj; }, fromProtoMsg(message: MsgSubmitProposalProtoMsg, useInterfaces: boolean = true): MsgSubmitProposal { @@ -2673,7 +2673,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse, useInterfaces: boolean = true): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromProtoMsg(message: MsgSubmitProposalResponseProtoMsg, useInterfaces: boolean = true): MsgSubmitProposalResponse { @@ -2771,8 +2771,8 @@ export const MsgWithdrawProposal = { }, toAmino(message: MsgWithdrawProposal, useInterfaces: boolean = true): MsgWithdrawProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.address = message.address; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: MsgWithdrawProposalProtoMsg, useInterfaces: boolean = true): MsgWithdrawProposal { @@ -2966,23 +2966,23 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; } if (object.exec !== undefined && object.exec !== null) { - message.exec = execFromJSON(object.exec); + message.exec = object.exec; } return message; }, toAmino(message: MsgVote, useInterfaces: boolean = true): 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; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.exec = message.exec === 0 ? undefined : message.exec; return obj; }, fromProtoMsg(message: MsgVoteProtoMsg, useInterfaces: boolean = true): MsgVote { @@ -3143,8 +3143,8 @@ export const MsgExec = { }, toAmino(message: MsgExec, useInterfaces: boolean = true): MsgExecAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.signer = message.signer; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgExecProtoMsg, useInterfaces: boolean = true): MsgExec { @@ -3305,8 +3305,8 @@ export const MsgLeaveGroup = { }, toAmino(message: MsgLeaveGroup, useInterfaces: boolean = true): MsgLeaveGroupAmino { const obj: any = {}; - obj.address = message.address; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromProtoMsg(message: MsgLeaveGroupProtoMsg, useInterfaces: boolean = true): MsgLeaveGroup { @@ -3397,7 +3397,7 @@ export const DecisionPolicy_InterfaceDecoder = (input: BinaryReader | Uint8Array return data; } }; -export const DecisionPolicy_FromAmino = (content: AnyAmino) => { +export const DecisionPolicy_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/ThresholdDecisionPolicy": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv3/cosmos/group/v1/types.ts b/__fixtures__/v-next/outputv3/cosmos/group/v1/types.ts index 9c48410877..74f9bc503f 100644 --- a/__fixtures__/v-next/outputv3/cosmos/group/v1/types.ts +++ b/__fixtures__/v-next/outputv3/cosmos/group/v1/types.ts @@ -827,9 +827,9 @@ export const Member = { }, toAmino(message: Member, useInterfaces: boolean = true): MemberAmino { const obj: any = {}; - obj.address = message.address; - obj.weight = message.weight; - obj.metadata = message.metadata; + obj.address = message.address === "" ? undefined : message.address; + obj.weight = message.weight === "" ? undefined : message.weight; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.added_at = message.addedAt ? Timestamp.toAmino(toTimestamp(message.addedAt)) : undefined; return obj; }, @@ -920,7 +920,7 @@ export const Members = { if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e, useInterfaces) : undefined); } else { - obj.members = []; + obj.members = message.members; } return obj; }, @@ -1020,7 +1020,7 @@ export const ThresholdDecisionPolicy = { }, toAmino(message: ThresholdDecisionPolicy, useInterfaces: boolean = true): ThresholdDecisionPolicyAmino { const obj: any = {}; - obj.threshold = message.threshold; + obj.threshold = message.threshold === "" ? undefined : message.threshold; obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows, useInterfaces) : undefined; return obj; }, @@ -1120,7 +1120,7 @@ export const PercentageDecisionPolicy = { }, toAmino(message: PercentageDecisionPolicy, useInterfaces: boolean = true): PercentageDecisionPolicyAmino { const obj: any = {}; - obj.percentage = message.percentage; + obj.percentage = message.percentage === "" ? undefined : message.percentage; obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows, useInterfaces) : undefined; return obj; }, @@ -1382,11 +1382,11 @@ export const GroupInfo = { }, toAmino(message: GroupInfo, useInterfaces: boolean = true): 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.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; obj.created_at = message.createdAt ? Timestamp.toAmino(toTimestamp(message.createdAt)) : undefined; return obj; }, @@ -1487,7 +1487,7 @@ export const GroupMember = { }, toAmino(message: GroupMember, useInterfaces: boolean = true): GroupMemberAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.member = message.member ? Member.toAmino(message.member, useInterfaces) : undefined; return obj; }, @@ -1665,11 +1665,11 @@ export const GroupPolicyInfo = { }, toAmino(message: GroupPolicyInfo, useInterfaces: boolean = true): 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.address = message.address === "" ? undefined : message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; obj.decision_policy = message.decisionPolicy ? DecisionPolicy_ToAmino((message.decisionPolicy as Any), useInterfaces) : undefined; obj.created_at = message.createdAt ? Timestamp.toAmino(toTimestamp(message.createdAt)) : undefined; return obj; @@ -1933,10 +1933,10 @@ export const Proposal = { message.groupPolicyVersion = BigInt(object.group_policy_version); } if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.result !== undefined && object.result !== null) { - message.result = proposalResultFromJSON(object.result); + message.result = object.result; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -1945,33 +1945,33 @@ export const Proposal = { message.votingPeriodEnd = fromTimestamp(Timestamp.fromAmino(object.voting_period_end)); } if (object.executor_result !== undefined && object.executor_result !== null) { - message.executorResult = proposalExecutorResultFromJSON(object.executor_result); + message.executorResult = object.executor_result; } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; return message; }, toAmino(message: Proposal, useInterfaces: boolean = true): ProposalAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.address = message.address; - obj.metadata = message.metadata; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.metadata = message.metadata === "" ? undefined : message.metadata; if (message.proposers) { obj.proposers = message.proposers.map(e => e); } else { - obj.proposers = []; + obj.proposers = message.proposers; } obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; - 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.group_version = message.groupVersion !== BigInt(0) ? message.groupVersion.toString() : undefined; + obj.group_policy_version = message.groupPolicyVersion !== BigInt(0) ? message.groupPolicyVersion.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.result = message.result === 0 ? undefined : message.result; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult, useInterfaces) : undefined; obj.voting_period_end = message.votingPeriodEnd ? Timestamp.toAmino(toTimestamp(message.votingPeriodEnd)) : undefined; - obj.executor_result = message.executorResult; + obj.executor_result = message.executorResult === 0 ? undefined : message.executorResult; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } return obj; }, @@ -2098,10 +2098,10 @@ export const TallyResult = { }, toAmino(message: TallyResult, useInterfaces: boolean = true): 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; + obj.yes_count = message.yesCount === "" ? undefined : message.yesCount; + obj.abstain_count = message.abstainCount === "" ? undefined : message.abstainCount; + obj.no_count = message.noCount === "" ? undefined : message.noCount; + obj.no_with_veto_count = message.noWithVetoCount === "" ? undefined : message.noWithVetoCount; return obj; }, fromProtoMsg(message: TallyResultProtoMsg, useInterfaces: boolean = true): TallyResult { @@ -2232,7 +2232,7 @@ export const Vote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; @@ -2244,10 +2244,10 @@ export const Vote = { }, toAmino(message: Vote, useInterfaces: boolean = true): 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.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; return obj; }, @@ -2276,7 +2276,7 @@ export const DecisionPolicy_InterfaceDecoder = (input: BinaryReader | Uint8Array return data; } }; -export const DecisionPolicy_FromAmino = (content: AnyAmino) => { +export const DecisionPolicy_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/ThresholdDecisionPolicy": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv3/cosmos/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputv3/cosmos/mint/v1beta1/mint.ts index f7ed784543..f5b96b8575 100644 --- a/__fixtures__/v-next/outputv3/cosmos/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputv3/cosmos/mint/v1beta1/mint.ts @@ -148,8 +148,8 @@ export const Minter = { }, toAmino(message: Minter, useInterfaces: boolean = true): MinterAmino { const obj: any = {}; - obj.inflation = message.inflation; - obj.annual_provisions = message.annualProvisions; + obj.inflation = message.inflation === "" ? undefined : message.inflation; + obj.annual_provisions = message.annualProvisions === "" ? undefined : message.annualProvisions; return obj; }, fromProtoMsg(message: MinterProtoMsg, useInterfaces: boolean = true): Minter { @@ -307,12 +307,12 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): 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; + obj.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; + obj.inflation_rate_change = message.inflationRateChange === "" ? undefined : message.inflationRateChange; + obj.inflation_max = message.inflationMax === "" ? undefined : message.inflationMax; + obj.inflation_min = message.inflationMin === "" ? undefined : message.inflationMin; + obj.goal_bonded = message.goalBonded === "" ? undefined : message.goalBonded; + obj.blocks_per_year = message.blocksPerYear !== BigInt(0) ? message.blocksPerYear.toString() : undefined; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/event.ts b/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/event.ts index 63cf7ec8dc..72fd70641f 100644 --- a/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/event.ts +++ b/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/event.ts @@ -180,10 +180,10 @@ export const EventSend = { }, toAmino(message: EventSend, useInterfaces: boolean = true): EventSendAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromProtoMsg(message: EventSendProtoMsg, useInterfaces: boolean = true): EventSend { @@ -294,9 +294,9 @@ export const EventMint = { }, toAmino(message: EventMint, useInterfaces: boolean = true): EventMintAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromProtoMsg(message: EventMintProtoMsg, useInterfaces: boolean = true): EventMint { @@ -407,9 +407,9 @@ export const EventBurn = { }, toAmino(message: EventBurn, useInterfaces: boolean = true): EventBurnAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromProtoMsg(message: EventBurnProtoMsg, useInterfaces: boolean = true): EventBurn { diff --git a/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/genesis.ts index de75f317d2..c7fe51c911 100644 --- a/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/genesis.ts @@ -141,12 +141,12 @@ export const GenesisState = { if (message.classes) { obj.classes = message.classes.map(e => e ? Class.toAmino(e, useInterfaces) : undefined); } else { - obj.classes = []; + obj.classes = message.classes; } if (message.entries) { obj.entries = message.entries.map(e => e ? Entry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -249,11 +249,11 @@ export const Entry = { }, toAmino(message: Entry, useInterfaces: boolean = true): EntryAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; if (message.nfts) { obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e, useInterfaces) : undefined); } else { - obj.nfts = []; + obj.nfts = message.nfts; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/nft.ts b/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/nft.ts index f6389bd11b..6160bc8dee 100644 --- a/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/nft.ts +++ b/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/nft.ts @@ -245,12 +245,12 @@ export const Class = { }, toAmino(message: Class, useInterfaces: boolean = true): 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.id = message.id === "" ? undefined : message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.symbol = message.symbol === "" ? undefined : message.symbol; + obj.description = message.description === "" ? undefined : message.description; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; obj.data = message.data ? Any.toAmino(message.data, useInterfaces) : undefined; return obj; }, @@ -394,10 +394,10 @@ export const NFT = { }, toAmino(message: NFT, useInterfaces: boolean = true): NFTAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.uri = message.uri; - obj.uri_hash = message.uriHash; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; obj.data = message.data ? Any.toAmino(message.data, useInterfaces) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/query.ts index c2c175b504..b6a1f804a4 100644 --- a/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/query.ts @@ -330,8 +330,8 @@ export const QueryBalanceRequest = { }, toAmino(message: QueryBalanceRequest, useInterfaces: boolean = true): QueryBalanceRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromProtoMsg(message: QueryBalanceRequestProtoMsg, useInterfaces: boolean = true): QueryBalanceRequest { @@ -414,7 +414,7 @@ export const QueryBalanceResponse = { }, toAmino(message: QueryBalanceResponse, useInterfaces: boolean = true): QueryBalanceResponseAmino { const obj: any = {}; - obj.amount = message.amount ? message.amount.toString() : undefined; + obj.amount = message.amount !== BigInt(0) ? message.amount.toString() : undefined; return obj; }, fromProtoMsg(message: QueryBalanceResponseProtoMsg, useInterfaces: boolean = true): QueryBalanceResponse { @@ -510,8 +510,8 @@ export const QueryOwnerRequest = { }, toAmino(message: QueryOwnerRequest, useInterfaces: boolean = true): QueryOwnerRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromProtoMsg(message: QueryOwnerRequestProtoMsg, useInterfaces: boolean = true): QueryOwnerRequest { @@ -592,7 +592,7 @@ export const QueryOwnerResponse = { }, toAmino(message: QueryOwnerResponse, useInterfaces: boolean = true): QueryOwnerResponseAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromProtoMsg(message: QueryOwnerResponseProtoMsg, useInterfaces: boolean = true): QueryOwnerResponse { @@ -673,7 +673,7 @@ export const QuerySupplyRequest = { }, toAmino(message: QuerySupplyRequest, useInterfaces: boolean = true): QuerySupplyRequestAmino { const obj: any = {}; - obj.class_id = message.classId; + obj.class_id = message.classId === "" ? undefined : message.classId; return obj; }, fromProtoMsg(message: QuerySupplyRequestProtoMsg, useInterfaces: boolean = true): QuerySupplyRequest { @@ -756,7 +756,7 @@ export const QuerySupplyResponse = { }, toAmino(message: QuerySupplyResponse, useInterfaces: boolean = true): QuerySupplyResponseAmino { const obj: any = {}; - obj.amount = message.amount ? message.amount.toString() : undefined; + obj.amount = message.amount !== BigInt(0) ? message.amount.toString() : undefined; return obj; }, fromProtoMsg(message: QuerySupplyResponseProtoMsg, useInterfaces: boolean = true): QuerySupplyResponse { @@ -869,8 +869,8 @@ export const QueryNFTsRequest = { }, toAmino(message: QueryNFTsRequest, useInterfaces: boolean = true): QueryNFTsRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.owner = message.owner === "" ? undefined : message.owner; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -978,7 +978,7 @@ export const QueryNFTsResponse = { if (message.nfts) { obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e, useInterfaces) : undefined); } else { - obj.nfts = []; + obj.nfts = message.nfts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1076,8 +1076,8 @@ export const QueryNFTRequest = { }, toAmino(message: QueryNFTRequest, useInterfaces: boolean = true): QueryNFTRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromProtoMsg(message: QueryNFTRequestProtoMsg, useInterfaces: boolean = true): QueryNFTRequest { @@ -1241,7 +1241,7 @@ export const QueryClassRequest = { }, toAmino(message: QueryClassRequest, useInterfaces: boolean = true): QueryClassRequestAmino { const obj: any = {}; - obj.class_id = message.classId; + obj.class_id = message.classId === "" ? undefined : message.classId; return obj; }, fromProtoMsg(message: QueryClassRequestProtoMsg, useInterfaces: boolean = true): QueryClassRequest { @@ -1514,7 +1514,7 @@ export const QueryClassesResponse = { if (message.classes) { obj.classes = message.classes.map(e => e ? Class.toAmino(e, useInterfaces) : undefined); } else { - obj.classes = []; + obj.classes = message.classes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/tx.ts index 0cd574670d..5fb62cd8db 100644 --- a/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/tx.ts @@ -154,10 +154,10 @@ export const MsgSend = { }, toAmino(message: MsgSend, useInterfaces: boolean = true): MsgSendAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromProtoMsg(message: MsgSendProtoMsg, useInterfaces: boolean = true): MsgSend { diff --git a/__fixtures__/v-next/outputv3/cosmos/orm/v1/orm.ts b/__fixtures__/v-next/outputv3/cosmos/orm/v1/orm.ts index 74b5be1773..f5434b229c 100644 --- a/__fixtures__/v-next/outputv3/cosmos/orm/v1/orm.ts +++ b/__fixtures__/v-next/outputv3/cosmos/orm/v1/orm.ts @@ -319,9 +319,9 @@ export const TableDescriptor = { if (message.index) { obj.index = message.index.map(e => e ? SecondaryIndexDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.index = []; + obj.index = message.index; } - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromProtoMsg(message: TableDescriptorProtoMsg, useInterfaces: boolean = true): TableDescriptor { @@ -417,8 +417,8 @@ export const PrimaryKeyDescriptor = { }, toAmino(message: PrimaryKeyDescriptor, useInterfaces: boolean = true): PrimaryKeyDescriptorAmino { const obj: any = {}; - obj.fields = message.fields; - obj.auto_increment = message.autoIncrement; + obj.fields = message.fields === "" ? undefined : message.fields; + obj.auto_increment = message.autoIncrement === false ? undefined : message.autoIncrement; return obj; }, fromProtoMsg(message: PrimaryKeyDescriptorProtoMsg, useInterfaces: boolean = true): PrimaryKeyDescriptor { @@ -529,9 +529,9 @@ export const SecondaryIndexDescriptor = { }, toAmino(message: SecondaryIndexDescriptor, useInterfaces: boolean = true): SecondaryIndexDescriptorAmino { const obj: any = {}; - obj.fields = message.fields; - obj.id = message.id; - obj.unique = message.unique; + obj.fields = message.fields === "" ? undefined : message.fields; + obj.id = message.id === 0 ? undefined : message.id; + obj.unique = message.unique === false ? undefined : message.unique; return obj; }, fromProtoMsg(message: SecondaryIndexDescriptorProtoMsg, useInterfaces: boolean = true): SecondaryIndexDescriptor { @@ -612,7 +612,7 @@ export const SingletonDescriptor = { }, toAmino(message: SingletonDescriptor, useInterfaces: boolean = true): SingletonDescriptorAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromProtoMsg(message: SingletonDescriptorProtoMsg, useInterfaces: boolean = true): SingletonDescriptor { diff --git a/__fixtures__/v-next/outputv3/cosmos/orm/v1alpha1/schema.ts b/__fixtures__/v-next/outputv3/cosmos/orm/v1alpha1/schema.ts index 1626830ad9..877f5b0612 100644 --- a/__fixtures__/v-next/outputv3/cosmos/orm/v1alpha1/schema.ts +++ b/__fixtures__/v-next/outputv3/cosmos/orm/v1alpha1/schema.ts @@ -252,7 +252,7 @@ export const ModuleSchemaDescriptor = { if (message.schemaFile) { obj.schema_file = message.schemaFile.map(e => e ? ModuleSchemaDescriptor_FileEntry.toAmino(e, useInterfaces) : undefined); } else { - obj.schema_file = []; + obj.schema_file = message.schemaFile; } obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; @@ -359,15 +359,15 @@ export const ModuleSchemaDescriptor_FileEntry = { message.protoFileName = object.proto_file_name; } if (object.storage_type !== undefined && object.storage_type !== null) { - message.storageType = storageTypeFromJSON(object.storage_type); + message.storageType = object.storage_type; } return message; }, toAmino(message: ModuleSchemaDescriptor_FileEntry, useInterfaces: boolean = true): ModuleSchemaDescriptor_FileEntryAmino { const obj: any = {}; - obj.id = message.id; - obj.proto_file_name = message.protoFileName; - obj.storage_type = message.storageType; + obj.id = message.id === 0 ? undefined : message.id; + obj.proto_file_name = message.protoFileName === "" ? undefined : message.protoFileName; + obj.storage_type = message.storageType === 0 ? undefined : message.storageType; return obj; }, fromProtoMsg(message: ModuleSchemaDescriptor_FileEntryProtoMsg, useInterfaces: boolean = true): ModuleSchemaDescriptor_FileEntry { diff --git a/__fixtures__/v-next/outputv3/cosmos/params/v1beta1/params.ts b/__fixtures__/v-next/outputv3/cosmos/params/v1beta1/params.ts index 8c9fe69c0d..fadffcea16 100644 --- a/__fixtures__/v-next/outputv3/cosmos/params/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv3/cosmos/params/v1beta1/params.ts @@ -155,12 +155,12 @@ export const ParameterChangeProposal = { }, toAmino(message: ParameterChangeProposal, useInterfaces: boolean = true): ParameterChangeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.changes) { obj.changes = message.changes.map(e => e ? ParamChange.toAmino(e, useInterfaces) : undefined); } else { - obj.changes = []; + obj.changes = message.changes; } return obj; }, @@ -272,9 +272,9 @@ export const ParamChange = { }, toAmino(message: ParamChange, useInterfaces: boolean = true): ParamChangeAmino { const obj: any = {}; - obj.subspace = message.subspace; - obj.key = message.key; - obj.value = message.value; + obj.subspace = message.subspace === "" ? undefined : message.subspace; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: ParamChangeProtoMsg, useInterfaces: boolean = true): ParamChange { diff --git a/__fixtures__/v-next/outputv3/cosmos/params/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/params/v1beta1/query.ts index 9836bc7b2d..98b30b1646 100644 --- a/__fixtures__/v-next/outputv3/cosmos/params/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/params/v1beta1/query.ts @@ -195,8 +195,8 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest, useInterfaces: boolean = true): QueryParamsRequestAmino { const obj: any = {}; - obj.subspace = message.subspace; - obj.key = message.key; + obj.subspace = message.subspace === "" ? undefined : message.subspace; + obj.key = message.key === "" ? undefined : message.key; return obj; }, fromProtoMsg(message: QueryParamsRequestProtoMsg, useInterfaces: boolean = true): QueryParamsRequest { @@ -432,7 +432,7 @@ export const QuerySubspacesResponse = { if (message.subspaces) { obj.subspaces = message.subspaces.map(e => e ? Subspace.toAmino(e, useInterfaces) : undefined); } else { - obj.subspaces = []; + obj.subspaces = message.subspaces; } return obj; }, @@ -535,11 +535,11 @@ export const Subspace = { }, toAmino(message: Subspace, useInterfaces: boolean = true): SubspaceAmino { const obj: any = {}; - obj.subspace = message.subspace; + obj.subspace = message.subspace === "" ? undefined : message.subspace; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/genesis.ts index c65a4e0418..5f6e959ccf 100644 --- a/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/genesis.ts @@ -233,12 +233,12 @@ export const GenesisState = { if (message.signingInfos) { obj.signing_infos = message.signingInfos.map(e => e ? SigningInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.signing_infos = []; + obj.signing_infos = message.signingInfos; } if (message.missedBlocks) { obj.missed_blocks = message.missedBlocks.map(e => e ? ValidatorMissedBlocks.toAmino(e, useInterfaces) : undefined); } else { - obj.missed_blocks = []; + obj.missed_blocks = message.missedBlocks; } return obj; }, @@ -337,7 +337,7 @@ export const SigningInfo = { }, toAmino(message: SigningInfo, useInterfaces: boolean = true): SigningInfoAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.validator_signing_info = message.validatorSigningInfo ? ValidatorSigningInfo.toAmino(message.validatorSigningInfo, useInterfaces) : undefined; return obj; }, @@ -440,11 +440,11 @@ export const ValidatorMissedBlocks = { }, toAmino(message: ValidatorMissedBlocks, useInterfaces: boolean = true): ValidatorMissedBlocksAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.missedBlocks) { obj.missed_blocks = message.missedBlocks.map(e => e ? MissedBlock.toAmino(e, useInterfaces) : undefined); } else { - obj.missed_blocks = []; + obj.missed_blocks = message.missedBlocks; } return obj; }, @@ -543,8 +543,8 @@ export const MissedBlock = { }, toAmino(message: MissedBlock, useInterfaces: boolean = true): MissedBlockAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; - obj.missed = message.missed; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; + obj.missed = message.missed === false ? undefined : message.missed; return obj; }, fromProtoMsg(message: MissedBlockProtoMsg, useInterfaces: boolean = true): MissedBlock { diff --git a/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/query.ts index 6e6cedf192..5ddb52900d 100644 --- a/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/query.ts @@ -349,7 +349,7 @@ export const QuerySigningInfoRequest = { }, toAmino(message: QuerySigningInfoRequest, useInterfaces: boolean = true): QuerySigningInfoRequestAmino { const obj: any = {}; - obj.cons_address = message.consAddress; + obj.cons_address = message.consAddress === "" ? undefined : message.consAddress; return obj; }, fromProtoMsg(message: QuerySigningInfoRequestProtoMsg, useInterfaces: boolean = true): QuerySigningInfoRequest { @@ -622,7 +622,7 @@ export const QuerySigningInfosResponse = { if (message.info) { obj.info = message.info.map(e => e ? ValidatorSigningInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.info = []; + obj.info = message.info; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/slashing.ts b/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/slashing.ts index a0dbf9e1f1..1d0c75055b 100644 --- a/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/slashing.ts +++ b/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/slashing.ts @@ -247,12 +247,12 @@ export const ValidatorSigningInfo = { }, toAmino(message: ValidatorSigningInfo, useInterfaces: boolean = true): 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.address = message.address === "" ? undefined : message.address; + obj.start_height = message.startHeight !== BigInt(0) ? message.startHeight.toString() : undefined; + obj.index_offset = message.indexOffset !== BigInt(0) ? message.indexOffset.toString() : undefined; obj.jailed_until = message.jailedUntil ? Timestamp.toAmino(toTimestamp(message.jailedUntil)) : undefined; - obj.tombstoned = message.tombstoned; - obj.missed_blocks_counter = message.missedBlocksCounter ? message.missedBlocksCounter.toString() : undefined; + obj.tombstoned = message.tombstoned === false ? undefined : message.tombstoned; + obj.missed_blocks_counter = message.missedBlocksCounter !== BigInt(0) ? message.missedBlocksCounter.toString() : undefined; return obj; }, fromProtoMsg(message: ValidatorSigningInfoProtoMsg, useInterfaces: boolean = true): ValidatorSigningInfo { @@ -397,7 +397,7 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.signed_blocks_window = message.signedBlocksWindow ? message.signedBlocksWindow.toString() : undefined; + obj.signed_blocks_window = message.signedBlocksWindow !== BigInt(0) ? message.signedBlocksWindow.toString() : undefined; obj.min_signed_per_window = message.minSignedPerWindow ? base64FromBytes(message.minSignedPerWindow) : undefined; obj.downtime_jail_duration = message.downtimeJailDuration ? Duration.toAmino(message.downtimeJailDuration, useInterfaces) : undefined; obj.slash_fraction_double_sign = message.slashFractionDoubleSign ? base64FromBytes(message.slashFractionDoubleSign) : undefined; diff --git a/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/tx.ts index f804643aeb..d2d8e6526d 100644 --- a/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/tx.ts @@ -11,7 +11,7 @@ export interface MsgUnjailProtoMsg { } /** MsgUnjail defines the Msg/Unjail request type */ export interface MsgUnjailAmino { - validator_addr?: string; + validator_addr: string; } /** MsgUnjail defines the Msg/Unjail request type */ export interface MsgUnjailSDKType { @@ -92,7 +92,7 @@ export const MsgUnjail = { }, toAmino(message: MsgUnjail, useInterfaces: boolean = true): MsgUnjailAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr ?? ""; return obj; }, fromProtoMsg(message: MsgUnjailProtoMsg, useInterfaces: boolean = true): MsgUnjail { diff --git a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/authz.ts b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/authz.ts index ab51e222d5..addf9f32e0 100644 --- a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/authz.ts @@ -241,7 +241,7 @@ export const StakeAuthorization = { message.denyList = StakeAuthorization_Validators.fromAmino(object.deny_list); } if (object.authorization_type !== undefined && object.authorization_type !== null) { - message.authorizationType = authorizationTypeFromJSON(object.authorization_type); + message.authorizationType = object.authorization_type; } return message; }, @@ -250,7 +250,7 @@ export const StakeAuthorization = { obj.max_tokens = message.maxTokens ? Coin.toAmino(message.maxTokens, useInterfaces) : undefined; obj.allow_list = message.allowList ? StakeAuthorization_Validators.toAmino(message.allowList, useInterfaces) : undefined; obj.deny_list = message.denyList ? StakeAuthorization_Validators.toAmino(message.denyList, useInterfaces) : undefined; - obj.authorization_type = message.authorizationType; + obj.authorization_type = message.authorizationType === 0 ? undefined : message.authorizationType; return obj; }, fromProtoMsg(message: StakeAuthorizationProtoMsg, useInterfaces: boolean = true): StakeAuthorization { @@ -340,7 +340,7 @@ export const StakeAuthorization_Validators = { if (message.address) { obj.address = message.address.map(e => e); } else { - obj.address = []; + obj.address = message.address; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/genesis.ts index 97803361c7..fb5e09618f 100644 --- a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/genesis.ts @@ -295,29 +295,29 @@ export const GenesisState = { if (message.lastValidatorPowers) { obj.last_validator_powers = message.lastValidatorPowers.map(e => e ? LastValidatorPower.toAmino(e, useInterfaces) : undefined); } else { - obj.last_validator_powers = []; + obj.last_validator_powers = message.lastValidatorPowers; } if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e, useInterfaces) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } if (message.delegations) { obj.delegations = message.delegations.map(e => e ? Delegation.toAmino(e, useInterfaces) : undefined); } else { - obj.delegations = []; + obj.delegations = message.delegations; } if (message.unbondingDelegations) { obj.unbonding_delegations = message.unbondingDelegations.map(e => e ? UnbondingDelegation.toAmino(e, useInterfaces) : undefined); } else { - obj.unbonding_delegations = []; + obj.unbonding_delegations = message.unbondingDelegations; } if (message.redelegations) { obj.redelegations = message.redelegations.map(e => e ? Redelegation.toAmino(e, useInterfaces) : undefined); } else { - obj.redelegations = []; + obj.redelegations = message.redelegations; } - obj.exported = message.exported; + obj.exported = message.exported === false ? undefined : message.exported; return obj; }, fromProtoMsg(message: GenesisStateProtoMsg, useInterfaces: boolean = true): GenesisState { @@ -415,8 +415,8 @@ export const LastValidatorPower = { }, toAmino(message: LastValidatorPower, useInterfaces: boolean = true): LastValidatorPowerAmino { const obj: any = {}; - obj.address = message.address; - obj.power = message.power ? message.power.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromProtoMsg(message: LastValidatorPowerProtoMsg, useInterfaces: boolean = true): LastValidatorPower { diff --git a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/query.ts index e37b57fdb7..17d039c00b 100644 --- a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/query.ts @@ -822,7 +822,7 @@ export const QueryValidatorsRequest = { }, toAmino(message: QueryValidatorsRequest, useInterfaces: boolean = true): QueryValidatorsRequestAmino { const obj: any = {}; - obj.status = message.status; + obj.status = message.status === "" ? undefined : message.status; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -930,7 +930,7 @@ export const QueryValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e, useInterfaces) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1013,7 +1013,7 @@ export const QueryValidatorRequest = { }, toAmino(message: QueryValidatorRequest, useInterfaces: boolean = true): QueryValidatorRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromProtoMsg(message: QueryValidatorRequestProtoMsg, useInterfaces: boolean = true): QueryValidatorRequest { @@ -1194,7 +1194,7 @@ export const QueryValidatorDelegationsRequest = { }, toAmino(message: QueryValidatorDelegationsRequest, useInterfaces: boolean = true): QueryValidatorDelegationsRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1302,7 +1302,7 @@ export const QueryValidatorDelegationsResponse = { if (message.delegationResponses) { obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.delegation_responses = []; + obj.delegation_responses = message.delegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1402,7 +1402,7 @@ export const QueryValidatorUnbondingDelegationsRequest = { }, toAmino(message: QueryValidatorUnbondingDelegationsRequest, useInterfaces: boolean = true): QueryValidatorUnbondingDelegationsRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1510,7 +1510,7 @@ export const QueryValidatorUnbondingDelegationsResponse = { if (message.unbondingResponses) { obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e, useInterfaces) : undefined); } else { - obj.unbonding_responses = []; + obj.unbonding_responses = message.unbondingResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1608,8 +1608,8 @@ export const QueryDelegationRequest = { }, toAmino(message: QueryDelegationRequest, useInterfaces: boolean = true): QueryDelegationRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromProtoMsg(message: QueryDelegationRequestProtoMsg, useInterfaces: boolean = true): QueryDelegationRequest { @@ -1788,8 +1788,8 @@ export const QueryUnbondingDelegationRequest = { }, toAmino(message: QueryUnbondingDelegationRequest, useInterfaces: boolean = true): QueryUnbondingDelegationRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromProtoMsg(message: QueryUnbondingDelegationRequestProtoMsg, useInterfaces: boolean = true): QueryUnbondingDelegationRequest { @@ -1970,7 +1970,7 @@ export const QueryDelegatorDelegationsRequest = { }, toAmino(message: QueryDelegatorDelegationsRequest, useInterfaces: boolean = true): QueryDelegatorDelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -2078,7 +2078,7 @@ export const QueryDelegatorDelegationsResponse = { if (message.delegationResponses) { obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.delegation_responses = []; + obj.delegation_responses = message.delegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -2178,7 +2178,7 @@ export const QueryDelegatorUnbondingDelegationsRequest = { }, toAmino(message: QueryDelegatorUnbondingDelegationsRequest, useInterfaces: boolean = true): QueryDelegatorUnbondingDelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -2286,7 +2286,7 @@ export const QueryDelegatorUnbondingDelegationsResponse = { if (message.unbondingResponses) { obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e, useInterfaces) : undefined); } else { - obj.unbonding_responses = []; + obj.unbonding_responses = message.unbondingResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -2416,9 +2416,9 @@ export const QueryRedelegationsRequest = { }, toAmino(message: QueryRedelegationsRequest, useInterfaces: boolean = true): QueryRedelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.src_validator_addr = message.srcValidatorAddr; - obj.dst_validator_addr = message.dstValidatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.src_validator_addr = message.srcValidatorAddr === "" ? undefined : message.srcValidatorAddr; + obj.dst_validator_addr = message.dstValidatorAddr === "" ? undefined : message.dstValidatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -2526,7 +2526,7 @@ export const QueryRedelegationsResponse = { if (message.redelegationResponses) { obj.redelegation_responses = message.redelegationResponses.map(e => e ? RedelegationResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.redelegation_responses = []; + obj.redelegation_responses = message.redelegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -2626,7 +2626,7 @@ export const QueryDelegatorValidatorsRequest = { }, toAmino(message: QueryDelegatorValidatorsRequest, useInterfaces: boolean = true): QueryDelegatorValidatorsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -2734,7 +2734,7 @@ export const QueryDelegatorValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e, useInterfaces) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -2832,8 +2832,8 @@ export const QueryDelegatorValidatorRequest = { }, toAmino(message: QueryDelegatorValidatorRequest, useInterfaces: boolean = true): QueryDelegatorValidatorRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromProtoMsg(message: QueryDelegatorValidatorRequestProtoMsg, useInterfaces: boolean = true): QueryDelegatorValidatorRequest { @@ -2999,7 +2999,7 @@ export const QueryHistoricalInfoRequest = { }, toAmino(message: QueryHistoricalInfoRequest, useInterfaces: boolean = true): QueryHistoricalInfoRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromProtoMsg(message: QueryHistoricalInfoRequestProtoMsg, useInterfaces: boolean = true): QueryHistoricalInfoRequest { diff --git a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/staking.ts index 6b91f343df..522ca7ca73 100644 --- a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/staking.ts +++ b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/staking.ts @@ -739,8 +739,8 @@ export interface PoolProtoMsg { * denomination. */ export interface PoolAmino { - not_bonded_tokens?: string; - bonded_tokens?: string; + not_bonded_tokens: string; + bonded_tokens: string; } /** * Pool is used for tracking bonded and not-bonded token supply of the bond @@ -842,7 +842,7 @@ export const HistoricalInfo = { if (message.valset) { obj.valset = message.valset.map(e => e ? Validator.toAmino(e, useInterfaces) : undefined); } else { - obj.valset = []; + obj.valset = message.valset; } return obj; }, @@ -954,9 +954,9 @@ export const CommissionRates = { }, toAmino(message: CommissionRates, useInterfaces: boolean = true): CommissionRatesAmino { const obj: any = {}; - obj.rate = message.rate; - obj.max_rate = message.maxRate; - obj.max_change_rate = message.maxChangeRate; + obj.rate = message.rate === "" ? undefined : message.rate; + obj.max_rate = message.maxRate === "" ? undefined : message.maxRate; + obj.max_change_rate = message.maxChangeRate === "" ? undefined : message.maxChangeRate; return obj; }, fromProtoMsg(message: CommissionRatesProtoMsg, useInterfaces: boolean = true): CommissionRates { @@ -1196,11 +1196,11 @@ export const Description = { }, toAmino(message: Description, useInterfaces: boolean = true): 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; + obj.moniker = message.moniker === "" ? undefined : message.moniker; + obj.identity = message.identity === "" ? undefined : message.identity; + obj.website = message.website === "" ? undefined : message.website; + obj.security_contact = message.securityContact === "" ? undefined : message.securityContact; + obj.details = message.details === "" ? undefined : message.details; return obj; }, fromProtoMsg(message: DescriptionProtoMsg, useInterfaces: boolean = true): Description { @@ -1412,7 +1412,7 @@ export const Validator = { message.jailed = object.jailed; } if (object.status !== undefined && object.status !== null) { - message.status = bondStatusFromJSON(object.status); + message.status = object.status; } if (object.tokens !== undefined && object.tokens !== null) { message.tokens = object.tokens; @@ -1439,17 +1439,17 @@ export const Validator = { }, toAmino(message: Validator, useInterfaces: boolean = true): ValidatorAmino { const obj: any = {}; - obj.operator_address = message.operatorAddress; + obj.operator_address = message.operatorAddress === "" ? undefined : 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.jailed = message.jailed === false ? undefined : message.jailed; + obj.status = message.status === 0 ? undefined : message.status; + obj.tokens = message.tokens === "" ? undefined : message.tokens; + obj.delegator_shares = message.delegatorShares === "" ? undefined : message.delegatorShares; obj.description = message.description ? Description.toAmino(message.description, useInterfaces) : undefined; - obj.unbonding_height = message.unbondingHeight ? message.unbondingHeight.toString() : undefined; + obj.unbonding_height = message.unbondingHeight !== BigInt(0) ? message.unbondingHeight.toString() : undefined; obj.unbonding_time = message.unbondingTime ? Timestamp.toAmino(toTimestamp(message.unbondingTime)) : undefined; obj.commission = message.commission ? Commission.toAmino(message.commission, useInterfaces) : undefined; - obj.min_self_delegation = message.minSelfDelegation; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; return obj; }, fromProtoMsg(message: ValidatorProtoMsg, useInterfaces: boolean = true): Validator { @@ -1539,7 +1539,7 @@ export const ValAddresses = { if (message.addresses) { obj.addresses = message.addresses.map(e => e); } else { - obj.addresses = []; + obj.addresses = message.addresses; } return obj; }, @@ -1636,8 +1636,8 @@ export const DVPair = { }, toAmino(message: DVPair, useInterfaces: boolean = true): DVPairAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromProtoMsg(message: DVPairProtoMsg, useInterfaces: boolean = true): DVPair { @@ -1727,7 +1727,7 @@ export const DVPairs = { if (message.pairs) { obj.pairs = message.pairs.map(e => e ? DVPair.toAmino(e, useInterfaces) : undefined); } else { - obj.pairs = []; + obj.pairs = message.pairs; } return obj; }, @@ -1839,9 +1839,9 @@ export const DVVTriplet = { }, toAmino(message: DVVTriplet, useInterfaces: boolean = true): DVVTripletAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; return obj; }, fromProtoMsg(message: DVVTripletProtoMsg, useInterfaces: boolean = true): DVVTriplet { @@ -1931,7 +1931,7 @@ export const DVVTriplets = { if (message.triplets) { obj.triplets = message.triplets.map(e => e ? DVVTriplet.toAmino(e, useInterfaces) : undefined); } else { - obj.triplets = []; + obj.triplets = message.triplets; } return obj; }, @@ -2043,9 +2043,9 @@ export const Delegation = { }, toAmino(message: Delegation, useInterfaces: boolean = true): DelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.shares = message.shares; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.shares = message.shares === "" ? undefined : message.shares; return obj; }, fromProtoMsg(message: DelegationProtoMsg, useInterfaces: boolean = true): Delegation { @@ -2162,12 +2162,12 @@ export const UnbondingDelegation = { }, toAmino(message: UnbondingDelegation, useInterfaces: boolean = true): UnbondingDelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.entries) { obj.entries = message.entries.map(e => e ? UnbondingDelegationEntry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2296,10 +2296,10 @@ export const UnbondingDelegationEntry = { }, toAmino(message: UnbondingDelegationEntry, useInterfaces: boolean = true): UnbondingDelegationEntryAmino { const obj: any = {}; - obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.creation_height = message.creationHeight !== BigInt(0) ? message.creationHeight.toString() : undefined; obj.completion_time = message.completionTime ? Timestamp.toAmino(toTimestamp(message.completionTime)) : undefined; - obj.initial_balance = message.initialBalance; - obj.balance = message.balance; + obj.initial_balance = message.initialBalance === "" ? undefined : message.initialBalance; + obj.balance = message.balance === "" ? undefined : message.balance; return obj; }, fromProtoMsg(message: UnbondingDelegationEntryProtoMsg, useInterfaces: boolean = true): UnbondingDelegationEntry { @@ -2427,10 +2427,10 @@ export const RedelegationEntry = { }, toAmino(message: RedelegationEntry, useInterfaces: boolean = true): RedelegationEntryAmino { const obj: any = {}; - obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.creation_height = message.creationHeight !== BigInt(0) ? message.creationHeight.toString() : undefined; obj.completion_time = message.completionTime ? Timestamp.toAmino(toTimestamp(message.completionTime)) : undefined; - obj.initial_balance = message.initialBalance; - obj.shares_dst = message.sharesDst; + obj.initial_balance = message.initialBalance === "" ? undefined : message.initialBalance; + obj.shares_dst = message.sharesDst === "" ? undefined : message.sharesDst; return obj; }, fromProtoMsg(message: RedelegationEntryProtoMsg, useInterfaces: boolean = true): RedelegationEntry { @@ -2562,13 +2562,13 @@ export const Redelegation = { }, toAmino(message: Redelegation, useInterfaces: boolean = true): RedelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; if (message.entries) { obj.entries = message.entries.map(e => e ? RedelegationEntry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2728,11 +2728,11 @@ export const Params = { toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; obj.unbonding_time = message.unbondingTime ? Duration.toAmino(message.unbondingTime, useInterfaces) : 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; + obj.max_validators = message.maxValidators === 0 ? undefined : message.maxValidators; + obj.max_entries = message.maxEntries === 0 ? undefined : message.maxEntries; + obj.historical_entries = message.historicalEntries === 0 ? undefined : message.historicalEntries; + obj.bond_denom = message.bondDenom === "" ? undefined : message.bondDenom; + obj.min_commission_rate = message.minCommissionRate === "" ? undefined : message.minCommissionRate; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { @@ -2932,7 +2932,7 @@ export const RedelegationEntryResponse = { toAmino(message: RedelegationEntryResponse, useInterfaces: boolean = true): RedelegationEntryResponseAmino { const obj: any = {}; obj.redelegation_entry = message.redelegationEntry ? RedelegationEntry.toAmino(message.redelegationEntry, useInterfaces) : undefined; - obj.balance = message.balance; + obj.balance = message.balance === "" ? undefined : message.balance; return obj; }, fromProtoMsg(message: RedelegationEntryResponseProtoMsg, useInterfaces: boolean = true): RedelegationEntryResponse { @@ -3040,7 +3040,7 @@ export const RedelegationResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? RedelegationEntryResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -3137,8 +3137,8 @@ export const Pool = { }, toAmino(message: Pool, useInterfaces: boolean = true): PoolAmino { const obj: any = {}; - obj.not_bonded_tokens = message.notBondedTokens; - obj.bonded_tokens = message.bondedTokens; + obj.not_bonded_tokens = message.notBondedTokens ?? ""; + obj.bonded_tokens = message.bondedTokens ?? ""; return obj; }, fromProtoMsg(message: PoolProtoMsg, useInterfaces: boolean = true): Pool { @@ -3162,7 +3162,7 @@ export const Cosmos_cryptoPubKey_InterfaceDecoder = (input: BinaryReader | Uint8 return data; } }; -export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino) => { +export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino): Any => { return encodePubkey(content); }; export const Cosmos_cryptoPubKey_ToAmino = (content: Any, useInterfaces: boolean = true): Pubkey | null => { diff --git a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/tx.ts index 306f718ee5..9ac2966650 100644 --- a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/tx.ts @@ -405,9 +405,9 @@ export const MsgCreateValidator = { const obj: any = {}; obj.description = message.description ? Description.toAmino(message.description, useInterfaces) : undefined; obj.commission = message.commission ? CommissionRates.toAmino(message.commission, useInterfaces) : undefined; - obj.min_self_delegation = message.minSelfDelegation; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; obj.value = message.value ? Coin.toAmino(message.value, useInterfaces) : undefined; return obj; @@ -601,9 +601,9 @@ export const MsgEditValidator = { toAmino(message: MsgEditValidator, useInterfaces: boolean = true): MsgEditValidatorAmino { const obj: any = {}; obj.description = message.description ? Description.toAmino(message.description, useInterfaces) : undefined; - obj.validator_address = message.validatorAddress; - obj.commission_rate = message.commissionRate; - obj.min_self_delegation = message.minSelfDelegation; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.commission_rate = message.commissionRate === "" ? undefined : message.commissionRate; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; return obj; }, fromProtoMsg(message: MsgEditValidatorProtoMsg, useInterfaces: boolean = true): MsgEditValidator { @@ -779,8 +779,8 @@ export const MsgDelegate = { }, toAmino(message: MsgDelegate, useInterfaces: boolean = true): MsgDelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.amount = message.amount ? Coin.toAmino(message.amount, useInterfaces) : undefined; return obj; }, @@ -972,9 +972,9 @@ export const MsgBeginRedelegate = { }, toAmino(message: MsgBeginRedelegate, useInterfaces: boolean = true): MsgBeginRedelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; obj.amount = message.amount ? Coin.toAmino(message.amount, useInterfaces) : undefined; return obj; }, @@ -1169,8 +1169,8 @@ export const MsgUndelegate = { }, toAmino(message: MsgUndelegate, useInterfaces: boolean = true): MsgUndelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.amount = message.amount ? Coin.toAmino(message.amount, useInterfaces) : undefined; return obj; }, @@ -1276,7 +1276,7 @@ export const Cosmos_cryptoPubKey_InterfaceDecoder = (input: BinaryReader | Uint8 return data; } }; -export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino) => { +export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino): Any => { return encodePubkey(content); }; export const Cosmos_cryptoPubKey_ToAmino = (content: Any, useInterfaces: boolean = true): Pubkey | null => { diff --git a/__fixtures__/v-next/outputv3/cosmos/tx/signing/v1beta1/signing.ts b/__fixtures__/v-next/outputv3/cosmos/tx/signing/v1beta1/signing.ts index ac3b502416..9ffdeac2a5 100644 --- a/__fixtures__/v-next/outputv3/cosmos/tx/signing/v1beta1/signing.ts +++ b/__fixtures__/v-next/outputv3/cosmos/tx/signing/v1beta1/signing.ts @@ -298,7 +298,7 @@ export const SignatureDescriptors = { if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -418,7 +418,7 @@ export const SignatureDescriptor = { const obj: any = {}; obj.public_key = message.publicKey ? Any.toAmino(message.publicKey, useInterfaces) : undefined; obj.data = message.data ? SignatureDescriptor_Data.toAmino(message.data, useInterfaces) : undefined; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromProtoMsg(message: SignatureDescriptorProtoMsg, useInterfaces: boolean = true): SignatureDescriptor { @@ -606,7 +606,7 @@ export const SignatureDescriptor_Data_Single = { fromAmino(object: SignatureDescriptor_Data_SingleAmino): SignatureDescriptor_Data_Single { const message = createBaseSignatureDescriptor_Data_Single(); if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.signature !== undefined && object.signature !== null) { message.signature = bytesFromBase64(object.signature); @@ -615,7 +615,7 @@ export const SignatureDescriptor_Data_Single = { }, toAmino(message: SignatureDescriptor_Data_Single, useInterfaces: boolean = true): SignatureDescriptor_Data_SingleAmino { const obj: any = {}; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; return obj; }, @@ -724,7 +724,7 @@ export const SignatureDescriptor_Data_Multi = { if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor_Data.toAmino(e, useInterfaces) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/tx/v1beta1/service.ts b/__fixtures__/v-next/outputv3/cosmos/tx/v1beta1/service.ts index 2a381640db..c0ebe697b3 100644 --- a/__fixtures__/v-next/outputv3/cosmos/tx/v1beta1/service.ts +++ b/__fixtures__/v-next/outputv3/cosmos/tx/v1beta1/service.ts @@ -542,7 +542,7 @@ export const GetTxsEventRequest = { message.pagination = PageRequest.fromAmino(object.pagination); } if (object.order_by !== undefined && object.order_by !== null) { - message.orderBy = orderByFromJSON(object.order_by); + message.orderBy = object.order_by; } return message; }, @@ -551,10 +551,10 @@ export const GetTxsEventRequest = { if (message.events) { obj.events = message.events.map(e => e); } else { - obj.events = []; + obj.events = message.events; } obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; - obj.order_by = message.orderBy; + obj.order_by = message.orderBy === 0 ? undefined : message.orderBy; return obj; }, fromProtoMsg(message: GetTxsEventRequestProtoMsg, useInterfaces: boolean = true): GetTxsEventRequest { @@ -682,12 +682,12 @@ export const GetTxsEventResponse = { if (message.txs) { obj.txs = message.txs.map(e => e ? Tx.toAmino(e, useInterfaces) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } if (message.txResponses) { obj.tx_responses = message.txResponses.map(e => e ? TxResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.tx_responses = []; + obj.tx_responses = message.txResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -779,14 +779,14 @@ export const BroadcastTxRequest = { message.txBytes = bytesFromBase64(object.tx_bytes); } if (object.mode !== undefined && object.mode !== null) { - message.mode = broadcastModeFromJSON(object.mode); + message.mode = object.mode; } return message; }, toAmino(message: BroadcastTxRequest, useInterfaces: boolean = true): BroadcastTxRequestAmino { const obj: any = {}; obj.tx_bytes = message.txBytes ? base64FromBytes(message.txBytes) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; return obj; }, fromProtoMsg(message: BroadcastTxRequestProtoMsg, useInterfaces: boolean = true): BroadcastTxRequest { @@ -1150,7 +1150,7 @@ export const GetTxRequest = { }, toAmino(message: GetTxRequest, useInterfaces: boolean = true): GetTxRequestAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === "" ? undefined : message.hash; return obj; }, fromProtoMsg(message: GetTxRequestProtoMsg, useInterfaces: boolean = true): GetTxRequest { @@ -1351,7 +1351,7 @@ export const GetBlockWithTxsRequest = { }, toAmino(message: GetBlockWithTxsRequest, useInterfaces: boolean = true): GetBlockWithTxsRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1493,7 +1493,7 @@ export const GetBlockWithTxsResponse = { if (message.txs) { obj.txs = message.txs.map(e => e ? Tx.toAmino(e, useInterfaces) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } obj.block_id = message.blockId ? BlockID.toAmino(message.blockId, useInterfaces) : undefined; obj.block = message.block ? Block.toAmino(message.block, useInterfaces) : undefined; diff --git a/__fixtures__/v-next/outputv3/cosmos/tx/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/tx/v1beta1/tx.ts index 0b9b2636fa..607c480bd5 100644 --- a/__fixtures__/v-next/outputv3/cosmos/tx/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/tx/v1beta1/tx.ts @@ -816,7 +816,7 @@ export const Tx = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -939,7 +939,7 @@ export const TxRaw = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -1070,8 +1070,8 @@ export const SignDoc = { const obj: any = {}; obj.body_bytes = message.bodyBytes ? base64FromBytes(message.bodyBytes) : undefined; obj.auth_info_bytes = message.authInfoBytes ? base64FromBytes(message.authInfoBytes) : undefined; - obj.chain_id = message.chainId; - obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; return obj; }, fromProtoMsg(message: SignDocProtoMsg, useInterfaces: boolean = true): SignDoc { @@ -1237,9 +1237,9 @@ export const SignDocDirectAux = { const obj: any = {}; obj.body_bytes = message.bodyBytes ? base64FromBytes(message.bodyBytes) : undefined; obj.public_key = message.publicKey ? Any.toAmino(message.publicKey, useInterfaces) : undefined; - obj.chain_id = message.chainId; - obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.tip = message.tip ? Tip.toAmino(message.tip, useInterfaces) : undefined; return obj; }, @@ -1404,19 +1404,19 @@ export const TxBody = { if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.memo = message.memo; - obj.timeout_height = message.timeoutHeight ? message.timeoutHeight.toString() : undefined; + obj.memo = message.memo === "" ? undefined : message.memo; + obj.timeout_height = message.timeoutHeight !== BigInt(0) ? message.timeoutHeight.toString() : undefined; if (message.extensionOptions) { obj.extension_options = message.extensionOptions.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.extension_options = []; + obj.extension_options = message.extensionOptions; } if (message.nonCriticalExtensionOptions) { obj.non_critical_extension_options = message.nonCriticalExtensionOptions.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.non_critical_extension_options = []; + obj.non_critical_extension_options = message.nonCriticalExtensionOptions; } return obj; }, @@ -1541,7 +1541,7 @@ export const AuthInfo = { if (message.signerInfos) { obj.signer_infos = message.signerInfos.map(e => e ? SignerInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.signer_infos = []; + obj.signer_infos = message.signerInfos; } obj.fee = message.fee ? Fee.toAmino(message.fee, useInterfaces) : undefined; obj.tip = message.tip ? Tip.toAmino(message.tip, useInterfaces) : undefined; @@ -1663,7 +1663,7 @@ export const SignerInfo = { const obj: any = {}; obj.public_key = message.publicKey ? Any.toAmino(message.publicKey, useInterfaces) : undefined; obj.mode_info = message.modeInfo ? ModeInfo.toAmino(message.modeInfo, useInterfaces) : undefined; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromProtoMsg(message: SignerInfoProtoMsg, useInterfaces: boolean = true): SignerInfo { @@ -1839,13 +1839,13 @@ export const ModeInfo_Single = { fromAmino(object: ModeInfo_SingleAmino): ModeInfo_Single { const message = createBaseModeInfo_Single(); if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } return message; }, toAmino(message: ModeInfo_Single, useInterfaces: boolean = true): ModeInfo_SingleAmino { const obj: any = {}; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; return obj; }, fromProtoMsg(message: ModeInfo_SingleProtoMsg, useInterfaces: boolean = true): ModeInfo_Single { @@ -1953,7 +1953,7 @@ export const ModeInfo_Multi = { if (message.modeInfos) { obj.mode_infos = message.modeInfos.map(e => e ? ModeInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.mode_infos = []; + obj.mode_infos = message.modeInfos; } return obj; }, @@ -2091,11 +2091,11 @@ export const Fee = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.gas_limit = message.gasLimit ? message.gasLimit.toString() : undefined; - obj.payer = message.payer; - obj.granter = message.granter; + obj.gas_limit = message.gasLimit !== BigInt(0) ? message.gasLimit.toString() : undefined; + obj.payer = message.payer === "" ? undefined : message.payer; + obj.granter = message.granter === "" ? undefined : message.granter; return obj; }, fromProtoMsg(message: FeeProtoMsg, useInterfaces: boolean = true): Fee { @@ -2200,9 +2200,9 @@ export const Tip = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.tipper = message.tipper; + obj.tipper = message.tipper === "" ? undefined : message.tipper; return obj; }, fromProtoMsg(message: TipProtoMsg, useInterfaces: boolean = true): Tip { @@ -2321,7 +2321,7 @@ export const AuxSignerData = { message.signDoc = SignDocDirectAux.fromAmino(object.sign_doc); } if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.sig !== undefined && object.sig !== null) { message.sig = bytesFromBase64(object.sig); @@ -2330,9 +2330,9 @@ export const AuxSignerData = { }, toAmino(message: AuxSignerData, useInterfaces: boolean = true): AuxSignerDataAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.sign_doc = message.signDoc ? SignDocDirectAux.toAmino(message.signDoc, useInterfaces) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.sig = message.sig ? base64FromBytes(message.sig) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/query.ts index 46c1f2f922..d3766ab9c3 100644 --- a/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/query.ts @@ -503,7 +503,7 @@ export const QueryAppliedPlanRequest = { }, toAmino(message: QueryAppliedPlanRequest, useInterfaces: boolean = true): QueryAppliedPlanRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: QueryAppliedPlanRequestProtoMsg, useInterfaces: boolean = true): QueryAppliedPlanRequest { @@ -586,7 +586,7 @@ export const QueryAppliedPlanResponse = { }, toAmino(message: QueryAppliedPlanResponse, useInterfaces: boolean = true): QueryAppliedPlanResponseAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromProtoMsg(message: QueryAppliedPlanResponseProtoMsg, useInterfaces: boolean = true): QueryAppliedPlanResponse { @@ -669,7 +669,7 @@ export const QueryUpgradedConsensusStateRequest = { }, toAmino(message: QueryUpgradedConsensusStateRequest, useInterfaces: boolean = true): QueryUpgradedConsensusStateRequestAmino { const obj: any = {}; - obj.last_height = message.lastHeight ? message.lastHeight.toString() : undefined; + obj.last_height = message.lastHeight !== BigInt(0) ? message.lastHeight.toString() : undefined; return obj; }, fromProtoMsg(message: QueryUpgradedConsensusStateRequestProtoMsg, useInterfaces: boolean = true): QueryUpgradedConsensusStateRequest { @@ -831,7 +831,7 @@ export const QueryModuleVersionsRequest = { }, toAmino(message: QueryModuleVersionsRequest, useInterfaces: boolean = true): QueryModuleVersionsRequestAmino { const obj: any = {}; - obj.module_name = message.moduleName; + obj.module_name = message.moduleName === "" ? undefined : message.moduleName; return obj; }, fromProtoMsg(message: QueryModuleVersionsRequestProtoMsg, useInterfaces: boolean = true): QueryModuleVersionsRequest { @@ -921,7 +921,7 @@ export const QueryModuleVersionsResponse = { if (message.moduleVersions) { obj.module_versions = message.moduleVersions.map(e => e ? ModuleVersion.toAmino(e, useInterfaces) : undefined); } else { - obj.module_versions = []; + obj.module_versions = message.moduleVersions; } return obj; }, @@ -1066,7 +1066,7 @@ export const QueryAuthorityResponse = { }, toAmino(message: QueryAuthorityResponse, useInterfaces: boolean = true): QueryAuthorityResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: QueryAuthorityResponseProtoMsg, useInterfaces: boolean = true): QueryAuthorityResponse { diff --git a/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/tx.ts index 3cdb388c10..2783b1499d 100644 --- a/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/tx.ts @@ -193,7 +193,7 @@ export const MsgSoftwareUpgrade = { }, toAmino(message: MsgSoftwareUpgrade, useInterfaces: boolean = true): MsgSoftwareUpgradeAmino { const obj: any = {}; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; obj.plan = message.plan ? Plan.toAmino(message.plan, useInterfaces) : undefined; return obj; }, @@ -338,7 +338,7 @@ export const MsgCancelUpgrade = { }, toAmino(message: MsgCancelUpgrade, useInterfaces: boolean = true): MsgCancelUpgradeAmino { const obj: any = {}; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; return obj; }, fromProtoMsg(message: MsgCancelUpgradeProtoMsg, useInterfaces: boolean = true): MsgCancelUpgrade { diff --git a/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/upgrade.ts b/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/upgrade.ts index 00f469ec7a..f2d114f165 100644 --- a/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/upgrade.ts +++ b/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/upgrade.ts @@ -332,10 +332,10 @@ export const Plan = { }, toAmino(message: Plan, useInterfaces: boolean = true): PlanAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.height = message.height ? message.height.toString() : undefined; - obj.info = message.info; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.info = message.info === "" ? undefined : message.info; obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState, useInterfaces) : undefined; return obj; }, @@ -449,8 +449,8 @@ export const SoftwareUpgradeProposal = { }, toAmino(message: SoftwareUpgradeProposal, useInterfaces: boolean = true): SoftwareUpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.plan = message.plan ? Plan.toAmino(message.plan, useInterfaces) : undefined; return obj; }, @@ -547,8 +547,8 @@ export const CancelSoftwareUpgradeProposal = { }, toAmino(message: CancelSoftwareUpgradeProposal, useInterfaces: boolean = true): CancelSoftwareUpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromProtoMsg(message: CancelSoftwareUpgradeProposalProtoMsg, useInterfaces: boolean = true): CancelSoftwareUpgradeProposal { @@ -646,8 +646,8 @@ export const ModuleVersion = { }, toAmino(message: ModuleVersion, useInterfaces: boolean = true): ModuleVersionAmino { const obj: any = {}; - obj.name = message.name; - obj.version = message.version ? message.version.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; return obj; }, fromProtoMsg(message: ModuleVersionProtoMsg, useInterfaces: boolean = true): ModuleVersion { diff --git a/__fixtures__/v-next/outputv3/cosmos/vesting/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/vesting/v1beta1/tx.ts index 8ecdc048dc..9ddb11331e 100644 --- a/__fixtures__/v-next/outputv3/cosmos/vesting/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/vesting/v1beta1/tx.ts @@ -277,15 +277,15 @@ export const MsgCreateVestingAccount = { }, toAmino(message: MsgCreateVestingAccount, useInterfaces: boolean = true): MsgCreateVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.end_time = message.endTime ? message.endTime.toString() : undefined; - obj.delayed = message.delayed; + obj.end_time = message.endTime !== BigInt(0) ? message.endTime.toString() : undefined; + obj.delayed = message.delayed === false ? undefined : message.delayed; return obj; }, fromProtoMsg(message: MsgCreateVestingAccountProtoMsg, useInterfaces: boolean = true): MsgCreateVestingAccount { @@ -465,12 +465,12 @@ export const MsgCreatePermanentLockedAccount = { }, toAmino(message: MsgCreatePermanentLockedAccount, useInterfaces: boolean = true): MsgCreatePermanentLockedAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -668,13 +668,13 @@ export const MsgCreatePeriodicVestingAccount = { }, toAmino(message: MsgCreatePeriodicVestingAccount, useInterfaces: boolean = true): MsgCreatePeriodicVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; - obj.start_time = message.startTime ? message.startTime.toString() : undefined; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e, useInterfaces) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos/vesting/v1beta1/vesting.ts b/__fixtures__/v-next/outputv3/cosmos/vesting/v1beta1/vesting.ts index e3cde84bc5..24ecbae9ba 100644 --- a/__fixtures__/v-next/outputv3/cosmos/vesting/v1beta1/vesting.ts +++ b/__fixtures__/v-next/outputv3/cosmos/vesting/v1beta1/vesting.ts @@ -331,19 +331,19 @@ export const BaseVestingAccount = { if (message.originalVesting) { obj.original_vesting = message.originalVesting.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.original_vesting = []; + obj.original_vesting = message.originalVesting; } if (message.delegatedFree) { obj.delegated_free = message.delegatedFree.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.delegated_free = []; + obj.delegated_free = message.delegatedFree; } if (message.delegatedVesting) { obj.delegated_vesting = message.delegatedVesting.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.delegated_vesting = []; + obj.delegated_vesting = message.delegatedVesting; } - obj.end_time = message.endTime ? message.endTime.toString() : undefined; + obj.end_time = message.endTime !== BigInt(0) ? message.endTime.toString() : undefined; return obj; }, fromProtoMsg(message: BaseVestingAccountProtoMsg, useInterfaces: boolean = true): BaseVestingAccount { @@ -444,7 +444,7 @@ export const ContinuousVestingAccount = { toAmino(message: ContinuousVestingAccount, useInterfaces: boolean = true): ContinuousVestingAccountAmino { const obj: any = {}; obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount, useInterfaces) : undefined; - obj.start_time = message.startTime ? message.startTime.toString() : undefined; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; return obj; }, fromProtoMsg(message: ContinuousVestingAccountProtoMsg, useInterfaces: boolean = true): ContinuousVestingAccount { @@ -631,11 +631,11 @@ export const Period = { }, toAmino(message: Period, useInterfaces: boolean = true): PeriodAmino { const obj: any = {}; - obj.length = message.length ? message.length.toString() : undefined; + obj.length = message.length !== BigInt(0) ? message.length.toString() : undefined; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -758,11 +758,11 @@ export const PeriodicVestingAccount = { toAmino(message: PeriodicVestingAccount, useInterfaces: boolean = true): PeriodicVestingAccountAmino { const obj: any = {}; obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount, useInterfaces) : undefined; - obj.start_time = message.startTime ? message.startTime.toString() : undefined; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e, useInterfaces) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmos_proto/cosmos.ts b/__fixtures__/v-next/outputv3/cosmos_proto/cosmos.ts index 3797ef5497..72836c13c8 100644 --- a/__fixtures__/v-next/outputv3/cosmos_proto/cosmos.ts +++ b/__fixtures__/v-next/outputv3/cosmos_proto/cosmos.ts @@ -246,8 +246,8 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor, useInterfaces: boolean = true): InterfaceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromProtoMsg(message: InterfaceDescriptorProtoMsg, useInterfaces: boolean = true): InterfaceDescriptor { @@ -367,17 +367,17 @@ export const ScalarDescriptor = { if (object.description !== undefined && object.description !== null) { message.description = object.description; } - message.fieldType = object.field_type?.map(e => scalarTypeFromJSON(e)) || []; + message.fieldType = object.field_type?.map(e => e) || []; return message; }, toAmino(message: ScalarDescriptor, useInterfaces: boolean = true): ScalarDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; if (message.fieldType) { obj.field_type = message.fieldType.map(e => e); } else { - obj.field_type = []; + obj.field_type = message.fieldType; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/genesis.ts b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/genesis.ts index 9a74323377..76b7a98508 100644 --- a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/genesis.ts @@ -285,22 +285,22 @@ export const GenesisState = { if (message.codes) { obj.codes = message.codes.map(e => e ? Code.toAmino(e, useInterfaces) : undefined); } else { - obj.codes = []; + obj.codes = message.codes; } if (message.contracts) { obj.contracts = message.contracts.map(e => e ? Contract.toAmino(e, useInterfaces) : undefined); } else { - obj.contracts = []; + obj.contracts = message.contracts; } if (message.sequences) { obj.sequences = message.sequences.map(e => e ? Sequence.toAmino(e, useInterfaces) : undefined); } else { - obj.sequences = []; + obj.sequences = message.sequences; } if (message.genMsgs) { obj.gen_msgs = message.genMsgs.map(e => e ? GenesisState_GenMsgs.toAmino(e, useInterfaces) : undefined); } else { - obj.gen_msgs = []; + obj.gen_msgs = message.genMsgs; } return obj; }, @@ -550,10 +550,10 @@ export const Code = { }, toAmino(message: Code, useInterfaces: boolean = true): CodeAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.code_info = message.codeInfo ? CodeInfo.toAmino(message.codeInfo, useInterfaces) : undefined; obj.code_bytes = message.codeBytes ? base64FromBytes(message.codeBytes) : undefined; - obj.pinned = message.pinned; + obj.pinned = message.pinned === false ? undefined : message.pinned; return obj; }, fromProtoMsg(message: CodeProtoMsg, useInterfaces: boolean = true): Code { @@ -672,12 +672,12 @@ export const Contract = { }, toAmino(message: Contract, useInterfaces: boolean = true): ContractAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; obj.contract_info = message.contractInfo ? ContractInfo.toAmino(message.contractInfo, useInterfaces) : undefined; if (message.contractState) { obj.contract_state = message.contractState.map(e => e ? Model.toAmino(e, useInterfaces) : undefined); } else { - obj.contract_state = []; + obj.contract_state = message.contractState; } return obj; }, @@ -777,7 +777,7 @@ export const Sequence = { toAmino(message: Sequence, useInterfaces: boolean = true): SequenceAmino { const obj: any = {}; obj.id_key = message.idKey ? base64FromBytes(message.idKey) : undefined; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromProtoMsg(message: SequenceProtoMsg, useInterfaces: boolean = true): Sequence { diff --git a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/ibc.ts b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/ibc.ts index 8e77be299d..556fae0105 100644 --- a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/ibc.ts +++ b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/ibc.ts @@ -182,9 +182,9 @@ export const MsgIBCSend = { }, toAmino(message: MsgIBCSend, useInterfaces: boolean = true): 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.channel = message.channel === "" ? undefined : message.channel; + obj.timeout_height = message.timeoutHeight !== BigInt(0) ? message.timeoutHeight.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -266,7 +266,7 @@ export const MsgIBCCloseChannel = { }, toAmino(message: MsgIBCCloseChannel, useInterfaces: boolean = true): MsgIBCCloseChannelAmino { const obj: any = {}; - obj.channel = message.channel; + obj.channel = message.channel === "" ? undefined : message.channel; return obj; }, fromProtoMsg(message: MsgIBCCloseChannelProtoMsg, useInterfaces: boolean = true): MsgIBCCloseChannel { diff --git a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/proposal.ts b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/proposal.ts index 0e11d7b5cc..489a9b9d3a 100644 --- a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/proposal.ts +++ b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/proposal.ts @@ -498,9 +498,9 @@ export const StoreCodeProposal = { }, toAmino(message: StoreCodeProposal, useInterfaces: boolean = true): StoreCodeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.run_as = message.runAs; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission, useInterfaces) : undefined; return obj; @@ -696,17 +696,17 @@ export const InstantiateContractProposal = { }, toAmino(message: InstantiateContractProposal, useInterfaces: boolean = true): 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : 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, useInterfaces) : undefined); } else { - obj.funds = []; + obj.funds = message.funds; } return obj; }, @@ -850,10 +850,10 @@ export const MigrateContractProposal = { }, toAmino(message: MigrateContractProposal, useInterfaces: boolean = true): 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -980,9 +980,9 @@ export const SudoContractProposal = { }, toAmino(message: SudoContractProposal, useInterfaces: boolean = true): SudoContractProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1145,15 +1145,15 @@ export const ExecuteContractProposal = { }, toAmino(message: ExecuteContractProposal, useInterfaces: boolean = true): ExecuteContractProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.run_as = message.runAs; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; + obj.contract = message.contract === "" ? undefined : 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, useInterfaces) : undefined); } else { - obj.funds = []; + obj.funds = message.funds; } return obj; }, @@ -1280,10 +1280,10 @@ export const UpdateAdminProposal = { }, toAmino(message: UpdateAdminProposal, useInterfaces: boolean = true): UpdateAdminProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.new_admin = message.newAdmin; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromProtoMsg(message: UpdateAdminProposalProtoMsg, useInterfaces: boolean = true): UpdateAdminProposal { @@ -1394,9 +1394,9 @@ export const ClearAdminProposal = { }, toAmino(message: ClearAdminProposal, useInterfaces: boolean = true): ClearAdminProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromProtoMsg(message: ClearAdminProposalProtoMsg, useInterfaces: boolean = true): ClearAdminProposal { @@ -1522,12 +1522,12 @@ export const PinCodesProposal = { }, toAmino(message: PinCodesProposal, useInterfaces: boolean = true): PinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, @@ -1654,12 +1654,12 @@ export const UnpinCodesProposal = { }, toAmino(message: UnpinCodesProposal, useInterfaces: boolean = true): UnpinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/query.ts index c93d9fc1ae..b3fb76999b 100644 --- a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/query.ts @@ -399,7 +399,7 @@ export interface CodeInfoResponseProtoMsg { } /** CodeInfoResponse contains code meta data from CodeInfo */ export interface CodeInfoResponseAmino { - code_id?: string; + code_id: string; creator?: string; data_hash?: string; } @@ -421,7 +421,7 @@ export interface QueryCodeResponseProtoMsg { /** QueryCodeResponse is the response type for the Query/Code RPC method */ export interface QueryCodeResponseAmino { code_info?: CodeInfoResponseAmino; - data?: string; + data: string; } /** QueryCodeResponse is the response type for the Query/Code RPC method */ export interface QueryCodeResponseSDKType { @@ -589,7 +589,7 @@ export const QueryContractInfoRequest = { }, toAmino(message: QueryContractInfoRequest, useInterfaces: boolean = true): QueryContractInfoRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: QueryContractInfoRequestProtoMsg, useInterfaces: boolean = true): QueryContractInfoRequest { @@ -687,7 +687,7 @@ export const QueryContractInfoResponse = { }, toAmino(message: QueryContractInfoResponse, useInterfaces: boolean = true): QueryContractInfoResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.contract_info = message.contractInfo ? ContractInfo.toAmino(message.contractInfo, useInterfaces) : undefined; return obj; }, @@ -786,7 +786,7 @@ export const QueryContractHistoryRequest = { }, toAmino(message: QueryContractHistoryRequest, useInterfaces: boolean = true): QueryContractHistoryRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -894,7 +894,7 @@ export const QueryContractHistoryResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? ContractCodeHistoryEntry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -996,7 +996,7 @@ export const QueryContractsByCodeRequest = { }, toAmino(message: QueryContractsByCodeRequest, useInterfaces: boolean = true): QueryContractsByCodeRequestAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1104,7 +1104,7 @@ export const QueryContractsByCodeResponse = { if (message.contracts) { obj.contracts = message.contracts.map(e => e); } else { - obj.contracts = []; + obj.contracts = message.contracts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1204,7 +1204,7 @@ export const QueryAllContractStateRequest = { }, toAmino(message: QueryAllContractStateRequest, useInterfaces: boolean = true): QueryAllContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1312,7 +1312,7 @@ export const QueryAllContractStateResponse = { if (message.models) { obj.models = message.models.map(e => e ? Model.toAmino(e, useInterfaces) : undefined); } else { - obj.models = []; + obj.models = message.models; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1410,7 +1410,7 @@ export const QueryRawContractStateRequest = { }, toAmino(message: QueryRawContractStateRequest, useInterfaces: boolean = true): QueryRawContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? base64FromBytes(message.queryData) : undefined; return obj; }, @@ -1588,7 +1588,7 @@ export const QuerySmartContractStateRequest = { }, toAmino(message: QuerySmartContractStateRequest, useInterfaces: boolean = true): QuerySmartContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? JSON.parse(fromUtf8(message.queryData)) : undefined; return obj; }, @@ -1753,7 +1753,7 @@ export const QueryCodeRequest = { }, toAmino(message: QueryCodeRequest, useInterfaces: boolean = true): QueryCodeRequestAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryCodeRequestProtoMsg, useInterfaces: boolean = true): QueryCodeRequest { @@ -1866,8 +1866,8 @@ export const CodeInfoResponse = { }, toAmino(message: CodeInfoResponse, useInterfaces: boolean = true): CodeInfoResponseAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; - obj.creator = message.creator; + obj.code_id = message.codeId ? message.codeId.toString() : "0"; + obj.creator = message.creator === "" ? undefined : message.creator; obj.data_hash = message.dataHash ? base64FromBytes(message.dataHash) : undefined; return obj; }, @@ -1967,7 +1967,7 @@ export const QueryCodeResponse = { toAmino(message: QueryCodeResponse, useInterfaces: boolean = true): QueryCodeResponseAmino { const obj: any = {}; obj.code_info = message.codeInfo ? CodeInfoResponse.toAmino(message.codeInfo, useInterfaces) : undefined; - obj.data = message.data ? base64FromBytes(message.data) : undefined; + obj.data = message.data ? base64FromBytes(message.data) : ""; return obj; }, fromProtoMsg(message: QueryCodeResponseProtoMsg, useInterfaces: boolean = true): QueryCodeResponse { @@ -2157,7 +2157,7 @@ export const QueryCodesResponse = { if (message.codeInfos) { obj.code_infos = message.codeInfos.map(e => e ? CodeInfoResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.code_infos = []; + obj.code_infos = message.codeInfos; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -2358,7 +2358,7 @@ export const QueryPinnedCodesResponse = { if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/tx.ts b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/tx.ts index 60d929de95..9281c7ae50 100644 --- a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/tx.ts @@ -407,7 +407,7 @@ export const MsgStoreCode = { }, toAmino(message: MsgStoreCode, useInterfaces: boolean = true): MsgStoreCodeAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission, useInterfaces) : undefined; return obj; @@ -492,7 +492,7 @@ export const MsgStoreCodeResponse = { }, toAmino(message: MsgStoreCodeResponse, useInterfaces: boolean = true): MsgStoreCodeResponseAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromProtoMsg(message: MsgStoreCodeResponseProtoMsg, useInterfaces: boolean = true): MsgStoreCodeResponse { @@ -656,15 +656,15 @@ export const MsgInstantiateContract = { }, toAmino(message: MsgInstantiateContract, useInterfaces: boolean = true): 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.sender = message.sender === "" ? undefined : message.sender; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : 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, useInterfaces) : undefined); } else { - obj.funds = []; + obj.funds = message.funds; } return obj; }, @@ -761,7 +761,7 @@ export const MsgInstantiateContractResponse = { }, toAmino(message: MsgInstantiateContractResponse, useInterfaces: boolean = true): MsgInstantiateContractResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -894,13 +894,13 @@ export const MsgExecuteContract = { }, toAmino(message: MsgExecuteContract, useInterfaces: boolean = true): MsgExecuteContractAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : 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, useInterfaces) : undefined); } else { - obj.funds = []; + obj.funds = message.funds; } return obj; }, @@ -1110,9 +1110,9 @@ export const MsgMigrateContract = { }, toAmino(message: MsgMigrateContract, useInterfaces: boolean = true): MsgMigrateContractAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1305,9 +1305,9 @@ export const MsgUpdateAdmin = { }, toAmino(message: MsgUpdateAdmin, useInterfaces: boolean = true): MsgUpdateAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.new_admin = message.newAdmin; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromProtoMsg(message: MsgUpdateAdminProtoMsg, useInterfaces: boolean = true): MsgUpdateAdmin { @@ -1466,8 +1466,8 @@ export const MsgClearAdmin = { }, toAmino(message: MsgClearAdmin, useInterfaces: boolean = true): MsgClearAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromProtoMsg(message: MsgClearAdminProtoMsg, useInterfaces: boolean = true): MsgClearAdmin { diff --git a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/types.ts b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/types.ts index 10f7b59963..3fe22de0b4 100644 --- a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/types.ts +++ b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/types.ts @@ -402,13 +402,13 @@ export const AccessTypeParam = { fromAmino(object: AccessTypeParamAmino): AccessTypeParam { const message = createBaseAccessTypeParam(); if (object.value !== undefined && object.value !== null) { - message.value = accessTypeFromJSON(object.value); + message.value = object.value; } return message; }, toAmino(message: AccessTypeParam, useInterfaces: boolean = true): AccessTypeParamAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromProtoMsg(message: AccessTypeParamProtoMsg, useInterfaces: boolean = true): AccessTypeParam { @@ -495,7 +495,7 @@ export const AccessConfig = { fromAmino(object: AccessConfigAmino): AccessConfig { const message = createBaseAccessConfig(); if (object.permission !== undefined && object.permission !== null) { - message.permission = accessTypeFromJSON(object.permission); + message.permission = object.permission; } if (object.address !== undefined && object.address !== null) { message.address = object.address; @@ -504,8 +504,8 @@ export const AccessConfig = { }, toAmino(message: AccessConfig, useInterfaces: boolean = true): AccessConfigAmino { const obj: any = {}; - obj.permission = message.permission; - obj.address = message.address; + obj.permission = message.permission === 0 ? undefined : message.permission; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: AccessConfigProtoMsg, useInterfaces: boolean = true): AccessConfig { @@ -611,7 +611,7 @@ export const Params = { message.codeUploadAccess = AccessConfig.fromAmino(object.code_upload_access); } if (object.instantiate_default_permission !== undefined && object.instantiate_default_permission !== null) { - message.instantiateDefaultPermission = accessTypeFromJSON(object.instantiate_default_permission); + message.instantiateDefaultPermission = object.instantiate_default_permission; } if (object.max_wasm_code_size !== undefined && object.max_wasm_code_size !== null) { message.maxWasmCodeSize = BigInt(object.max_wasm_code_size); @@ -621,8 +621,8 @@ export const Params = { toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; obj.code_upload_access = message.codeUploadAccess ? AccessConfig.toAmino(message.codeUploadAccess, useInterfaces) : undefined; - obj.instantiate_default_permission = message.instantiateDefaultPermission; - obj.max_wasm_code_size = message.maxWasmCodeSize ? message.maxWasmCodeSize.toString() : undefined; + obj.instantiate_default_permission = message.instantiateDefaultPermission === 0 ? undefined : message.instantiateDefaultPermission; + obj.max_wasm_code_size = message.maxWasmCodeSize !== BigInt(0) ? message.maxWasmCodeSize.toString() : undefined; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { @@ -736,7 +736,7 @@ export const CodeInfo = { toAmino(message: CodeInfo, useInterfaces: boolean = true): CodeInfoAmino { const obj: any = {}; obj.code_hash = message.codeHash ? base64FromBytes(message.codeHash) : undefined; - obj.creator = message.creator; + obj.creator = message.creator === "" ? undefined : message.creator; obj.instantiate_config = message.instantiateConfig ? AccessConfig.toAmino(message.instantiateConfig, useInterfaces) : undefined; return obj; }, @@ -914,12 +914,12 @@ export const ContractInfo = { }, toAmino(message: ContractInfo, useInterfaces: boolean = true): 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.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.creator = message.creator === "" ? undefined : message.creator; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.label = message.label === "" ? undefined : message.label; obj.created = message.created ? AbsoluteTxPosition.toAmino(message.created, useInterfaces) : undefined; - obj.ibc_port_id = message.ibcPortId; + obj.ibc_port_id = message.ibcPortId === "" ? undefined : message.ibcPortId; obj.extension = message.extension ? ContractInfoExtension_ToAmino((message.extension as Any), useInterfaces) : undefined; return obj; }, @@ -1035,7 +1035,7 @@ export const ContractCodeHistoryEntry = { fromAmino(object: ContractCodeHistoryEntryAmino): ContractCodeHistoryEntry { const message = createBaseContractCodeHistoryEntry(); if (object.operation !== undefined && object.operation !== null) { - message.operation = contractCodeHistoryOperationTypeFromJSON(object.operation); + message.operation = object.operation; } if (object.code_id !== undefined && object.code_id !== null) { message.codeId = BigInt(object.code_id); @@ -1050,8 +1050,8 @@ export const ContractCodeHistoryEntry = { }, toAmino(message: ContractCodeHistoryEntry, useInterfaces: boolean = true): ContractCodeHistoryEntryAmino { const obj: any = {}; - obj.operation = message.operation; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.operation = message.operation === 0 ? undefined : message.operation; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.updated = message.updated ? AbsoluteTxPosition.toAmino(message.updated, useInterfaces) : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; @@ -1153,8 +1153,8 @@ export const AbsoluteTxPosition = { }, toAmino(message: AbsoluteTxPosition, useInterfaces: boolean = true): AbsoluteTxPositionAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; - obj.tx_index = message.txIndex ? message.txIndex.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; + obj.tx_index = message.txIndex !== BigInt(0) ? message.txIndex.toString() : undefined; return obj; }, fromProtoMsg(message: AbsoluteTxPositionProtoMsg, useInterfaces: boolean = true): AbsoluteTxPosition { @@ -1275,7 +1275,7 @@ export const ContractInfoExtension_InterfaceDecoder = (input: BinaryReader | Uin return data; } }; -export const ContractInfoExtension_FromAmino = (content: AnyAmino) => { +export const ContractInfoExtension_FromAmino = (content: AnyAmino): Any => { return Any.fromAmino(content); }; export const ContractInfoExtension_ToAmino = (content: Any, useInterfaces: boolean = true) => { diff --git a/__fixtures__/v-next/outputv3/evmos/claims/v1/claims.ts b/__fixtures__/v-next/outputv3/evmos/claims/v1/claims.ts index 18ea295ee5..51311e85b0 100644 --- a/__fixtures__/v-next/outputv3/evmos/claims/v1/claims.ts +++ b/__fixtures__/v-next/outputv3/evmos/claims/v1/claims.ts @@ -236,7 +236,7 @@ export const Claim = { fromAmino(object: ClaimAmino): Claim { const message = createBaseClaim(); if (object.action !== undefined && object.action !== null) { - message.action = actionFromJSON(object.action); + message.action = object.action; } if (object.completed !== undefined && object.completed !== null) { message.completed = object.completed; @@ -248,9 +248,9 @@ export const Claim = { }, toAmino(message: Claim, useInterfaces: boolean = true): ClaimAmino { const obj: any = {}; - obj.action = message.action; - obj.completed = message.completed; - obj.claimable_amount = message.claimableAmount; + obj.action = message.action === 0 ? undefined : message.action; + obj.completed = message.completed === false ? undefined : message.completed; + obj.claimable_amount = message.claimableAmount === "" ? undefined : message.claimableAmount; return obj; }, fromProtoMsg(message: ClaimProtoMsg, useInterfaces: boolean = true): Claim { @@ -375,12 +375,12 @@ export const ClaimsRecordAddress = { }, toAmino(message: ClaimsRecordAddress, useInterfaces: boolean = true): ClaimsRecordAddressAmino { const obj: any = {}; - obj.address = message.address; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.address = message.address === "" ? undefined : message.address; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.actionsCompleted) { obj.actions_completed = message.actionsCompleted.map(e => e); } else { - obj.actions_completed = []; + obj.actions_completed = message.actionsCompleted; } return obj; }, @@ -491,11 +491,11 @@ export const ClaimsRecord = { }, toAmino(message: ClaimsRecord, useInterfaces: boolean = true): ClaimsRecordAmino { const obj: any = {}; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.actionsCompleted) { obj.actions_completed = message.actionsCompleted.map(e => e); } else { - obj.actions_completed = []; + obj.actions_completed = message.actionsCompleted; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/evmos/claims/v1/genesis.ts b/__fixtures__/v-next/outputv3/evmos/claims/v1/genesis.ts index bcd30f5a4b..80c50c4192 100644 --- a/__fixtures__/v-next/outputv3/evmos/claims/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/evmos/claims/v1/genesis.ts @@ -172,7 +172,7 @@ export const GenesisState = { if (message.claimsRecords) { obj.claims_records = message.claimsRecords.map(e => e ? ClaimsRecordAddress.toAmino(e, useInterfaces) : undefined); } else { - obj.claims_records = []; + obj.claims_records = message.claimsRecords; } return obj; }, @@ -359,20 +359,20 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.enable_claims = message.enableClaims; + obj.enable_claims = message.enableClaims === false ? undefined : message.enableClaims; obj.airdrop_start_time = message.airdropStartTime ? Timestamp.toAmino(toTimestamp(message.airdropStartTime)) : undefined; obj.duration_until_decay = message.durationUntilDecay ? Duration.toAmino(message.durationUntilDecay, useInterfaces) : undefined; obj.duration_of_decay = message.durationOfDecay ? Duration.toAmino(message.durationOfDecay, useInterfaces) : undefined; - obj.claims_denom = message.claimsDenom; + obj.claims_denom = message.claimsDenom === "" ? undefined : message.claimsDenom; if (message.authorizedChannels) { obj.authorized_channels = message.authorizedChannels.map(e => e); } else { - obj.authorized_channels = []; + obj.authorized_channels = message.authorizedChannels; } if (message.evmChannels) { obj.evm_channels = message.evmChannels.map(e => e); } else { - obj.evm_channels = []; + obj.evm_channels = message.evmChannels; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/evmos/claims/v1/query.ts b/__fixtures__/v-next/outputv3/evmos/claims/v1/query.ts index 0afa0b7125..cc7834a0bf 100644 --- a/__fixtures__/v-next/outputv3/evmos/claims/v1/query.ts +++ b/__fixtures__/v-next/outputv3/evmos/claims/v1/query.ts @@ -332,7 +332,7 @@ export const QueryTotalUnclaimedResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -665,7 +665,7 @@ export const QueryClaimsRecordsResponse = { if (message.claims) { obj.claims = message.claims.map(e => e ? ClaimsRecordAddress.toAmino(e, useInterfaces) : undefined); } else { - obj.claims = []; + obj.claims = message.claims; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -747,7 +747,7 @@ export const QueryClaimsRecordRequest = { }, toAmino(message: QueryClaimsRecordRequest, useInterfaces: boolean = true): QueryClaimsRecordRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: QueryClaimsRecordRequestProtoMsg, useInterfaces: boolean = true): QueryClaimsRecordRequest { @@ -848,11 +848,11 @@ export const QueryClaimsRecordResponse = { }, toAmino(message: QueryClaimsRecordResponse, useInterfaces: boolean = true): QueryClaimsRecordResponseAmino { const obj: any = {}; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.claims) { obj.claims = message.claims.map(e => e ? Claim.toAmino(e, useInterfaces) : undefined); } else { - obj.claims = []; + obj.claims = message.claims; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/evmos/epochs/v1/genesis.ts b/__fixtures__/v-next/outputv3/evmos/epochs/v1/genesis.ts index ec576890fa..5cb2c8af1d 100644 --- a/__fixtures__/v-next/outputv3/evmos/epochs/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/evmos/epochs/v1/genesis.ts @@ -210,13 +210,13 @@ export const EpochInfo = { }, toAmino(message: EpochInfo, useInterfaces: boolean = true): EpochInfoAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; obj.current_epoch_start_time = message.currentEpochStartTime ? Timestamp.toAmino(toTimestamp(message.currentEpochStartTime)) : undefined; - obj.epoch_counting_started = message.epochCountingStarted; - obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + obj.epoch_counting_started = message.epochCountingStarted === false ? undefined : message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight !== BigInt(0) ? message.currentEpochStartHeight.toString() : undefined; return obj; }, fromProtoMsg(message: EpochInfoProtoMsg, useInterfaces: boolean = true): EpochInfo { @@ -305,7 +305,7 @@ export const GenesisState = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/evmos/epochs/v1/query.ts b/__fixtures__/v-next/outputv3/evmos/epochs/v1/query.ts index a91e1aefbb..4a4f9efbd4 100644 --- a/__fixtures__/v-next/outputv3/evmos/epochs/v1/query.ts +++ b/__fixtures__/v-next/outputv3/evmos/epochs/v1/query.ts @@ -230,7 +230,7 @@ export const QueryEpochsInfoResponse = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -312,7 +312,7 @@ export const QueryCurrentEpochRequest = { }, toAmino(message: QueryCurrentEpochRequest, useInterfaces: boolean = true): QueryCurrentEpochRequestAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; return obj; }, fromProtoMsg(message: QueryCurrentEpochRequestProtoMsg, useInterfaces: boolean = true): QueryCurrentEpochRequest { @@ -394,7 +394,7 @@ export const QueryCurrentEpochResponse = { }, toAmino(message: QueryCurrentEpochResponse, useInterfaces: boolean = true): QueryCurrentEpochResponseAmino { const obj: any = {}; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; return obj; }, fromProtoMsg(message: QueryCurrentEpochResponseProtoMsg, useInterfaces: boolean = true): QueryCurrentEpochResponse { diff --git a/__fixtures__/v-next/outputv3/evmos/erc20/v1/erc20.ts b/__fixtures__/v-next/outputv3/evmos/erc20/v1/erc20.ts index 4951cc0272..ce2b560989 100644 --- a/__fixtures__/v-next/outputv3/evmos/erc20/v1/erc20.ts +++ b/__fixtures__/v-next/outputv3/evmos/erc20/v1/erc20.ts @@ -306,16 +306,16 @@ export const TokenPair = { message.enabled = object.enabled; } if (object.contract_owner !== undefined && object.contract_owner !== null) { - message.contractOwner = ownerFromJSON(object.contract_owner); + message.contractOwner = object.contract_owner; } return message; }, toAmino(message: TokenPair, useInterfaces: boolean = true): TokenPairAmino { const obj: any = {}; - obj.erc20_address = message.erc20Address; - obj.denom = message.denom; - obj.enabled = message.enabled; - obj.contract_owner = message.contractOwner; + obj.erc20_address = message.erc20Address === "" ? undefined : message.erc20Address; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.enabled = message.enabled === false ? undefined : message.enabled; + obj.contract_owner = message.contractOwner === 0 ? undefined : message.contractOwner; return obj; }, fromProtoMsg(message: TokenPairProtoMsg, useInterfaces: boolean = true): TokenPair { @@ -427,8 +427,8 @@ export const RegisterCoinProposal = { }, toAmino(message: RegisterCoinProposal, useInterfaces: boolean = true): RegisterCoinProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata, useInterfaces) : undefined; return obj; }, @@ -539,9 +539,9 @@ export const RegisterERC20Proposal = { }, toAmino(message: RegisterERC20Proposal, useInterfaces: boolean = true): RegisterERC20ProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.erc20address = message.erc20address; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.erc20address = message.erc20address === "" ? undefined : message.erc20address; return obj; }, fromProtoMsg(message: RegisterERC20ProposalProtoMsg, useInterfaces: boolean = true): RegisterERC20Proposal { @@ -651,9 +651,9 @@ export const ToggleTokenConversionProposal = { }, toAmino(message: ToggleTokenConversionProposal, useInterfaces: boolean = true): ToggleTokenConversionProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.token = message.token; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.token = message.token === "" ? undefined : message.token; return obj; }, fromProtoMsg(message: ToggleTokenConversionProposalProtoMsg, useInterfaces: boolean = true): ToggleTokenConversionProposal { diff --git a/__fixtures__/v-next/outputv3/evmos/erc20/v1/genesis.ts b/__fixtures__/v-next/outputv3/evmos/erc20/v1/genesis.ts index ba935afa91..2b5787ad42 100644 --- a/__fixtures__/v-next/outputv3/evmos/erc20/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/evmos/erc20/v1/genesis.ts @@ -147,7 +147,7 @@ export const GenesisState = { if (message.tokenPairs) { obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e, useInterfaces) : undefined); } else { - obj.token_pairs = []; + obj.token_pairs = message.tokenPairs; } return obj; }, @@ -243,8 +243,8 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.enable_erc20 = message.enableErc20; - obj.enable_evm_hook = message.enableEvmHook; + obj.enable_erc20 = message.enableErc20 === false ? undefined : message.enableErc20; + obj.enable_evm_hook = message.enableEvmHook === false ? undefined : message.enableEvmHook; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/evmos/erc20/v1/query.ts b/__fixtures__/v-next/outputv3/evmos/erc20/v1/query.ts index 55beac63b6..24fe73f144 100644 --- a/__fixtures__/v-next/outputv3/evmos/erc20/v1/query.ts +++ b/__fixtures__/v-next/outputv3/evmos/erc20/v1/query.ts @@ -317,7 +317,7 @@ export const QueryTokenPairsResponse = { if (message.tokenPairs) { obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e, useInterfaces) : undefined); } else { - obj.token_pairs = []; + obj.token_pairs = message.tokenPairs; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -399,7 +399,7 @@ export const QueryTokenPairRequest = { }, toAmino(message: QueryTokenPairRequest, useInterfaces: boolean = true): QueryTokenPairRequestAmino { const obj: any = {}; - obj.token = message.token; + obj.token = message.token === "" ? undefined : message.token; return obj; }, fromProtoMsg(message: QueryTokenPairRequestProtoMsg, useInterfaces: boolean = true): QueryTokenPairRequest { diff --git a/__fixtures__/v-next/outputv3/evmos/erc20/v1/tx.ts b/__fixtures__/v-next/outputv3/evmos/erc20/v1/tx.ts index 122d681602..60cc6cb5b3 100644 --- a/__fixtures__/v-next/outputv3/evmos/erc20/v1/tx.ts +++ b/__fixtures__/v-next/outputv3/evmos/erc20/v1/tx.ts @@ -195,8 +195,8 @@ export const MsgConvertCoin = { toAmino(message: MsgConvertCoin, useInterfaces: boolean = true): MsgConvertCoinAmino { const obj: any = {}; obj.coin = message.coin ? Coin.toAmino(message.coin, useInterfaces) : undefined; - obj.receiver = message.receiver; - obj.sender = message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromProtoMsg(message: MsgConvertCoinProtoMsg, useInterfaces: boolean = true): MsgConvertCoin { @@ -383,10 +383,10 @@ export const MsgConvertERC20 = { }, toAmino(message: MsgConvertERC20, useInterfaces: boolean = true): MsgConvertERC20Amino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.amount = message.amount; - obj.receiver = message.receiver; - obj.sender = message.sender; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.receiver = message.receiver === "" ? undefined : message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromProtoMsg(message: MsgConvertERC20ProtoMsg, useInterfaces: boolean = true): MsgConvertERC20 { diff --git a/__fixtures__/v-next/outputv3/evmos/fees/v1/fees.ts b/__fixtures__/v-next/outputv3/evmos/fees/v1/fees.ts index cb2ad69ee3..1348aa6ca4 100644 --- a/__fixtures__/v-next/outputv3/evmos/fees/v1/fees.ts +++ b/__fixtures__/v-next/outputv3/evmos/fees/v1/fees.ts @@ -138,9 +138,9 @@ export const DevFeeInfo = { }, toAmino(message: DevFeeInfo, useInterfaces: boolean = true): DevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromProtoMsg(message: DevFeeInfoProtoMsg, useInterfaces: boolean = true): DevFeeInfo { diff --git a/__fixtures__/v-next/outputv3/evmos/fees/v1/genesis.ts b/__fixtures__/v-next/outputv3/evmos/fees/v1/genesis.ts index 7c8cd1faee..a0fa2d1893 100644 --- a/__fixtures__/v-next/outputv3/evmos/fees/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/evmos/fees/v1/genesis.ts @@ -173,7 +173,7 @@ export const GenesisState = { if (message.devFeeInfos) { obj.dev_fee_infos = message.devFeeInfos.map(e => e ? DevFeeInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.dev_fee_infos = []; + obj.dev_fee_infos = message.devFeeInfos; } return obj; }, @@ -316,11 +316,11 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): 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; + obj.enable_fees = message.enableFees === false ? undefined : message.enableFees; + obj.developer_shares = message.developerShares === "" ? undefined : message.developerShares; + obj.validator_shares = message.validatorShares === "" ? undefined : message.validatorShares; + obj.addr_derivation_cost_create = message.addrDerivationCostCreate !== BigInt(0) ? message.addrDerivationCostCreate.toString() : undefined; + obj.min_gas_price = message.minGasPrice === "" ? undefined : message.minGasPrice; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/evmos/fees/v1/query.ts b/__fixtures__/v-next/outputv3/evmos/fees/v1/query.ts index 060e5b3400..680631bea3 100644 --- a/__fixtures__/v-next/outputv3/evmos/fees/v1/query.ts +++ b/__fixtures__/v-next/outputv3/evmos/fees/v1/query.ts @@ -382,7 +382,7 @@ export const QueryDevFeeInfosResponse = { if (message.fees) { obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.fees = []; + obj.fees = message.fees; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -464,7 +464,7 @@ export const QueryDevFeeInfoRequest = { }, toAmino(message: QueryDevFeeInfoRequest, useInterfaces: boolean = true): QueryDevFeeInfoRequestAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; return obj; }, fromProtoMsg(message: QueryDevFeeInfoRequestProtoMsg, useInterfaces: boolean = true): QueryDevFeeInfoRequest { @@ -787,7 +787,7 @@ export const QueryDevFeeInfosPerDeployerRequest = { }, toAmino(message: QueryDevFeeInfosPerDeployerRequest, useInterfaces: boolean = true): QueryDevFeeInfosPerDeployerRequestAmino { const obj: any = {}; - obj.deployer_address = message.deployerAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -894,7 +894,7 @@ export const QueryDevFeeInfosPerDeployerResponse = { if (message.fees) { obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.fees = []; + obj.fees = message.fees; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/evmos/fees/v1/tx.ts b/__fixtures__/v-next/outputv3/evmos/fees/v1/tx.ts index daea867f21..8035387118 100644 --- a/__fixtures__/v-next/outputv3/evmos/fees/v1/tx.ts +++ b/__fixtures__/v-next/outputv3/evmos/fees/v1/tx.ts @@ -280,13 +280,13 @@ export const MsgRegisterDevFeeInfo = { }, toAmino(message: MsgRegisterDevFeeInfo, useInterfaces: boolean = true): MsgRegisterDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; if (message.nonces) { obj.nonces = message.nonces.map(e => e.toString()); } else { - obj.nonces = []; + obj.nonces = message.nonces; } return obj; }, @@ -444,8 +444,8 @@ export const MsgCancelDevFeeInfo = { }, toAmino(message: MsgCancelDevFeeInfo, useInterfaces: boolean = true): MsgCancelDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; return obj; }, fromProtoMsg(message: MsgCancelDevFeeInfoProtoMsg, useInterfaces: boolean = true): MsgCancelDevFeeInfo { @@ -617,9 +617,9 @@ export const MsgUpdateDevFeeInfo = { }, toAmino(message: MsgUpdateDevFeeInfo, useInterfaces: boolean = true): MsgUpdateDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromProtoMsg(message: MsgUpdateDevFeeInfoProtoMsg, useInterfaces: boolean = true): MsgUpdateDevFeeInfo { diff --git a/__fixtures__/v-next/outputv3/evmos/incentives/v1/genesis.ts b/__fixtures__/v-next/outputv3/evmos/incentives/v1/genesis.ts index 7865a37f99..a1ecc40c95 100644 --- a/__fixtures__/v-next/outputv3/evmos/incentives/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/evmos/incentives/v1/genesis.ts @@ -176,12 +176,12 @@ export const GenesisState = { if (message.incentives) { obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e, useInterfaces) : undefined); } else { - obj.incentives = []; + obj.incentives = message.incentives; } if (message.gasMeters) { obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e, useInterfaces) : undefined); } else { - obj.gas_meters = []; + obj.gas_meters = message.gasMeters; } return obj; }, @@ -307,10 +307,10 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): 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; + obj.enable_incentives = message.enableIncentives === false ? undefined : message.enableIncentives; + obj.allocation_limit = message.allocationLimit === "" ? undefined : message.allocationLimit; + obj.incentives_epoch_identifier = message.incentivesEpochIdentifier === "" ? undefined : message.incentivesEpochIdentifier; + obj.reward_scaler = message.rewardScaler === "" ? undefined : message.rewardScaler; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/evmos/incentives/v1/incentives.ts b/__fixtures__/v-next/outputv3/evmos/incentives/v1/incentives.ts index d754aa5874..ca2147a116 100644 --- a/__fixtures__/v-next/outputv3/evmos/incentives/v1/incentives.ts +++ b/__fixtures__/v-next/outputv3/evmos/incentives/v1/incentives.ts @@ -278,15 +278,15 @@ export const Incentive = { }, toAmino(message: Incentive, useInterfaces: boolean = true): IncentiveAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; if (message.allocations) { obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } - obj.epochs = message.epochs; + obj.epochs = message.epochs === 0 ? undefined : message.epochs; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.total_gas = message.totalGas ? message.totalGas.toString() : undefined; + obj.total_gas = message.totalGas !== BigInt(0) ? message.totalGas.toString() : undefined; return obj; }, fromProtoMsg(message: IncentiveProtoMsg, useInterfaces: boolean = true): Incentive { @@ -398,9 +398,9 @@ export const GasMeter = { }, toAmino(message: GasMeter, useInterfaces: boolean = true): GasMeterAmino { const obj: any = {}; - obj.contract = message.contract; - obj.participant = message.participant; - obj.cumulative_gas = message.cumulativeGas ? message.cumulativeGas.toString() : undefined; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.participant = message.participant === "" ? undefined : message.participant; + obj.cumulative_gas = message.cumulativeGas !== BigInt(0) ? message.cumulativeGas.toString() : undefined; return obj; }, fromProtoMsg(message: GasMeterProtoMsg, useInterfaces: boolean = true): GasMeter { @@ -547,15 +547,15 @@ export const RegisterIncentiveProposal = { }, toAmino(message: RegisterIncentiveProposal, useInterfaces: boolean = true): RegisterIncentiveProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; if (message.allocations) { obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } - obj.epochs = message.epochs; + obj.epochs = message.epochs === 0 ? undefined : message.epochs; return obj; }, fromProtoMsg(message: RegisterIncentiveProposalProtoMsg, useInterfaces: boolean = true): RegisterIncentiveProposal { @@ -665,9 +665,9 @@ export const CancelIncentiveProposal = { }, toAmino(message: CancelIncentiveProposal, useInterfaces: boolean = true): CancelIncentiveProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromProtoMsg(message: CancelIncentiveProposalProtoMsg, useInterfaces: boolean = true): CancelIncentiveProposal { diff --git a/__fixtures__/v-next/outputv3/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputv3/evmos/incentives/v1/query.ts index beec6d0c36..d2056193d3 100644 --- a/__fixtures__/v-next/outputv3/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputv3/evmos/incentives/v1/query.ts @@ -539,7 +539,7 @@ export const QueryIncentivesResponse = { if (message.incentives) { obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e, useInterfaces) : undefined); } else { - obj.incentives = []; + obj.incentives = message.incentives; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -621,7 +621,7 @@ export const QueryIncentiveRequest = { }, toAmino(message: QueryIncentiveRequest, useInterfaces: boolean = true): QueryIncentiveRequestAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromProtoMsg(message: QueryIncentiveRequestProtoMsg, useInterfaces: boolean = true): QueryIncentiveRequest { @@ -800,7 +800,7 @@ export const QueryGasMetersRequest = { }, toAmino(message: QueryGasMetersRequest, useInterfaces: boolean = true): QueryGasMetersRequestAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -907,7 +907,7 @@ export const QueryGasMetersResponse = { if (message.gasMeters) { obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e, useInterfaces) : undefined); } else { - obj.gas_meters = []; + obj.gas_meters = message.gasMeters; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1004,8 +1004,8 @@ export const QueryGasMeterRequest = { }, toAmino(message: QueryGasMeterRequest, useInterfaces: boolean = true): QueryGasMeterRequestAmino { const obj: any = {}; - obj.contract = message.contract; - obj.participant = message.participant; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.participant = message.participant === "" ? undefined : message.participant; return obj; }, fromProtoMsg(message: QueryGasMeterRequestProtoMsg, useInterfaces: boolean = true): QueryGasMeterRequest { @@ -1087,7 +1087,7 @@ export const QueryGasMeterResponse = { }, toAmino(message: QueryGasMeterResponse, useInterfaces: boolean = true): QueryGasMeterResponseAmino { const obj: any = {}; - obj.gas_meter = message.gasMeter ? message.gasMeter.toString() : undefined; + obj.gas_meter = message.gasMeter !== BigInt(0) ? message.gasMeter.toString() : undefined; return obj; }, fromProtoMsg(message: QueryGasMeterResponseProtoMsg, useInterfaces: boolean = true): QueryGasMeterResponse { @@ -1275,7 +1275,7 @@ export const QueryAllocationMetersResponse = { if (message.allocationMeters) { obj.allocation_meters = message.allocationMeters.map(e => e ? DecCoin.toAmino(e, useInterfaces) : undefined); } else { - obj.allocation_meters = []; + obj.allocation_meters = message.allocationMeters; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1357,7 +1357,7 @@ export const QueryAllocationMeterRequest = { }, toAmino(message: QueryAllocationMeterRequest, useInterfaces: boolean = true): QueryAllocationMeterRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: QueryAllocationMeterRequestProtoMsg, useInterfaces: boolean = true): QueryAllocationMeterRequest { diff --git a/__fixtures__/v-next/outputv3/evmos/inflation/v1/genesis.ts b/__fixtures__/v-next/outputv3/evmos/inflation/v1/genesis.ts index 4a243416da..8d740b52f2 100644 --- a/__fixtures__/v-next/outputv3/evmos/inflation/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/evmos/inflation/v1/genesis.ts @@ -206,10 +206,10 @@ export const GenesisState = { toAmino(message: GenesisState, useInterfaces: boolean = true): GenesisStateAmino { const obj: any = {}; obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : 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; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; + obj.epoch_identifier = message.epochIdentifier === "" ? undefined : message.epochIdentifier; + obj.epochs_per_period = message.epochsPerPeriod !== BigInt(0) ? message.epochsPerPeriod.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs !== BigInt(0) ? message.skippedEpochs.toString() : undefined; return obj; }, fromProtoMsg(message: GenesisStateProtoMsg, useInterfaces: boolean = true): GenesisState { @@ -338,10 +338,10 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.mint_denom = message.mintDenom; + obj.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; obj.exponential_calculation = message.exponentialCalculation ? ExponentialCalculation.toAmino(message.exponentialCalculation, useInterfaces) : undefined; obj.inflation_distribution = message.inflationDistribution ? InflationDistribution.toAmino(message.inflationDistribution, useInterfaces) : undefined; - obj.enable_inflation = message.enableInflation; + obj.enable_inflation = message.enableInflation === false ? undefined : message.enableInflation; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/evmos/inflation/v1/inflation.ts b/__fixtures__/v-next/outputv3/evmos/inflation/v1/inflation.ts index 194eefe43e..e5ddcb56b7 100644 --- a/__fixtures__/v-next/outputv3/evmos/inflation/v1/inflation.ts +++ b/__fixtures__/v-next/outputv3/evmos/inflation/v1/inflation.ts @@ -222,9 +222,9 @@ export const InflationDistribution = { }, toAmino(message: InflationDistribution, useInterfaces: boolean = true): InflationDistributionAmino { const obj: any = {}; - obj.staking_rewards = message.stakingRewards; - obj.usage_incentives = message.usageIncentives; - obj.community_pool = message.communityPool; + obj.staking_rewards = message.stakingRewards === "" ? undefined : message.stakingRewards; + obj.usage_incentives = message.usageIncentives === "" ? undefined : message.usageIncentives; + obj.community_pool = message.communityPool === "" ? undefined : message.communityPool; return obj; }, fromProtoMsg(message: InflationDistributionProtoMsg, useInterfaces: boolean = true): InflationDistribution { @@ -364,11 +364,11 @@ export const ExponentialCalculation = { }, toAmino(message: ExponentialCalculation, useInterfaces: boolean = true): 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; + obj.a = message.a === "" ? undefined : message.a; + obj.r = message.r === "" ? undefined : message.r; + obj.c = message.c === "" ? undefined : message.c; + obj.bonding_target = message.bondingTarget === "" ? undefined : message.bondingTarget; + obj.max_variance = message.maxVariance === "" ? undefined : message.maxVariance; return obj; }, fromProtoMsg(message: ExponentialCalculationProtoMsg, useInterfaces: boolean = true): ExponentialCalculation { diff --git a/__fixtures__/v-next/outputv3/evmos/inflation/v1/query.ts b/__fixtures__/v-next/outputv3/evmos/inflation/v1/query.ts index 26532107e1..c608c54dc8 100644 --- a/__fixtures__/v-next/outputv3/evmos/inflation/v1/query.ts +++ b/__fixtures__/v-next/outputv3/evmos/inflation/v1/query.ts @@ -372,7 +372,7 @@ export const QueryPeriodResponse = { }, toAmino(message: QueryPeriodResponse, useInterfaces: boolean = true): QueryPeriodResponseAmino { const obj: any = {}; - obj.period = message.period ? message.period.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; return obj; }, fromProtoMsg(message: QueryPeriodResponseProtoMsg, useInterfaces: boolean = true): QueryPeriodResponse { @@ -660,7 +660,7 @@ export const QuerySkippedEpochsResponse = { }, toAmino(message: QuerySkippedEpochsResponse, useInterfaces: boolean = true): QuerySkippedEpochsResponseAmino { const obj: any = {}; - obj.skipped_epochs = message.skippedEpochs ? message.skippedEpochs.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs !== BigInt(0) ? message.skippedEpochs.toString() : undefined; return obj; }, fromProtoMsg(message: QuerySkippedEpochsResponseProtoMsg, useInterfaces: boolean = true): QuerySkippedEpochsResponse { @@ -946,7 +946,7 @@ export const QueryInflationRateResponse = { }, toAmino(message: QueryInflationRateResponse, useInterfaces: boolean = true): QueryInflationRateResponseAmino { const obj: any = {}; - obj.inflation_rate = message.inflationRate; + obj.inflation_rate = message.inflationRate === "" ? undefined : message.inflationRate; return obj; }, fromProtoMsg(message: QueryInflationRateResponseProtoMsg, useInterfaces: boolean = true): QueryInflationRateResponse { diff --git a/__fixtures__/v-next/outputv3/evmos/recovery/v1/genesis.ts b/__fixtures__/v-next/outputv3/evmos/recovery/v1/genesis.ts index aefa30977b..09ae6548c5 100644 --- a/__fixtures__/v-next/outputv3/evmos/recovery/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/evmos/recovery/v1/genesis.ts @@ -206,7 +206,7 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.enable_recovery = message.enableRecovery; + obj.enable_recovery = message.enableRecovery === false ? undefined : message.enableRecovery; obj.packet_timeout_duration = message.packetTimeoutDuration ? Duration.toAmino(message.packetTimeoutDuration, useInterfaces) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/evmos/vesting/v1/query.ts b/__fixtures__/v-next/outputv3/evmos/vesting/v1/query.ts index 2a968000cd..ecbd0e52af 100644 --- a/__fixtures__/v-next/outputv3/evmos/vesting/v1/query.ts +++ b/__fixtures__/v-next/outputv3/evmos/vesting/v1/query.ts @@ -121,7 +121,7 @@ export const QueryBalancesRequest = { }, toAmino(message: QueryBalancesRequest, useInterfaces: boolean = true): QueryBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: QueryBalancesRequestProtoMsg, useInterfaces: boolean = true): QueryBalancesRequest { @@ -252,17 +252,17 @@ export const QueryBalancesResponse = { if (message.locked) { obj.locked = message.locked.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.locked = []; + obj.locked = message.locked; } if (message.unvested) { obj.unvested = message.unvested.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.unvested = []; + obj.unvested = message.unvested; } if (message.vested) { obj.vested = message.vested.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.vested = []; + obj.vested = message.vested; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/evmos/vesting/v1/tx.ts b/__fixtures__/v-next/outputv3/evmos/vesting/v1/tx.ts index af67f19827..31ea450eaf 100644 --- a/__fixtures__/v-next/outputv3/evmos/vesting/v1/tx.ts +++ b/__fixtures__/v-next/outputv3/evmos/vesting/v1/tx.ts @@ -289,20 +289,20 @@ export const MsgCreateClawbackVestingAccount = { }, toAmino(message: MsgCreateClawbackVestingAccount, useInterfaces: boolean = true): MsgCreateClawbackVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; if (message.lockupPeriods) { obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e, useInterfaces) : undefined); } else { - obj.lockup_periods = []; + obj.lockup_periods = message.lockupPeriods; } if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e, useInterfaces) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } - obj.merge = message.merge; + obj.merge = message.merge === false ? undefined : message.merge; return obj; }, fromProtoMsg(message: MsgCreateClawbackVestingAccountProtoMsg, useInterfaces: boolean = true): MsgCreateClawbackVestingAccount { @@ -474,9 +474,9 @@ export const MsgClawback = { }, toAmino(message: MsgClawback, useInterfaces: boolean = true): MsgClawbackAmino { const obj: any = {}; - obj.funder_address = message.funderAddress; - obj.account_address = message.accountAddress; - obj.dest_address = message.destAddress; + obj.funder_address = message.funderAddress === "" ? undefined : message.funderAddress; + obj.account_address = message.accountAddress === "" ? undefined : message.accountAddress; + obj.dest_address = message.destAddress === "" ? undefined : message.destAddress; return obj; }, fromProtoMsg(message: MsgClawbackProtoMsg, useInterfaces: boolean = true): MsgClawback { diff --git a/__fixtures__/v-next/outputv3/evmos/vesting/v1/vesting.ts b/__fixtures__/v-next/outputv3/evmos/vesting/v1/vesting.ts index 4ac79082f0..add58deed7 100644 --- a/__fixtures__/v-next/outputv3/evmos/vesting/v1/vesting.ts +++ b/__fixtures__/v-next/outputv3/evmos/vesting/v1/vesting.ts @@ -201,17 +201,17 @@ export const ClawbackVestingAccount = { toAmino(message: ClawbackVestingAccount, useInterfaces: boolean = true): ClawbackVestingAccountAmino { const obj: any = {}; obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount, useInterfaces) : undefined; - obj.funder_address = message.funderAddress; + obj.funder_address = message.funderAddress === "" ? undefined : message.funderAddress; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; if (message.lockupPeriods) { obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e, useInterfaces) : undefined); } else { - obj.lockup_periods = []; + obj.lockup_periods = message.lockupPeriods; } if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e, useInterfaces) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/auth.ts b/__fixtures__/v-next/outputv3/google/api/auth.ts index bc03ecdcfd..5b22ac6ef6 100644 --- a/__fixtures__/v-next/outputv3/google/api/auth.ts +++ b/__fixtures__/v-next/outputv3/google/api/auth.ts @@ -661,12 +661,12 @@ export const Authentication = { if (message.rules) { obj.rules = message.rules.map(e => e ? AuthenticationRule.toAmino(e, useInterfaces) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } if (message.providers) { obj.providers = message.providers.map(e => e ? AuthProvider.toAmino(e, useInterfaces) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } return obj; }, @@ -800,13 +800,13 @@ export const AuthenticationRule = { }, toAmino(message: AuthenticationRule, useInterfaces: boolean = true): AuthenticationRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.oauth = message.oauth ? OAuthRequirements.toAmino(message.oauth, useInterfaces) : undefined; - obj.allow_without_credential = message.allowWithoutCredential; + obj.allow_without_credential = message.allowWithoutCredential === false ? undefined : message.allowWithoutCredential; if (message.requirements) { obj.requirements = message.requirements.map(e => e ? AuthRequirement.toAmino(e, useInterfaces) : undefined); } else { - obj.requirements = []; + obj.requirements = message.requirements; } return obj; }, @@ -917,9 +917,9 @@ export const JwtLocation = { }, toAmino(message: JwtLocation, useInterfaces: boolean = true): JwtLocationAmino { const obj: any = {}; - obj.header = message.header; - obj.query = message.query; - obj.value_prefix = message.valuePrefix; + obj.header = message.header === null ? undefined : message.header; + obj.query = message.query === null ? undefined : message.query; + obj.value_prefix = message.valuePrefix === "" ? undefined : message.valuePrefix; return obj; }, fromProtoMsg(message: JwtLocationProtoMsg, useInterfaces: boolean = true): JwtLocation { @@ -1080,15 +1080,15 @@ export const AuthProvider = { }, toAmino(message: AuthProvider, useInterfaces: boolean = true): 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; + obj.id = message.id === "" ? undefined : message.id; + obj.issuer = message.issuer === "" ? undefined : message.issuer; + obj.jwks_uri = message.jwksUri === "" ? undefined : message.jwksUri; + obj.audiences = message.audiences === "" ? undefined : message.audiences; + obj.authorization_url = message.authorizationUrl === "" ? undefined : message.authorizationUrl; if (message.jwtLocations) { obj.jwt_locations = message.jwtLocations.map(e => e ? JwtLocation.toAmino(e, useInterfaces) : undefined); } else { - obj.jwt_locations = []; + obj.jwt_locations = message.jwtLocations; } return obj; }, @@ -1169,7 +1169,7 @@ export const OAuthRequirements = { }, toAmino(message: OAuthRequirements, useInterfaces: boolean = true): OAuthRequirementsAmino { const obj: any = {}; - obj.canonical_scopes = message.canonicalScopes; + obj.canonical_scopes = message.canonicalScopes === "" ? undefined : message.canonicalScopes; return obj; }, fromProtoMsg(message: OAuthRequirementsProtoMsg, useInterfaces: boolean = true): OAuthRequirements { @@ -1264,8 +1264,8 @@ export const AuthRequirement = { }, toAmino(message: AuthRequirement, useInterfaces: boolean = true): AuthRequirementAmino { const obj: any = {}; - obj.provider_id = message.providerId; - obj.audiences = message.audiences; + obj.provider_id = message.providerId === "" ? undefined : message.providerId; + obj.audiences = message.audiences === "" ? undefined : message.audiences; return obj; }, fromProtoMsg(message: AuthRequirementProtoMsg, useInterfaces: boolean = true): AuthRequirement { diff --git a/__fixtures__/v-next/outputv3/google/api/backend.ts b/__fixtures__/v-next/outputv3/google/api/backend.ts index 6cec83fb70..dbaa220bfc 100644 --- a/__fixtures__/v-next/outputv3/google/api/backend.ts +++ b/__fixtures__/v-next/outputv3/google/api/backend.ts @@ -379,7 +379,7 @@ export const Backend = { if (message.rules) { obj.rules = message.rules.map(e => e ? BackendRule.toAmino(e, useInterfaces) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -565,7 +565,7 @@ export const BackendRule = { message.operationDeadline = object.operation_deadline; } if (object.path_translation !== undefined && object.path_translation !== null) { - message.pathTranslation = backendRule_PathTranslationFromJSON(object.path_translation); + message.pathTranslation = object.path_translation; } if (object.jwt_audience !== undefined && object.jwt_audience !== null) { message.jwtAudience = object.jwt_audience; @@ -580,15 +580,15 @@ export const BackendRule = { }, toAmino(message: BackendRule, useInterfaces: boolean = true): 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; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.address = message.address === "" ? undefined : message.address; + obj.deadline = message.deadline === 0 ? undefined : message.deadline; + obj.min_deadline = message.minDeadline === 0 ? undefined : message.minDeadline; + obj.operation_deadline = message.operationDeadline === 0 ? undefined : message.operationDeadline; + obj.path_translation = message.pathTranslation === 0 ? undefined : message.pathTranslation; + obj.jwt_audience = message.jwtAudience === null ? undefined : message.jwtAudience; + obj.disable_auth = message.disableAuth === null ? undefined : message.disableAuth; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromProtoMsg(message: BackendRuleProtoMsg, useInterfaces: boolean = true): BackendRule { diff --git a/__fixtures__/v-next/outputv3/google/api/billing.ts b/__fixtures__/v-next/outputv3/google/api/billing.ts index a8c4363bf6..d4e06b5dcd 100644 --- a/__fixtures__/v-next/outputv3/google/api/billing.ts +++ b/__fixtures__/v-next/outputv3/google/api/billing.ts @@ -245,7 +245,7 @@ export const Billing = { if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Billing_BillingDestination.toAmino(e, useInterfaces) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -347,11 +347,11 @@ export const Billing_BillingDestination = { }, toAmino(message: Billing_BillingDestination, useInterfaces: boolean = true): Billing_BillingDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.metrics) { obj.metrics = message.metrics.map(e => e); } else { - obj.metrics = []; + obj.metrics = message.metrics; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/config_change.ts b/__fixtures__/v-next/outputv3/google/api/config_change.ts index 3aa2b2c9e0..9e831148ca 100644 --- a/__fixtures__/v-next/outputv3/google/api/config_change.ts +++ b/__fixtures__/v-next/outputv3/google/api/config_change.ts @@ -315,21 +315,21 @@ export const ConfigChange = { message.newValue = object.new_value; } if (object.change_type !== undefined && object.change_type !== null) { - message.changeType = changeTypeFromJSON(object.change_type); + message.changeType = object.change_type; } message.advices = object.advices?.map(e => Advice.fromAmino(e)) || []; return message; }, toAmino(message: ConfigChange, useInterfaces: boolean = true): ConfigChangeAmino { const obj: any = {}; - obj.element = message.element; - obj.old_value = message.oldValue; - obj.new_value = message.newValue; - obj.change_type = message.changeType; + obj.element = message.element === "" ? undefined : message.element; + obj.old_value = message.oldValue === "" ? undefined : message.oldValue; + obj.new_value = message.newValue === "" ? undefined : message.newValue; + obj.change_type = message.changeType === 0 ? undefined : message.changeType; if (message.advices) { obj.advices = message.advices.map(e => e ? Advice.toAmino(e, useInterfaces) : undefined); } else { - obj.advices = []; + obj.advices = message.advices; } return obj; }, @@ -410,7 +410,7 @@ export const Advice = { }, toAmino(message: Advice, useInterfaces: boolean = true): AdviceAmino { const obj: any = {}; - obj.description = message.description; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromProtoMsg(message: AdviceProtoMsg, useInterfaces: boolean = true): Advice { diff --git a/__fixtures__/v-next/outputv3/google/api/consumer.ts b/__fixtures__/v-next/outputv3/google/api/consumer.ts index a4f4ea4b11..cfc1021efb 100644 --- a/__fixtures__/v-next/outputv3/google/api/consumer.ts +++ b/__fixtures__/v-next/outputv3/google/api/consumer.ts @@ -260,7 +260,7 @@ export const ProjectProperties = { if (message.properties) { obj.properties = message.properties.map(e => e ? Property.toAmino(e, useInterfaces) : undefined); } else { - obj.properties = []; + obj.properties = message.properties; } return obj; }, @@ -362,7 +362,7 @@ export const Property = { message.name = object.name; } if (object.type !== undefined && object.type !== null) { - message.type = property_PropertyTypeFromJSON(object.type); + message.type = object.type; } if (object.description !== undefined && object.description !== null) { message.description = object.description; @@ -371,9 +371,9 @@ export const Property = { }, toAmino(message: Property, useInterfaces: boolean = true): PropertyAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === 0 ? undefined : message.type; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromProtoMsg(message: PropertyProtoMsg, useInterfaces: boolean = true): Property { diff --git a/__fixtures__/v-next/outputv3/google/api/context.ts b/__fixtures__/v-next/outputv3/google/api/context.ts index 2c5089efcb..bd4807cf1f 100644 --- a/__fixtures__/v-next/outputv3/google/api/context.ts +++ b/__fixtures__/v-next/outputv3/google/api/context.ts @@ -278,7 +278,7 @@ export const Context = { if (message.rules) { obj.rules = message.rules.map(e => e ? ContextRule.toAmino(e, useInterfaces) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -443,26 +443,26 @@ export const ContextRule = { }, toAmino(message: ContextRule, useInterfaces: boolean = true): ContextRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; if (message.requested) { obj.requested = message.requested.map(e => e); } else { - obj.requested = []; + obj.requested = message.requested; } if (message.provided) { obj.provided = message.provided.map(e => e); } else { - obj.provided = []; + obj.provided = message.provided; } if (message.allowedRequestExtensions) { obj.allowed_request_extensions = message.allowedRequestExtensions.map(e => e); } else { - obj.allowed_request_extensions = []; + obj.allowed_request_extensions = message.allowedRequestExtensions; } if (message.allowedResponseExtensions) { obj.allowed_response_extensions = message.allowedResponseExtensions.map(e => e); } else { - obj.allowed_response_extensions = []; + obj.allowed_response_extensions = message.allowedResponseExtensions; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/control.ts b/__fixtures__/v-next/outputv3/google/api/control.ts index 53e4d335d2..2a44051f5e 100644 --- a/__fixtures__/v-next/outputv3/google/api/control.ts +++ b/__fixtures__/v-next/outputv3/google/api/control.ts @@ -101,7 +101,7 @@ export const Control = { }, toAmino(message: Control, useInterfaces: boolean = true): ControlAmino { const obj: any = {}; - obj.environment = message.environment; + obj.environment = message.environment === "" ? undefined : message.environment; return obj; }, fromProtoMsg(message: ControlProtoMsg, useInterfaces: boolean = true): Control { diff --git a/__fixtures__/v-next/outputv3/google/api/distribution.ts b/__fixtures__/v-next/outputv3/google/api/distribution.ts index 8013f19639..a58a2913dc 100644 --- a/__fixtures__/v-next/outputv3/google/api/distribution.ts +++ b/__fixtures__/v-next/outputv3/google/api/distribution.ts @@ -700,20 +700,20 @@ export const Distribution = { }, toAmino(message: Distribution, useInterfaces: boolean = true): DistributionAmino { const obj: any = {}; - obj.count = message.count ? message.count.toString() : undefined; - obj.mean = message.mean; - obj.sum_of_squared_deviation = message.sumOfSquaredDeviation; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.mean = message.mean === 0 ? undefined : message.mean; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation === 0 ? undefined : message.sumOfSquaredDeviation; obj.range = message.range ? Distribution_Range.toAmino(message.range, useInterfaces) : undefined; obj.bucket_options = message.bucketOptions ? Distribution_BucketOptions.toAmino(message.bucketOptions, useInterfaces) : undefined; if (message.bucketCounts) { obj.bucket_counts = message.bucketCounts.map(e => e.toString()); } else { - obj.bucket_counts = []; + obj.bucket_counts = message.bucketCounts; } if (message.exemplars) { obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e, useInterfaces) : undefined); } else { - obj.exemplars = []; + obj.exemplars = message.exemplars; } return obj; }, @@ -809,8 +809,8 @@ export const Distribution_Range = { }, toAmino(message: Distribution_Range, useInterfaces: boolean = true): Distribution_RangeAmino { const obj: any = {}; - obj.min = message.min; - obj.max = message.max; + obj.min = message.min === 0 ? undefined : message.min; + obj.max = message.max === 0 ? undefined : message.max; return obj; }, fromProtoMsg(message: Distribution_RangeProtoMsg, useInterfaces: boolean = true): Distribution_Range { @@ -1038,9 +1038,9 @@ export const Distribution_BucketOptions_Linear = { }, toAmino(message: Distribution_BucketOptions_Linear, useInterfaces: boolean = true): Distribution_BucketOptions_LinearAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.width = message.width; - obj.offset = message.offset; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.width = message.width === 0 ? undefined : message.width; + obj.offset = message.offset === 0 ? undefined : message.offset; return obj; }, fromProtoMsg(message: Distribution_BucketOptions_LinearProtoMsg, useInterfaces: boolean = true): Distribution_BucketOptions_Linear { @@ -1150,9 +1150,9 @@ export const Distribution_BucketOptions_Exponential = { }, toAmino(message: Distribution_BucketOptions_Exponential, useInterfaces: boolean = true): Distribution_BucketOptions_ExponentialAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.growth_factor = message.growthFactor; - obj.scale = message.scale; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.growth_factor = message.growthFactor === 0 ? undefined : message.growthFactor; + obj.scale = message.scale === 0 ? undefined : message.scale; return obj; }, fromProtoMsg(message: Distribution_BucketOptions_ExponentialProtoMsg, useInterfaces: boolean = true): Distribution_BucketOptions_Exponential { @@ -1250,7 +1250,7 @@ export const Distribution_BucketOptions_Explicit = { if (message.bounds) { obj.bounds = message.bounds.map(e => e); } else { - obj.bounds = []; + obj.bounds = message.bounds; } return obj; }, @@ -1367,12 +1367,12 @@ export const Distribution_Exemplar = { }, toAmino(message: Distribution_Exemplar, useInterfaces: boolean = true): Distribution_ExemplarAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; if (message.attachments) { obj.attachments = message.attachments.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.attachments = []; + obj.attachments = message.attachments; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/documentation.ts b/__fixtures__/v-next/outputv3/google/api/documentation.ts index d6489f27e2..3961f73766 100644 --- a/__fixtures__/v-next/outputv3/google/api/documentation.ts +++ b/__fixtures__/v-next/outputv3/google/api/documentation.ts @@ -542,20 +542,20 @@ export const Documentation = { }, toAmino(message: Documentation, useInterfaces: boolean = true): DocumentationAmino { const obj: any = {}; - obj.summary = message.summary; + obj.summary = message.summary === "" ? undefined : message.summary; if (message.pages) { obj.pages = message.pages.map(e => e ? Page.toAmino(e, useInterfaces) : undefined); } else { - obj.pages = []; + obj.pages = message.pages; } if (message.rules) { obj.rules = message.rules.map(e => e ? DocumentationRule.toAmino(e, useInterfaces) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.documentation_root_url = message.documentationRootUrl; - obj.service_root_url = message.serviceRootUrl; - obj.overview = message.overview; + obj.documentation_root_url = message.documentationRootUrl === "" ? undefined : message.documentationRootUrl; + obj.service_root_url = message.serviceRootUrl === "" ? undefined : message.serviceRootUrl; + obj.overview = message.overview === "" ? undefined : message.overview; return obj; }, fromProtoMsg(message: DocumentationProtoMsg, useInterfaces: boolean = true): Documentation { @@ -665,9 +665,9 @@ export const DocumentationRule = { }, toAmino(message: DocumentationRule, useInterfaces: boolean = true): DocumentationRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.description = message.description; - obj.deprecation_description = message.deprecationDescription; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.description = message.description === "" ? undefined : message.description; + obj.deprecation_description = message.deprecationDescription === "" ? undefined : message.deprecationDescription; return obj; }, fromProtoMsg(message: DocumentationRuleProtoMsg, useInterfaces: boolean = true): DocumentationRule { @@ -783,12 +783,12 @@ export const Page = { }, toAmino(message: Page, useInterfaces: boolean = true): PageAmino { const obj: any = {}; - obj.name = message.name; - obj.content = message.content; + obj.name = message.name === "" ? undefined : message.name; + obj.content = message.content === "" ? undefined : message.content; if (message.subpages) { obj.subpages = message.subpages.map(e => e ? Page.toAmino(e, useInterfaces) : undefined); } else { - obj.subpages = []; + obj.subpages = message.subpages; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/endpoint.ts b/__fixtures__/v-next/outputv3/google/api/endpoint.ts index a1eb20dd86..ba95778cea 100644 --- a/__fixtures__/v-next/outputv3/google/api/endpoint.ts +++ b/__fixtures__/v-next/outputv3/google/api/endpoint.ts @@ -245,14 +245,14 @@ export const Endpoint = { }, toAmino(message: Endpoint, useInterfaces: boolean = true): EndpointAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.aliases) { obj.aliases = message.aliases.map(e => e); } else { - obj.aliases = []; + obj.aliases = message.aliases; } - obj.target = message.target; - obj.allow_cors = message.allowCors; + obj.target = message.target === "" ? undefined : message.target; + obj.allow_cors = message.allowCors === false ? undefined : message.allowCors; return obj; }, fromProtoMsg(message: EndpointProtoMsg, useInterfaces: boolean = true): Endpoint { diff --git a/__fixtures__/v-next/outputv3/google/api/expr/conformance/v1alpha1/conformance_service.ts b/__fixtures__/v-next/outputv3/google/api/expr/conformance/v1alpha1/conformance_service.ts index b7d956c291..9a62ba5458 100644 --- a/__fixtures__/v-next/outputv3/google/api/expr/conformance/v1alpha1/conformance_service.ts +++ b/__fixtures__/v-next/outputv3/google/api/expr/conformance/v1alpha1/conformance_service.ts @@ -434,10 +434,10 @@ export const ParseRequest = { }, toAmino(message: ParseRequest, useInterfaces: boolean = true): ParseRequestAmino { const obj: any = {}; - obj.cel_source = message.celSource; - obj.syntax_version = message.syntaxVersion; - obj.source_location = message.sourceLocation; - obj.disable_macros = message.disableMacros; + obj.cel_source = message.celSource === "" ? undefined : message.celSource; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.source_location = message.sourceLocation === "" ? undefined : message.sourceLocation; + obj.disable_macros = message.disableMacros === false ? undefined : message.disableMacros; return obj; }, fromProtoMsg(message: ParseRequestProtoMsg, useInterfaces: boolean = true): ParseRequest { @@ -544,7 +544,7 @@ export const ParseResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e, useInterfaces) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -682,10 +682,10 @@ export const CheckRequest = { if (message.typeEnv) { obj.type_env = message.typeEnv.map(e => e ? Decl.toAmino(e, useInterfaces) : undefined); } else { - obj.type_env = []; + obj.type_env = message.typeEnv; } - obj.container = message.container; - obj.no_std_env = message.noStdEnv; + obj.container = message.container === "" ? undefined : message.container; + obj.no_std_env = message.noStdEnv === false ? undefined : message.noStdEnv; return obj; }, fromProtoMsg(message: CheckRequestProtoMsg, useInterfaces: boolean = true): CheckRequest { @@ -792,7 +792,7 @@ export const CheckResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e, useInterfaces) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -889,7 +889,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry, useInterfaces: boolean = true): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value, useInterfaces) : undefined; return obj; }, @@ -1059,7 +1059,7 @@ export const EvalRequest = { obj.bindings[k] = ExprValue.toAmino(v); }); } - obj.container = message.container; + obj.container = message.container === "" ? undefined : message.container; return obj; }, fromProtoMsg(message: EvalRequestProtoMsg, useInterfaces: boolean = true): EvalRequest { @@ -1166,7 +1166,7 @@ export const EvalResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e, useInterfaces) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -1269,7 +1269,7 @@ export const IssueDetails = { fromAmino(object: IssueDetailsAmino): IssueDetails { const message = createBaseIssueDetails(); if (object.severity !== undefined && object.severity !== null) { - message.severity = issueDetails_SeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.position !== undefined && object.position !== null) { message.position = SourcePosition.fromAmino(object.position); @@ -1281,9 +1281,9 @@ export const IssueDetails = { }, toAmino(message: IssueDetails, useInterfaces: boolean = true): IssueDetailsAmino { const obj: any = {}; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.position = message.position ? SourcePosition.toAmino(message.position, useInterfaces) : undefined; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; return obj; }, fromProtoMsg(message: IssueDetailsProtoMsg, useInterfaces: boolean = true): IssueDetails { diff --git a/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/checked.ts b/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/checked.ts index c73150f628..28c5c278be 100644 --- a/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/checked.ts +++ b/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/checked.ts @@ -928,7 +928,7 @@ export const CheckedExpr_ReferenceMapEntry = { }, toAmino(message: CheckedExpr_ReferenceMapEntry, useInterfaces: boolean = true): CheckedExpr_ReferenceMapEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Reference.toAmino(message.value, useInterfaces) : undefined; return obj; }, @@ -1021,7 +1021,7 @@ export const CheckedExpr_TypeMapEntry = { }, toAmino(message: CheckedExpr_TypeMapEntry, useInterfaces: boolean = true): CheckedExpr_TypeMapEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Type.toAmino(message.value, useInterfaces) : undefined; return obj; }, @@ -1249,7 +1249,7 @@ export const CheckedExpr = { }); } obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo, useInterfaces) : undefined; - obj.expr_version = message.exprVersion; + obj.expr_version = message.exprVersion === "" ? undefined : message.exprVersion; obj.expr = message.expr ? Expr.toAmino(message.expr, useInterfaces) : undefined; return obj; }, @@ -1485,16 +1485,16 @@ export const Type = { message.dyn = Empty.fromAmino(object.dyn); } if (object.null !== undefined && object.null !== null) { - message.null = nullValueFromJSON(object.null); + message.null = object.null; } if (object.primitive !== undefined && object.primitive !== null) { - message.primitive = type_PrimitiveTypeFromJSON(object.primitive); + message.primitive = object.primitive; } if (object.wrapper !== undefined && object.wrapper !== null) { - message.wrapper = type_PrimitiveTypeFromJSON(object.wrapper); + message.wrapper = object.wrapper; } if (object.well_known !== undefined && object.well_known !== null) { - message.wellKnown = type_WellKnownTypeFromJSON(object.well_known); + message.wellKnown = object.well_known; } if (object.list_type !== undefined && object.list_type !== null) { message.listType = Type_ListType.fromAmino(object.list_type); @@ -1525,15 +1525,15 @@ export const Type = { toAmino(message: Type, useInterfaces: boolean = true): TypeAmino { const obj: any = {}; obj.dyn = message.dyn ? Empty.toAmino(message.dyn, useInterfaces) : undefined; - obj.null = message.null; - obj.primitive = message.primitive; - obj.wrapper = message.wrapper; - obj.well_known = message.wellKnown; + obj.null = message.null === null ? undefined : message.null; + obj.primitive = message.primitive === null ? undefined : message.primitive; + obj.wrapper = message.wrapper === null ? undefined : message.wrapper; + obj.well_known = message.wellKnown === null ? undefined : message.wellKnown; obj.list_type = message.listType ? Type_ListType.toAmino(message.listType, useInterfaces) : undefined; obj.map_type = message.mapType ? Type_MapType.toAmino(message.mapType, useInterfaces) : undefined; obj.function = message.function ? Type_FunctionType.toAmino(message.function, useInterfaces) : undefined; - obj.message_type = message.messageType; - obj.type_param = message.typeParam; + obj.message_type = message.messageType === null ? undefined : message.messageType; + obj.type_param = message.typeParam === null ? undefined : message.typeParam; obj.type = message.type ? Type.toAmino(message.type, useInterfaces) : undefined; obj.error = message.error ? Empty.toAmino(message.error, useInterfaces) : undefined; obj.abstract_type = message.abstractType ? Type_AbstractType.toAmino(message.abstractType, useInterfaces) : undefined; @@ -1825,7 +1825,7 @@ export const Type_FunctionType = { if (message.argTypes) { obj.arg_types = message.argTypes.map(e => e ? Type.toAmino(e, useInterfaces) : undefined); } else { - obj.arg_types = []; + obj.arg_types = message.argTypes; } return obj; }, @@ -1927,11 +1927,11 @@ export const Type_AbstractType = { }, toAmino(message: Type_AbstractType, useInterfaces: boolean = true): Type_AbstractTypeAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.parameterTypes) { obj.parameter_types = message.parameterTypes.map(e => e ? Type.toAmino(e, useInterfaces) : undefined); } else { - obj.parameter_types = []; + obj.parameter_types = message.parameterTypes; } return obj; }, @@ -2046,7 +2046,7 @@ export const Decl = { }, toAmino(message: Decl, useInterfaces: boolean = true): DeclAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.ident = message.ident ? Decl_IdentDecl.toAmino(message.ident, useInterfaces) : undefined; obj.function = message.function ? Decl_FunctionDecl.toAmino(message.function, useInterfaces) : undefined; return obj; @@ -2164,7 +2164,7 @@ export const Decl_IdentDecl = { const obj: any = {}; obj.type = message.type ? Type.toAmino(message.type, useInterfaces) : undefined; obj.value = message.value ? Constant.toAmino(message.value, useInterfaces) : undefined; - obj.doc = message.doc; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromProtoMsg(message: Decl_IdentDeclProtoMsg, useInterfaces: boolean = true): Decl_IdentDecl { @@ -2253,7 +2253,7 @@ export const Decl_FunctionDecl = { if (message.overloads) { obj.overloads = message.overloads.map(e => e ? Decl_FunctionDecl_Overload.toAmino(e, useInterfaces) : undefined); } else { - obj.overloads = []; + obj.overloads = message.overloads; } return obj; }, @@ -2423,20 +2423,20 @@ export const Decl_FunctionDecl_Overload = { }, toAmino(message: Decl_FunctionDecl_Overload, useInterfaces: boolean = true): Decl_FunctionDecl_OverloadAmino { const obj: any = {}; - obj.overload_id = message.overloadId; + obj.overload_id = message.overloadId === "" ? undefined : message.overloadId; if (message.params) { obj.params = message.params.map(e => e ? Type.toAmino(e, useInterfaces) : undefined); } else { - obj.params = []; + obj.params = message.params; } if (message.typeParams) { obj.type_params = message.typeParams.map(e => e); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } obj.result_type = message.resultType ? Type.toAmino(message.resultType, useInterfaces) : undefined; - obj.is_instance_function = message.isInstanceFunction; - obj.doc = message.doc; + obj.is_instance_function = message.isInstanceFunction === false ? undefined : message.isInstanceFunction; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromProtoMsg(message: Decl_FunctionDecl_OverloadProtoMsg, useInterfaces: boolean = true): Decl_FunctionDecl_Overload { @@ -2554,11 +2554,11 @@ export const Reference = { }, toAmino(message: Reference, useInterfaces: boolean = true): ReferenceAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.overloadId) { obj.overload_id = message.overloadId.map(e => e); } else { - obj.overload_id = []; + obj.overload_id = message.overloadId; } obj.value = message.value ? Constant.toAmino(message.value, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/eval.ts b/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/eval.ts index c0a41bb93e..3364924634 100644 --- a/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/eval.ts @@ -337,12 +337,12 @@ export const EvalState = { if (message.values) { obj.values = message.values.map(e => e ? ExprValue.toAmino(e, useInterfaces) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.results) { obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e, useInterfaces) : undefined); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -442,8 +442,8 @@ export const EvalState_Result = { }, toAmino(message: EvalState_Result, useInterfaces: boolean = true): EvalState_ResultAmino { const obj: any = {}; - obj.expr = message.expr ? message.expr.toString() : undefined; - obj.value = message.value ? message.value.toString() : undefined; + obj.expr = message.expr !== BigInt(0) ? message.expr.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromProtoMsg(message: EvalState_ResultProtoMsg, useInterfaces: boolean = true): EvalState_Result { @@ -650,7 +650,7 @@ export const ErrorSet = { if (message.errors) { obj.errors = message.errors.map(e => e ? Status.toAmino(e, useInterfaces) : undefined); } else { - obj.errors = []; + obj.errors = message.errors; } return obj; }, @@ -749,7 +749,7 @@ export const UnknownSet = { if (message.exprs) { obj.exprs = message.exprs.map(e => e.toString()); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/explain.ts b/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/explain.ts index 8bce8a677d..2777993ad0 100644 --- a/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/explain.ts +++ b/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/explain.ts @@ -176,12 +176,12 @@ export const Explain = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e, useInterfaces) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.exprSteps) { obj.expr_steps = message.exprSteps.map(e => e ? Explain_ExprStep.toAmino(e, useInterfaces) : undefined); } else { - obj.expr_steps = []; + obj.expr_steps = message.exprSteps; } return obj; }, @@ -279,8 +279,8 @@ export const Explain_ExprStep = { }, toAmino(message: Explain_ExprStep, useInterfaces: boolean = true): Explain_ExprStepAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.value_index = message.valueIndex; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.value_index = message.valueIndex === 0 ? undefined : message.valueIndex; return obj; }, fromProtoMsg(message: Explain_ExprStepProtoMsg, useInterfaces: boolean = true): Explain_ExprStep { diff --git a/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/syntax.ts b/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/syntax.ts index dcede61aac..4dfe7fce3e 100644 --- a/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/syntax.ts +++ b/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/syntax.ts @@ -1126,7 +1126,7 @@ export const Expr = { }, toAmino(message: Expr, useInterfaces: boolean = true): ExprAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.const_expr = message.constExpr ? Constant.toAmino(message.constExpr, useInterfaces) : undefined; obj.ident_expr = message.identExpr ? Expr_Ident.toAmino(message.identExpr, useInterfaces) : undefined; obj.select_expr = message.selectExpr ? Expr_Select.toAmino(message.selectExpr, useInterfaces) : undefined; @@ -1213,7 +1213,7 @@ export const Expr_Ident = { }, toAmino(message: Expr_Ident, useInterfaces: boolean = true): Expr_IdentAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: Expr_IdentProtoMsg, useInterfaces: boolean = true): Expr_Ident { @@ -1326,8 +1326,8 @@ export const Expr_Select = { toAmino(message: Expr_Select, useInterfaces: boolean = true): Expr_SelectAmino { const obj: any = {}; obj.operand = message.operand ? Expr.toAmino(message.operand, useInterfaces) : undefined; - obj.field = message.field; - obj.test_only = message.testOnly; + obj.field = message.field === "" ? undefined : message.field; + obj.test_only = message.testOnly === false ? undefined : message.testOnly; return obj; }, fromProtoMsg(message: Expr_SelectProtoMsg, useInterfaces: boolean = true): Expr_Select { @@ -1446,11 +1446,11 @@ export const Expr_Call = { toAmino(message: Expr_Call, useInterfaces: boolean = true): Expr_CallAmino { const obj: any = {}; obj.target = message.target ? Expr.toAmino(message.target, useInterfaces) : undefined; - obj.function = message.function; + obj.function = message.function === "" ? undefined : message.function; if (message.args) { obj.args = message.args.map(e => e ? Expr.toAmino(e, useInterfaces) : undefined); } else { - obj.args = []; + obj.args = message.args; } return obj; }, @@ -1540,7 +1540,7 @@ export const Expr_CreateList = { if (message.elements) { obj.elements = message.elements.map(e => e ? Expr.toAmino(e, useInterfaces) : undefined); } else { - obj.elements = []; + obj.elements = message.elements; } return obj; }, @@ -1642,11 +1642,11 @@ export const Expr_CreateStruct = { }, toAmino(message: Expr_CreateStruct, useInterfaces: boolean = true): Expr_CreateStructAmino { const obj: any = {}; - obj.message_name = message.messageName; + obj.message_name = message.messageName === "" ? undefined : message.messageName; if (message.entries) { obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1778,8 +1778,8 @@ export const Expr_CreateStruct_Entry = { }, toAmino(message: Expr_CreateStruct_Entry, useInterfaces: boolean = true): Expr_CreateStruct_EntryAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.field_key = message.fieldKey; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.field_key = message.fieldKey === null ? undefined : message.fieldKey; obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey, useInterfaces) : undefined; obj.value = message.value ? Expr.toAmino(message.value, useInterfaces) : undefined; return obj; @@ -1961,9 +1961,9 @@ export const Expr_Comprehension = { }, toAmino(message: Expr_Comprehension, useInterfaces: boolean = true): Expr_ComprehensionAmino { const obj: any = {}; - obj.iter_var = message.iterVar; + obj.iter_var = message.iterVar === "" ? undefined : message.iterVar; obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange, useInterfaces) : undefined; - obj.accu_var = message.accuVar; + obj.accu_var = message.accuVar === "" ? undefined : message.accuVar; obj.accu_init = message.accuInit ? Expr.toAmino(message.accuInit, useInterfaces) : undefined; obj.loop_condition = message.loopCondition ? Expr.toAmino(message.loopCondition, useInterfaces) : undefined; obj.loop_step = message.loopStep ? Expr.toAmino(message.loopStep, useInterfaces) : undefined; @@ -2147,7 +2147,7 @@ export const Constant = { fromAmino(object: ConstantAmino): Constant { const message = createBaseConstant(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -2177,12 +2177,12 @@ export const Constant = { }, toAmino(message: Constant, useInterfaces: boolean = true): 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; obj.duration_value = message.durationValue ? Duration.toAmino(message.durationValue, useInterfaces) : undefined; obj.timestamp_value = message.timestampValue ? Timestamp.toAmino(toTimestamp(message.timestampValue)) : undefined; @@ -2281,8 +2281,8 @@ export const SourceInfo_PositionsEntry = { }, toAmino(message: SourceInfo_PositionsEntry, useInterfaces: boolean = true): SourceInfo_PositionsEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; - obj.value = message.value; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromProtoMsg(message: SourceInfo_PositionsEntryProtoMsg, useInterfaces: boolean = true): SourceInfo_PositionsEntry { @@ -2374,7 +2374,7 @@ export const SourceInfo_MacroCallsEntry = { }, toAmino(message: SourceInfo_MacroCallsEntry, useInterfaces: boolean = true): SourceInfo_MacroCallsEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Expr.toAmino(message.value, useInterfaces) : undefined; return obj; }, @@ -2600,12 +2600,12 @@ export const SourceInfo = { }, toAmino(message: SourceInfo, useInterfaces: boolean = true): SourceInfoAmino { const obj: any = {}; - obj.syntax_version = message.syntaxVersion; - obj.location = message.location; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -2743,10 +2743,10 @@ export const SourcePosition = { }, toAmino(message: SourcePosition, useInterfaces: boolean = true): SourcePositionAmino { const obj: any = {}; - obj.location = message.location; - obj.offset = message.offset; - obj.line = message.line; - obj.column = message.column; + obj.location = message.location === "" ? undefined : message.location; + obj.offset = message.offset === 0 ? undefined : message.offset; + obj.line = message.line === 0 ? undefined : message.line; + obj.column = message.column === 0 ? undefined : message.column; return obj; }, fromProtoMsg(message: SourcePositionProtoMsg, useInterfaces: boolean = true): SourcePosition { diff --git a/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/value.ts b/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/value.ts index 59423d713a..b0515c2dd2 100644 --- a/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/value.ts +++ b/__fixtures__/v-next/outputv3/google/api/expr/v1alpha1/value.ts @@ -429,7 +429,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -468,18 +468,18 @@ export const Value = { }, toAmino(message: Value, useInterfaces: boolean = true): 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; obj.enum_value = message.enumValue ? EnumValue.toAmino(message.enumValue, useInterfaces) : undefined; obj.object_value = message.objectValue ? Any.toAmino(message.objectValue, useInterfaces) : undefined; obj.map_value = message.mapValue ? MapValue.toAmino(message.mapValue, useInterfaces) : undefined; obj.list_value = message.listValue ? ListValue.toAmino(message.listValue, useInterfaces) : undefined; - obj.type_value = message.typeValue; + obj.type_value = message.typeValue === null ? undefined : message.typeValue; return obj; }, fromProtoMsg(message: ValueProtoMsg, useInterfaces: boolean = true): Value { @@ -574,8 +574,8 @@ export const EnumValue = { }, toAmino(message: EnumValue, useInterfaces: boolean = true): EnumValueAmino { const obj: any = {}; - obj.type = message.type; - obj.value = message.value; + obj.type = message.type === "" ? undefined : message.type; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromProtoMsg(message: EnumValueProtoMsg, useInterfaces: boolean = true): EnumValue { @@ -664,7 +664,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e, useInterfaces) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, @@ -754,7 +754,7 @@ export const MapValue = { if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/decl.ts b/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/decl.ts index 4120653e0e..ef678d8988 100644 --- a/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/decl.ts +++ b/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/decl.ts @@ -268,9 +268,9 @@ export const Decl = { }, toAmino(message: Decl, useInterfaces: boolean = true): DeclAmino { const obj: any = {}; - obj.id = message.id; - obj.name = message.name; - obj.doc = message.doc; + obj.id = message.id === 0 ? undefined : message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.doc = message.doc === "" ? undefined : message.doc; obj.ident = message.ident ? IdentDecl.toAmino(message.ident, useInterfaces) : undefined; obj.function = message.function ? FunctionDecl.toAmino(message.function, useInterfaces) : undefined; return obj; @@ -388,12 +388,12 @@ export const DeclType = { }, toAmino(message: DeclType, useInterfaces: boolean = true): DeclTypeAmino { const obj: any = {}; - obj.id = message.id; - obj.type = message.type; + obj.id = message.id === 0 ? undefined : message.id; + obj.type = message.type === "" ? undefined : message.type; if (message.typeParams) { obj.type_params = message.typeParams.map(e => e ? DeclType.toAmino(e, useInterfaces) : undefined); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } return obj; }, @@ -615,10 +615,10 @@ export const FunctionDecl = { if (message.args) { obj.args = message.args.map(e => e ? IdentDecl.toAmino(e, useInterfaces) : undefined); } else { - obj.args = []; + obj.args = message.args; } obj.return_type = message.returnType ? DeclType.toAmino(message.returnType, useInterfaces) : undefined; - obj.receiver_function = message.receiverFunction; + obj.receiver_function = message.receiverFunction === false ? undefined : message.receiverFunction; return obj; }, fromProtoMsg(message: FunctionDeclProtoMsg, useInterfaces: boolean = true): FunctionDecl { diff --git a/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/eval.ts b/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/eval.ts index a342ad2b86..e5cb5edc37 100644 --- a/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/eval.ts +++ b/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/eval.ts @@ -355,12 +355,12 @@ export const EvalState = { if (message.values) { obj.values = message.values.map(e => e ? ExprValue.toAmino(e, useInterfaces) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.results) { obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e, useInterfaces) : undefined); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -459,7 +459,7 @@ export const EvalState_Result = { toAmino(message: EvalState_Result, useInterfaces: boolean = true): EvalState_ResultAmino { const obj: any = {}; obj.expr = message.expr ? IdRef.toAmino(message.expr, useInterfaces) : undefined; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromProtoMsg(message: EvalState_ResultProtoMsg, useInterfaces: boolean = true): EvalState_Result { @@ -666,7 +666,7 @@ export const ErrorSet = { if (message.errors) { obj.errors = message.errors.map(e => e ? Status.toAmino(e, useInterfaces) : undefined); } else { - obj.errors = []; + obj.errors = message.errors; } return obj; }, @@ -756,7 +756,7 @@ export const UnknownSet = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e, useInterfaces) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -837,7 +837,7 @@ export const IdRef = { }, toAmino(message: IdRef, useInterfaces: boolean = true): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromProtoMsg(message: IdRefProtoMsg, useInterfaces: boolean = true): IdRef { diff --git a/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/expr.ts b/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/expr.ts index 7f9bf34d58..e47f33868f 100644 --- a/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/expr.ts +++ b/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/expr.ts @@ -730,7 +730,7 @@ export const ParsedExpr = { const obj: any = {}; obj.expr = message.expr ? Expr.toAmino(message.expr, useInterfaces) : undefined; obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo, useInterfaces) : undefined; - obj.syntax_version = message.syntaxVersion; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; return obj; }, fromProtoMsg(message: ParsedExprProtoMsg, useInterfaces: boolean = true): ParsedExpr { @@ -929,7 +929,7 @@ export const Expr = { }, toAmino(message: Expr, useInterfaces: boolean = true): ExprAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; obj.literal_expr = message.literalExpr ? Literal.toAmino(message.literalExpr, useInterfaces) : undefined; obj.ident_expr = message.identExpr ? Expr_Ident.toAmino(message.identExpr, useInterfaces) : undefined; obj.select_expr = message.selectExpr ? Expr_Select.toAmino(message.selectExpr, useInterfaces) : undefined; @@ -1016,7 +1016,7 @@ export const Expr_Ident = { }, toAmino(message: Expr_Ident, useInterfaces: boolean = true): Expr_IdentAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: Expr_IdentProtoMsg, useInterfaces: boolean = true): Expr_Ident { @@ -1129,8 +1129,8 @@ export const Expr_Select = { toAmino(message: Expr_Select, useInterfaces: boolean = true): Expr_SelectAmino { const obj: any = {}; obj.operand = message.operand ? Expr.toAmino(message.operand, useInterfaces) : undefined; - obj.field = message.field; - obj.test_only = message.testOnly; + obj.field = message.field === "" ? undefined : message.field; + obj.test_only = message.testOnly === false ? undefined : message.testOnly; return obj; }, fromProtoMsg(message: Expr_SelectProtoMsg, useInterfaces: boolean = true): Expr_Select { @@ -1249,11 +1249,11 @@ export const Expr_Call = { toAmino(message: Expr_Call, useInterfaces: boolean = true): Expr_CallAmino { const obj: any = {}; obj.target = message.target ? Expr.toAmino(message.target, useInterfaces) : undefined; - obj.function = message.function; + obj.function = message.function === "" ? undefined : message.function; if (message.args) { obj.args = message.args.map(e => e ? Expr.toAmino(e, useInterfaces) : undefined); } else { - obj.args = []; + obj.args = message.args; } return obj; }, @@ -1343,7 +1343,7 @@ export const Expr_CreateList = { if (message.elements) { obj.elements = message.elements.map(e => e ? Expr.toAmino(e, useInterfaces) : undefined); } else { - obj.elements = []; + obj.elements = message.elements; } return obj; }, @@ -1445,11 +1445,11 @@ export const Expr_CreateStruct = { }, toAmino(message: Expr_CreateStruct, useInterfaces: boolean = true): Expr_CreateStructAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.entries) { obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1579,8 +1579,8 @@ export const Expr_CreateStruct_Entry = { }, toAmino(message: Expr_CreateStruct_Entry, useInterfaces: boolean = true): Expr_CreateStruct_EntryAmino { const obj: any = {}; - obj.id = message.id; - obj.field_key = message.fieldKey; + obj.id = message.id === 0 ? undefined : message.id; + obj.field_key = message.fieldKey === null ? undefined : message.fieldKey; obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey, useInterfaces) : undefined; obj.value = message.value ? Expr.toAmino(message.value, useInterfaces) : undefined; return obj; @@ -1762,9 +1762,9 @@ export const Expr_Comprehension = { }, toAmino(message: Expr_Comprehension, useInterfaces: boolean = true): Expr_ComprehensionAmino { const obj: any = {}; - obj.iter_var = message.iterVar; + obj.iter_var = message.iterVar === "" ? undefined : message.iterVar; obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange, useInterfaces) : undefined; - obj.accu_var = message.accuVar; + obj.accu_var = message.accuVar === "" ? undefined : message.accuVar; obj.accu_init = message.accuInit ? Expr.toAmino(message.accuInit, useInterfaces) : undefined; obj.loop_condition = message.loopCondition ? Expr.toAmino(message.loopCondition, useInterfaces) : undefined; obj.loop_step = message.loopStep ? Expr.toAmino(message.loopStep, useInterfaces) : undefined; @@ -1922,7 +1922,7 @@ export const Literal = { fromAmino(object: LiteralAmino): Literal { const message = createBaseLiteral(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -1946,12 +1946,12 @@ export const Literal = { }, toAmino(message: Literal, useInterfaces: boolean = true): 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/source.ts b/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/source.ts index ad4f2fafcc..99b33fa7c8 100644 --- a/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/source.ts +++ b/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/source.ts @@ -204,8 +204,8 @@ export const SourceInfo_PositionsEntry = { }, toAmino(message: SourceInfo_PositionsEntry, useInterfaces: boolean = true): SourceInfo_PositionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === 0 ? undefined : message.key; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromProtoMsg(message: SourceInfo_PositionsEntryProtoMsg, useInterfaces: boolean = true): SourceInfo_PositionsEntry { @@ -362,11 +362,11 @@ export const SourceInfo = { }, toAmino(message: SourceInfo, useInterfaces: boolean = true): SourceInfoAmino { const obj: any = {}; - obj.location = message.location; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -498,10 +498,10 @@ export const SourcePosition = { }, toAmino(message: SourcePosition, useInterfaces: boolean = true): SourcePositionAmino { const obj: any = {}; - obj.location = message.location; - obj.offset = message.offset; - obj.line = message.line; - obj.column = message.column; + obj.location = message.location === "" ? undefined : message.location; + obj.offset = message.offset === 0 ? undefined : message.offset; + obj.line = message.line === 0 ? undefined : message.line; + obj.column = message.column === 0 ? undefined : message.column; return obj; }, fromProtoMsg(message: SourcePositionProtoMsg, useInterfaces: boolean = true): SourcePosition { diff --git a/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/value.ts b/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/value.ts index c8bcb1c757..6aad5b283f 100644 --- a/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/value.ts +++ b/__fixtures__/v-next/outputv3/google/api/expr/v1beta1/value.ts @@ -429,7 +429,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -468,18 +468,18 @@ export const Value = { }, toAmino(message: Value, useInterfaces: boolean = true): 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; obj.enum_value = message.enumValue ? EnumValue.toAmino(message.enumValue, useInterfaces) : undefined; obj.object_value = message.objectValue ? Any.toAmino(message.objectValue, useInterfaces) : undefined; obj.map_value = message.mapValue ? MapValue.toAmino(message.mapValue, useInterfaces) : undefined; obj.list_value = message.listValue ? ListValue.toAmino(message.listValue, useInterfaces) : undefined; - obj.type_value = message.typeValue; + obj.type_value = message.typeValue === null ? undefined : message.typeValue; return obj; }, fromProtoMsg(message: ValueProtoMsg, useInterfaces: boolean = true): Value { @@ -574,8 +574,8 @@ export const EnumValue = { }, toAmino(message: EnumValue, useInterfaces: boolean = true): EnumValueAmino { const obj: any = {}; - obj.type = message.type; - obj.value = message.value; + obj.type = message.type === "" ? undefined : message.type; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromProtoMsg(message: EnumValueProtoMsg, useInterfaces: boolean = true): EnumValue { @@ -664,7 +664,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e, useInterfaces) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, @@ -754,7 +754,7 @@ export const MapValue = { if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/http.ts b/__fixtures__/v-next/outputv3/google/api/http.ts index fd02f08a8b..faa0ec2226 100644 --- a/__fixtures__/v-next/outputv3/google/api/http.ts +++ b/__fixtures__/v-next/outputv3/google/api/http.ts @@ -1102,9 +1102,9 @@ export const Http = { if (message.rules) { obj.rules = message.rules.map(e => e ? HttpRule.toAmino(e, useInterfaces) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion; + obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion === false ? undefined : message.fullyDecodeReservedExpansion; return obj; }, fromProtoMsg(message: HttpProtoMsg, useInterfaces: boolean = true): Http { @@ -1327,19 +1327,19 @@ export const HttpRule = { }, toAmino(message: HttpRule, useInterfaces: boolean = true): 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.selector = message.selector === "" ? undefined : message.selector; + obj.get = message.get === null ? undefined : message.get; + obj.put = message.put === null ? undefined : message.put; + obj.post = message.post === null ? undefined : message.post; + obj.delete = message.delete === null ? undefined : message.delete; + obj.patch = message.patch === null ? undefined : message.patch; obj.custom = message.custom ? CustomHttpPattern.toAmino(message.custom, useInterfaces) : undefined; - obj.body = message.body; - obj.response_body = message.responseBody; + obj.body = message.body === "" ? undefined : message.body; + obj.response_body = message.responseBody === "" ? undefined : message.responseBody; if (message.additionalBindings) { obj.additional_bindings = message.additionalBindings.map(e => e ? HttpRule.toAmino(e, useInterfaces) : undefined); } else { - obj.additional_bindings = []; + obj.additional_bindings = message.additionalBindings; } return obj; }, @@ -1435,8 +1435,8 @@ export const CustomHttpPattern = { }, toAmino(message: CustomHttpPattern, useInterfaces: boolean = true): CustomHttpPatternAmino { const obj: any = {}; - obj.kind = message.kind; - obj.path = message.path; + obj.kind = message.kind === "" ? undefined : message.kind; + obj.path = message.path === "" ? undefined : message.path; return obj; }, fromProtoMsg(message: CustomHttpPatternProtoMsg, useInterfaces: boolean = true): CustomHttpPattern { diff --git a/__fixtures__/v-next/outputv3/google/api/httpbody.ts b/__fixtures__/v-next/outputv3/google/api/httpbody.ts index 41c66f7fb2..61a9cf0e87 100644 --- a/__fixtures__/v-next/outputv3/google/api/httpbody.ts +++ b/__fixtures__/v-next/outputv3/google/api/httpbody.ts @@ -268,12 +268,12 @@ export const HttpBody = { }, toAmino(message: HttpBody, useInterfaces: boolean = true): HttpBodyAmino { const obj: any = {}; - obj.content_type = message.contentType; + obj.content_type = message.contentType === "" ? undefined : message.contentType; obj.data = message.data ? base64FromBytes(message.data) : undefined; if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/label.ts b/__fixtures__/v-next/outputv3/google/api/label.ts index ce59bda230..8630a45a51 100644 --- a/__fixtures__/v-next/outputv3/google/api/label.ts +++ b/__fixtures__/v-next/outputv3/google/api/label.ts @@ -156,7 +156,7 @@ export const LabelDescriptor = { message.key = object.key; } if (object.value_type !== undefined && object.value_type !== null) { - message.valueType = labelDescriptor_ValueTypeFromJSON(object.value_type); + message.valueType = object.value_type; } if (object.description !== undefined && object.description !== null) { message.description = object.description; @@ -165,9 +165,9 @@ export const LabelDescriptor = { }, toAmino(message: LabelDescriptor, useInterfaces: boolean = true): LabelDescriptorAmino { const obj: any = {}; - obj.key = message.key; - obj.value_type = message.valueType; - obj.description = message.description; + obj.key = message.key === "" ? undefined : message.key; + obj.value_type = message.valueType === 0 ? undefined : message.valueType; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromProtoMsg(message: LabelDescriptorProtoMsg, useInterfaces: boolean = true): LabelDescriptor { diff --git a/__fixtures__/v-next/outputv3/google/api/log.ts b/__fixtures__/v-next/outputv3/google/api/log.ts index a771367470..aa0a419c18 100644 --- a/__fixtures__/v-next/outputv3/google/api/log.ts +++ b/__fixtures__/v-next/outputv3/google/api/log.ts @@ -207,14 +207,14 @@ export const LogDescriptor = { }, toAmino(message: LogDescriptor, useInterfaces: boolean = true): LogDescriptorAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.labels = []; + obj.labels = message.labels; } - obj.description = message.description; - obj.display_name = message.displayName; + obj.description = message.description === "" ? undefined : message.description; + obj.display_name = message.displayName === "" ? undefined : message.displayName; return obj; }, fromProtoMsg(message: LogDescriptorProtoMsg, useInterfaces: boolean = true): LogDescriptor { diff --git a/__fixtures__/v-next/outputv3/google/api/logging.ts b/__fixtures__/v-next/outputv3/google/api/logging.ts index 87e793f57d..1ddbf69c2a 100644 --- a/__fixtures__/v-next/outputv3/google/api/logging.ts +++ b/__fixtures__/v-next/outputv3/google/api/logging.ts @@ -276,12 +276,12 @@ export const Logging = { if (message.producerDestinations) { obj.producer_destinations = message.producerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e, useInterfaces) : undefined); } else { - obj.producer_destinations = []; + obj.producer_destinations = message.producerDestinations; } if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e, useInterfaces) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -383,11 +383,11 @@ export const Logging_LoggingDestination = { }, toAmino(message: Logging_LoggingDestination, useInterfaces: boolean = true): Logging_LoggingDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.logs) { obj.logs = message.logs.map(e => e); } else { - obj.logs = []; + obj.logs = message.logs; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/metric.ts b/__fixtures__/v-next/outputv3/google/api/metric.ts index da4982db4e..676275e2fb 100644 --- a/__fixtures__/v-next/outputv3/google/api/metric.ts +++ b/__fixtures__/v-next/outputv3/google/api/metric.ts @@ -809,10 +809,10 @@ export const MetricDescriptor = { } message.labels = object.labels?.map(e => LabelDescriptor.fromAmino(e)) || []; if (object.metric_kind !== undefined && object.metric_kind !== null) { - message.metricKind = metricDescriptor_MetricKindFromJSON(object.metric_kind); + message.metricKind = object.metric_kind; } if (object.value_type !== undefined && object.value_type !== null) { - message.valueType = metricDescriptor_ValueTypeFromJSON(object.value_type); + message.valueType = object.value_type; } if (object.unit !== undefined && object.unit !== null) { message.unit = object.unit; @@ -827,31 +827,31 @@ export const MetricDescriptor = { message.metadata = MetricDescriptor_MetricDescriptorMetadata.fromAmino(object.metadata); } if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } message.monitoredResourceTypes = object.monitored_resource_types?.map(e => e) || []; return message; }, toAmino(message: MetricDescriptor, useInterfaces: boolean = true): MetricDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.labels = []; + obj.labels = message.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.metric_kind = message.metricKind === 0 ? undefined : message.metricKind; + obj.value_type = message.valueType === 0 ? undefined : message.valueType; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.description = message.description === "" ? undefined : message.description; + obj.display_name = message.displayName === "" ? undefined : message.displayName; obj.metadata = message.metadata ? MetricDescriptor_MetricDescriptorMetadata.toAmino(message.metadata, useInterfaces) : undefined; - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; if (message.monitoredResourceTypes) { obj.monitored_resource_types = message.monitoredResourceTypes.map(e => e); } else { - obj.monitored_resource_types = []; + obj.monitored_resource_types = message.monitoredResourceTypes; } return obj; }, @@ -954,7 +954,7 @@ export const MetricDescriptor_MetricDescriptorMetadata = { fromAmino(object: MetricDescriptor_MetricDescriptorMetadataAmino): MetricDescriptor_MetricDescriptorMetadata { const message = createBaseMetricDescriptor_MetricDescriptorMetadata(); if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } if (object.sample_period !== undefined && object.sample_period !== null) { message.samplePeriod = Duration.fromAmino(object.sample_period); @@ -966,7 +966,7 @@ export const MetricDescriptor_MetricDescriptorMetadata = { }, toAmino(message: MetricDescriptor_MetricDescriptorMetadata, useInterfaces: boolean = true): MetricDescriptor_MetricDescriptorMetadataAmino { const obj: any = {}; - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; obj.sample_period = message.samplePeriod ? Duration.toAmino(message.samplePeriod, useInterfaces) : undefined; obj.ingest_delay = message.ingestDelay ? Duration.toAmino(message.ingestDelay, useInterfaces) : undefined; return obj; @@ -1062,8 +1062,8 @@ export const Metric_LabelsEntry = { }, toAmino(message: Metric_LabelsEntry, useInterfaces: boolean = true): Metric_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: Metric_LabelsEntryProtoMsg, useInterfaces: boolean = true): Metric_LabelsEntry { @@ -1190,7 +1190,7 @@ export const Metric = { }, toAmino(message: Metric, useInterfaces: boolean = true): MetricAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { diff --git a/__fixtures__/v-next/outputv3/google/api/monitored_resource.ts b/__fixtures__/v-next/outputv3/google/api/monitored_resource.ts index 6d9d6b83b4..f7ef74d55d 100644 --- a/__fixtures__/v-next/outputv3/google/api/monitored_resource.ts +++ b/__fixtures__/v-next/outputv3/google/api/monitored_resource.ts @@ -451,22 +451,22 @@ export const MonitoredResourceDescriptor = { } message.labels = object.labels?.map(e => LabelDescriptor.fromAmino(e)) || []; if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } return message; }, toAmino(message: MonitoredResourceDescriptor, useInterfaces: boolean = true): MonitoredResourceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.display_name = message.displayName; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; + obj.display_name = message.displayName === "" ? undefined : message.displayName; + obj.description = message.description === "" ? undefined : message.description; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.labels = []; + obj.labels = message.labels; } - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; return obj; }, fromProtoMsg(message: MonitoredResourceDescriptorProtoMsg, useInterfaces: boolean = true): MonitoredResourceDescriptor { @@ -560,8 +560,8 @@ export const MonitoredResource_LabelsEntry = { }, toAmino(message: MonitoredResource_LabelsEntry, useInterfaces: boolean = true): MonitoredResource_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: MonitoredResource_LabelsEntryProtoMsg, useInterfaces: boolean = true): MonitoredResource_LabelsEntry { @@ -688,7 +688,7 @@ export const MonitoredResource = { }, toAmino(message: MonitoredResource, useInterfaces: boolean = true): MonitoredResourceAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -788,8 +788,8 @@ export const MonitoredResourceMetadata_UserLabelsEntry = { }, toAmino(message: MonitoredResourceMetadata_UserLabelsEntry, useInterfaces: boolean = true): MonitoredResourceMetadata_UserLabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: MonitoredResourceMetadata_UserLabelsEntryProtoMsg, useInterfaces: boolean = true): MonitoredResourceMetadata_UserLabelsEntry { diff --git a/__fixtures__/v-next/outputv3/google/api/monitoring.ts b/__fixtures__/v-next/outputv3/google/api/monitoring.ts index 9121e91ebd..8a8f707f40 100644 --- a/__fixtures__/v-next/outputv3/google/api/monitoring.ts +++ b/__fixtures__/v-next/outputv3/google/api/monitoring.ts @@ -349,12 +349,12 @@ export const Monitoring = { if (message.producerDestinations) { obj.producer_destinations = message.producerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e, useInterfaces) : undefined); } else { - obj.producer_destinations = []; + obj.producer_destinations = message.producerDestinations; } if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e, useInterfaces) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -456,11 +456,11 @@ export const Monitoring_MonitoringDestination = { }, toAmino(message: Monitoring_MonitoringDestination, useInterfaces: boolean = true): Monitoring_MonitoringDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.metrics) { obj.metrics = message.metrics.map(e => e); } else { - obj.metrics = []; + obj.metrics = message.metrics; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/quota.ts b/__fixtures__/v-next/outputv3/google/api/quota.ts index 2bc5084844..d81423632a 100644 --- a/__fixtures__/v-next/outputv3/google/api/quota.ts +++ b/__fixtures__/v-next/outputv3/google/api/quota.ts @@ -583,12 +583,12 @@ export const Quota = { if (message.limits) { obj.limits = message.limits.map(e => e ? QuotaLimit.toAmino(e, useInterfaces) : undefined); } else { - obj.limits = []; + obj.limits = message.limits; } if (message.metricRules) { obj.metric_rules = message.metricRules.map(e => e ? MetricRule.toAmino(e, useInterfaces) : undefined); } else { - obj.metric_rules = []; + obj.metric_rules = message.metricRules; } return obj; }, @@ -685,8 +685,8 @@ export const MetricRule_MetricCostsEntry = { }, toAmino(message: MetricRule_MetricCostsEntry, useInterfaces: boolean = true): MetricRule_MetricCostsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value ? message.value.toString() : undefined; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromProtoMsg(message: MetricRule_MetricCostsEntryProtoMsg, useInterfaces: boolean = true): MetricRule_MetricCostsEntry { @@ -813,7 +813,7 @@ export const MetricRule = { }, toAmino(message: MetricRule, useInterfaces: boolean = true): MetricRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.metric_costs = {}; if (message.metricCosts) { Object.entries(message.metricCosts).forEach(([k, v]) => { @@ -915,8 +915,8 @@ export const QuotaLimit_ValuesEntry = { }, toAmino(message: QuotaLimit_ValuesEntry, useInterfaces: boolean = true): QuotaLimit_ValuesEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value ? message.value.toString() : undefined; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromProtoMsg(message: QuotaLimit_ValuesEntryProtoMsg, useInterfaces: boolean = true): QuotaLimit_ValuesEntry { @@ -1169,21 +1169,21 @@ export const QuotaLimit = { }, toAmino(message: QuotaLimit, useInterfaces: boolean = true): 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.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.default_limit = message.defaultLimit !== BigInt(0) ? message.defaultLimit.toString() : undefined; + obj.max_limit = message.maxLimit !== BigInt(0) ? message.maxLimit.toString() : undefined; + obj.free_tier = message.freeTier !== BigInt(0) ? message.freeTier.toString() : undefined; + obj.duration = message.duration === "" ? undefined : message.duration; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; obj.values = {}; if (message.values) { Object.entries(message.values).forEach(([k, v]) => { obj.values[k] = v.toString(); }); } - obj.display_name = message.displayName; + obj.display_name = message.displayName === "" ? undefined : message.displayName; return obj; }, fromProtoMsg(message: QuotaLimitProtoMsg, useInterfaces: boolean = true): QuotaLimit { diff --git a/__fixtures__/v-next/outputv3/google/api/resource.ts b/__fixtures__/v-next/outputv3/google/api/resource.ts index 0b06fb3c8c..dbe2216b22 100644 --- a/__fixtures__/v-next/outputv3/google/api/resource.ts +++ b/__fixtures__/v-next/outputv3/google/api/resource.ts @@ -683,7 +683,7 @@ export const ResourceDescriptor = { message.nameField = object.name_field; } if (object.history !== undefined && object.history !== null) { - message.history = resourceDescriptor_HistoryFromJSON(object.history); + message.history = object.history; } if (object.plural !== undefined && object.plural !== null) { message.plural = object.plural; @@ -691,25 +691,25 @@ export const ResourceDescriptor = { if (object.singular !== undefined && object.singular !== null) { message.singular = object.singular; } - message.style = object.style?.map(e => resourceDescriptor_StyleFromJSON(e)) || []; + message.style = object.style?.map(e => e) || []; return message; }, toAmino(message: ResourceDescriptor, useInterfaces: boolean = true): ResourceDescriptorAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.pattern) { obj.pattern = message.pattern.map(e => e); } else { - obj.pattern = []; + obj.pattern = message.pattern; } - obj.name_field = message.nameField; - obj.history = message.history; - obj.plural = message.plural; - obj.singular = message.singular; + obj.name_field = message.nameField === "" ? undefined : message.nameField; + obj.history = message.history === 0 ? undefined : message.history; + obj.plural = message.plural === "" ? undefined : message.plural; + obj.singular = message.singular === "" ? undefined : message.singular; if (message.style) { obj.style = message.style.map(e => e); } else { - obj.style = []; + obj.style = message.style; } return obj; }, @@ -805,8 +805,8 @@ export const ResourceReference = { }, toAmino(message: ResourceReference, useInterfaces: boolean = true): ResourceReferenceAmino { const obj: any = {}; - obj.type = message.type; - obj.child_type = message.childType; + obj.type = message.type === "" ? undefined : message.type; + obj.child_type = message.childType === "" ? undefined : message.childType; return obj; }, fromProtoMsg(message: ResourceReferenceProtoMsg, useInterfaces: boolean = true): ResourceReference { diff --git a/__fixtures__/v-next/outputv3/google/api/routing.ts b/__fixtures__/v-next/outputv3/google/api/routing.ts index a1e1899143..b181e47d78 100644 --- a/__fixtures__/v-next/outputv3/google/api/routing.ts +++ b/__fixtures__/v-next/outputv3/google/api/routing.ts @@ -1319,7 +1319,7 @@ export const RoutingRule = { if (message.routingParameters) { obj.routing_parameters = message.routingParameters.map(e => e ? RoutingParameter.toAmino(e, useInterfaces) : undefined); } else { - obj.routing_parameters = []; + obj.routing_parameters = message.routingParameters; } return obj; }, @@ -1415,8 +1415,8 @@ export const RoutingParameter = { }, toAmino(message: RoutingParameter, useInterfaces: boolean = true): RoutingParameterAmino { const obj: any = {}; - obj.field = message.field; - obj.path_template = message.pathTemplate; + obj.field = message.field === "" ? undefined : message.field; + obj.path_template = message.pathTemplate === "" ? undefined : message.pathTemplate; return obj; }, fromProtoMsg(message: RoutingParameterProtoMsg, useInterfaces: boolean = true): RoutingParameter { diff --git a/__fixtures__/v-next/outputv3/google/api/service.ts b/__fixtures__/v-next/outputv3/google/api/service.ts index e1cebdf0a1..29f8174d5f 100644 --- a/__fixtures__/v-next/outputv3/google/api/service.ts +++ b/__fixtures__/v-next/outputv3/google/api/service.ts @@ -815,24 +815,24 @@ export const Service = { }, toAmino(message: Service, useInterfaces: boolean = true): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; - obj.producer_project_id = message.producerProjectId; - obj.id = message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; + obj.id = message.id === "" ? undefined : message.id; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e, useInterfaces) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } if (message.types) { obj.types = message.types.map(e => e ? Type.toAmino(e, useInterfaces) : undefined); } else { - obj.types = []; + obj.types = message.types; } if (message.enums) { obj.enums = message.enums.map(e => e ? Enum.toAmino(e, useInterfaces) : undefined); } else { - obj.enums = []; + obj.enums = message.enums; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation, useInterfaces) : undefined; obj.backend = message.backend ? Backend.toAmino(message.backend, useInterfaces) : undefined; @@ -844,23 +844,23 @@ export const Service = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e, useInterfaces) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } obj.control = message.control ? Control.toAmino(message.control, useInterfaces) : undefined; if (message.logs) { obj.logs = message.logs.map(e => e ? LogDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.logs = []; + obj.logs = message.logs; } if (message.metrics) { obj.metrics = message.metrics.map(e => e ? MetricDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.billing = message.billing ? Billing.toAmino(message.billing, useInterfaces) : undefined; obj.logging = message.logging ? Logging.toAmino(message.logging, useInterfaces) : undefined; diff --git a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/check_error.ts b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/check_error.ts index b4798b8f18..f0aea707f9 100644 --- a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/check_error.ts +++ b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/check_error.ts @@ -351,7 +351,7 @@ export const CheckError = { fromAmino(object: CheckErrorAmino): CheckError { const message = createBaseCheckError(); if (object.code !== undefined && object.code !== null) { - message.code = checkError_CodeFromJSON(object.code); + message.code = object.code; } if (object.subject !== undefined && object.subject !== null) { message.subject = object.subject; @@ -366,9 +366,9 @@ export const CheckError = { }, toAmino(message: CheckError, useInterfaces: boolean = true): CheckErrorAmino { const obj: any = {}; - obj.code = message.code; - obj.subject = message.subject; - obj.detail = message.detail; + obj.code = message.code === 0 ? undefined : message.code; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.detail = message.detail === "" ? undefined : message.detail; obj.status = message.status ? Status.toAmino(message.status, useInterfaces) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/distribution.ts b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/distribution.ts index 27e742c583..12ad6eda5e 100644 --- a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/distribution.ts +++ b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/distribution.ts @@ -520,15 +520,15 @@ export const Distribution = { }, toAmino(message: Distribution, useInterfaces: boolean = true): 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; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.mean = message.mean === 0 ? undefined : message.mean; + obj.minimum = message.minimum === 0 ? undefined : message.minimum; + obj.maximum = message.maximum === 0 ? undefined : message.maximum; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation === 0 ? undefined : message.sumOfSquaredDeviation; if (message.bucketCounts) { obj.bucket_counts = message.bucketCounts.map(e => e.toString()); } else { - obj.bucket_counts = []; + obj.bucket_counts = message.bucketCounts; } obj.linear_buckets = message.linearBuckets ? Distribution_LinearBuckets.toAmino(message.linearBuckets, useInterfaces) : undefined; obj.exponential_buckets = message.exponentialBuckets ? Distribution_ExponentialBuckets.toAmino(message.exponentialBuckets, useInterfaces) : undefined; @@ -536,7 +536,7 @@ export const Distribution = { if (message.exemplars) { obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e, useInterfaces) : undefined); } else { - obj.exemplars = []; + obj.exemplars = message.exemplars; } return obj; }, @@ -647,9 +647,9 @@ export const Distribution_LinearBuckets = { }, toAmino(message: Distribution_LinearBuckets, useInterfaces: boolean = true): Distribution_LinearBucketsAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.width = message.width; - obj.offset = message.offset; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.width = message.width === 0 ? undefined : message.width; + obj.offset = message.offset === 0 ? undefined : message.offset; return obj; }, fromProtoMsg(message: Distribution_LinearBucketsProtoMsg, useInterfaces: boolean = true): Distribution_LinearBuckets { @@ -759,9 +759,9 @@ export const Distribution_ExponentialBuckets = { }, toAmino(message: Distribution_ExponentialBuckets, useInterfaces: boolean = true): Distribution_ExponentialBucketsAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.growth_factor = message.growthFactor; - obj.scale = message.scale; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.growth_factor = message.growthFactor === 0 ? undefined : message.growthFactor; + obj.scale = message.scale === 0 ? undefined : message.scale; return obj; }, fromProtoMsg(message: Distribution_ExponentialBucketsProtoMsg, useInterfaces: boolean = true): Distribution_ExponentialBuckets { @@ -859,7 +859,7 @@ export const Distribution_ExplicitBuckets = { if (message.bounds) { obj.bounds = message.bounds.map(e => e); } else { - obj.bounds = []; + obj.bounds = message.bounds; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/http_request.ts b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/http_request.ts index 27566bd460..4453b45ba9 100644 --- a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/http_request.ts +++ b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/http_request.ts @@ -464,21 +464,21 @@ export const HttpRequest = { }, toAmino(message: HttpRequest, useInterfaces: boolean = true): 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.request_method = message.requestMethod === "" ? undefined : message.requestMethod; + obj.request_url = message.requestUrl === "" ? undefined : message.requestUrl; + obj.request_size = message.requestSize !== BigInt(0) ? message.requestSize.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.response_size = message.responseSize !== BigInt(0) ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent === "" ? undefined : message.userAgent; + obj.remote_ip = message.remoteIp === "" ? undefined : message.remoteIp; + obj.server_ip = message.serverIp === "" ? undefined : message.serverIp; + obj.referer = message.referer === "" ? undefined : message.referer; obj.latency = message.latency ? Duration.toAmino(message.latency, useInterfaces) : 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; + obj.cache_lookup = message.cacheLookup === false ? undefined : message.cacheLookup; + obj.cache_hit = message.cacheHit === false ? undefined : message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer === false ? undefined : message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes !== BigInt(0) ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromProtoMsg(message: HttpRequestProtoMsg, useInterfaces: boolean = true): HttpRequest { diff --git a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/log_entry.ts b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/log_entry.ts index ffa5a8e74a..e172fd2eb9 100644 --- a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/log_entry.ts +++ b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/log_entry.ts @@ -370,8 +370,8 @@ export const LogEntry_LabelsEntry = { }, toAmino(message: LogEntry_LabelsEntry, useInterfaces: boolean = true): LogEntry_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: LogEntry_LabelsEntryProtoMsg, useInterfaces: boolean = true): LogEntry_LabelsEntry { @@ -620,7 +620,7 @@ export const LogEntry = { message.timestamp = fromTimestamp(Timestamp.fromAmino(object.timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.http_request !== undefined && object.http_request !== null) { message.httpRequest = HttpRequest.fromAmino(object.http_request); @@ -658,12 +658,12 @@ export const LogEntry = { }, toAmino(message: LogEntry, useInterfaces: boolean = true): LogEntryAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest, useInterfaces) : undefined; - obj.trace = message.trace; - obj.insert_id = message.insertId; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -671,7 +671,7 @@ export const LogEntry = { }); } obj.proto_payload = message.protoPayload ? Any.toAmino(message.protoPayload, useInterfaces) : undefined; - obj.text_payload = message.textPayload; + obj.text_payload = message.textPayload === null ? undefined : message.textPayload; obj.struct_payload = message.structPayload ? Struct.toAmino(message.structPayload, useInterfaces) : undefined; obj.operation = message.operation ? LogEntryOperation.toAmino(message.operation, useInterfaces) : undefined; obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toAmino(message.sourceLocation, useInterfaces) : undefined; @@ -799,10 +799,10 @@ export const LogEntryOperation = { }, toAmino(message: LogEntryOperation, useInterfaces: boolean = true): LogEntryOperationAmino { const obj: any = {}; - obj.id = message.id; - obj.producer = message.producer; - obj.first = message.first; - obj.last = message.last; + obj.id = message.id === "" ? undefined : message.id; + obj.producer = message.producer === "" ? undefined : message.producer; + obj.first = message.first === false ? undefined : message.first; + obj.last = message.last === false ? undefined : message.last; return obj; }, fromProtoMsg(message: LogEntryOperationProtoMsg, useInterfaces: boolean = true): LogEntryOperation { @@ -914,9 +914,9 @@ export const LogEntrySourceLocation = { }, toAmino(message: LogEntrySourceLocation, useInterfaces: boolean = true): LogEntrySourceLocationAmino { const obj: any = {}; - obj.file = message.file; - obj.line = message.line ? message.line.toString() : undefined; - obj.function = message.function; + obj.file = message.file === "" ? undefined : message.file; + obj.line = message.line !== BigInt(0) ? message.line.toString() : undefined; + obj.function = message.function === "" ? undefined : message.function; return obj; }, fromProtoMsg(message: LogEntrySourceLocationProtoMsg, useInterfaces: boolean = true): LogEntrySourceLocation { diff --git a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/metric_value.ts b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/metric_value.ts index 0733ed455e..7492d7b9ce 100644 --- a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/metric_value.ts +++ b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/metric_value.ts @@ -221,8 +221,8 @@ export const MetricValue_LabelsEntry = { }, toAmino(message: MetricValue_LabelsEntry, useInterfaces: boolean = true): MetricValue_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: MetricValue_LabelsEntryProtoMsg, useInterfaces: boolean = true): MetricValue_LabelsEntry { @@ -453,10 +453,10 @@ export const MetricValue = { } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; - 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.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.distribution_value = message.distributionValue ? Distribution.toAmino(message.distributionValue, useInterfaces) : undefined; return obj; }, @@ -558,11 +558,11 @@ export const MetricValueSet = { }, toAmino(message: MetricValueSet, useInterfaces: boolean = true): MetricValueSetAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; if (message.metricValues) { obj.metric_values = message.metricValues.map(e => e ? MetricValue.toAmino(e, useInterfaces) : undefined); } else { - obj.metric_values = []; + obj.metric_values = message.metricValues; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/operation.ts b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/operation.ts index e55557e96d..0fff06050d 100644 --- a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/operation.ts +++ b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/operation.ts @@ -324,8 +324,8 @@ export const Operation_LabelsEntry = { }, toAmino(message: Operation_LabelsEntry, useInterfaces: boolean = true): Operation_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: Operation_LabelsEntryProtoMsg, useInterfaces: boolean = true): Operation_LabelsEntry { @@ -583,16 +583,16 @@ export const Operation = { message.metricValueSets = object.metric_value_sets?.map(e => MetricValueSet.fromAmino(e)) || []; message.logEntries = object.log_entries?.map(e => LogEntry.fromAmino(e)) || []; if (object.importance !== undefined && object.importance !== null) { - message.importance = operation_ImportanceFromJSON(object.importance); + message.importance = object.importance; } message.extensions = object.extensions?.map(e => Any.fromAmino(e)) || []; return message; }, toAmino(message: Operation, useInterfaces: boolean = true): OperationAmino { const obj: any = {}; - obj.operation_id = message.operationId; - obj.operation_name = message.operationName; - obj.consumer_id = message.consumerId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; + obj.operation_name = message.operationName === "" ? undefined : message.operationName; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; obj.labels = {}; @@ -604,18 +604,18 @@ export const Operation = { if (message.metricValueSets) { obj.metric_value_sets = message.metricValueSets.map(e => e ? MetricValueSet.toAmino(e, useInterfaces) : undefined); } else { - obj.metric_value_sets = []; + obj.metric_value_sets = message.metricValueSets; } if (message.logEntries) { obj.log_entries = message.logEntries.map(e => e ? LogEntry.toAmino(e, useInterfaces) : undefined); } else { - obj.log_entries = []; + obj.log_entries = message.logEntries; } - obj.importance = message.importance; + obj.importance = message.importance === 0 ? undefined : message.importance; if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/quota_controller.ts b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/quota_controller.ts index e5aee771a7..fed13c2893 100644 --- a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/quota_controller.ts +++ b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/quota_controller.ts @@ -572,9 +572,9 @@ export const AllocateQuotaRequest = { }, toAmino(message: AllocateQuotaRequest, useInterfaces: boolean = true): AllocateQuotaRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.allocate_operation = message.allocateOperation ? QuotaOperation.toAmino(message.allocateOperation, useInterfaces) : undefined; - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromProtoMsg(message: AllocateQuotaRequestProtoMsg, useInterfaces: boolean = true): AllocateQuotaRequest { @@ -668,8 +668,8 @@ export const QuotaOperation_LabelsEntry = { }, toAmino(message: QuotaOperation_LabelsEntry, useInterfaces: boolean = true): QuotaOperation_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: QuotaOperation_LabelsEntryProtoMsg, useInterfaces: boolean = true): QuotaOperation_LabelsEntry { @@ -856,15 +856,15 @@ export const QuotaOperation = { }, {}); message.quotaMetrics = object.quota_metrics?.map(e => MetricValueSet.fromAmino(e)) || []; if (object.quota_mode !== undefined && object.quota_mode !== null) { - message.quotaMode = quotaOperation_QuotaModeFromJSON(object.quota_mode); + message.quotaMode = object.quota_mode; } return message; }, toAmino(message: QuotaOperation, useInterfaces: boolean = true): QuotaOperationAmino { const obj: any = {}; - obj.operation_id = message.operationId; - obj.method_name = message.methodName; - obj.consumer_id = message.consumerId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; + obj.method_name = message.methodName === "" ? undefined : message.methodName; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -874,9 +874,9 @@ export const QuotaOperation = { if (message.quotaMetrics) { obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e, useInterfaces) : undefined); } else { - obj.quota_metrics = []; + obj.quota_metrics = message.quotaMetrics; } - obj.quota_mode = message.quotaMode; + obj.quota_mode = message.quotaMode === 0 ? undefined : message.quotaMode; return obj; }, fromProtoMsg(message: QuotaOperationProtoMsg, useInterfaces: boolean = true): QuotaOperation { @@ -1013,18 +1013,18 @@ export const AllocateQuotaResponse = { }, toAmino(message: AllocateQuotaResponse, useInterfaces: boolean = true): AllocateQuotaResponseAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; if (message.allocateErrors) { obj.allocate_errors = message.allocateErrors.map(e => e ? QuotaError.toAmino(e, useInterfaces) : undefined); } else { - obj.allocate_errors = []; + obj.allocate_errors = message.allocateErrors; } if (message.quotaMetrics) { obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e, useInterfaces) : undefined); } else { - obj.quota_metrics = []; + obj.quota_metrics = message.quotaMetrics; } - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromProtoMsg(message: AllocateQuotaResponseProtoMsg, useInterfaces: boolean = true): AllocateQuotaResponse { @@ -1136,7 +1136,7 @@ export const QuotaError = { fromAmino(object: QuotaErrorAmino): QuotaError { const message = createBaseQuotaError(); if (object.code !== undefined && object.code !== null) { - message.code = quotaError_CodeFromJSON(object.code); + message.code = object.code; } if (object.subject !== undefined && object.subject !== null) { message.subject = object.subject; @@ -1151,9 +1151,9 @@ export const QuotaError = { }, toAmino(message: QuotaError, useInterfaces: boolean = true): QuotaErrorAmino { const obj: any = {}; - obj.code = message.code; - obj.subject = message.subject; - obj.description = message.description; + obj.code = message.code === 0 ? undefined : message.code; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; obj.status = message.status ? Status.toAmino(message.status, useInterfaces) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/service_controller.ts b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/service_controller.ts index 29c09b052c..10a50c1e61 100644 --- a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/service_controller.ts +++ b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v1/service_controller.ts @@ -542,9 +542,9 @@ export const CheckRequest = { }, toAmino(message: CheckRequest, useInterfaces: boolean = true): CheckRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.operation = message.operation ? Operation.toAmino(message.operation, useInterfaces) : undefined; - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromProtoMsg(message: CheckRequestProtoMsg, useInterfaces: boolean = true): CheckRequest { @@ -692,14 +692,14 @@ export const CheckResponse = { }, toAmino(message: CheckResponse, useInterfaces: boolean = true): CheckResponseAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; if (message.checkErrors) { obj.check_errors = message.checkErrors.map(e => e ? CheckError.toAmino(e, useInterfaces) : undefined); } else { - obj.check_errors = []; + obj.check_errors = message.checkErrors; } - obj.service_config_id = message.serviceConfigId; - obj.service_rollout_id = message.serviceRolloutId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId === "" ? undefined : message.serviceRolloutId; obj.check_info = message.checkInfo ? CheckResponse_CheckInfo.toAmino(message.checkInfo, useInterfaces) : undefined; return obj; }, @@ -806,7 +806,7 @@ export const CheckResponse_CheckInfo = { if (message.unusedArguments) { obj.unused_arguments = message.unusedArguments.map(e => e); } else { - obj.unused_arguments = []; + obj.unused_arguments = message.unusedArguments; } obj.consumer_info = message.consumerInfo ? CheckResponse_ConsumerInfo.toAmino(message.consumerInfo, useInterfaces) : undefined; return obj; @@ -913,7 +913,7 @@ export const CheckResponse_ConsumerInfo = { message.projectNumber = BigInt(object.project_number); } if (object.type !== undefined && object.type !== null) { - message.type = checkResponse_ConsumerInfo_ConsumerTypeFromJSON(object.type); + message.type = object.type; } if (object.consumer_number !== undefined && object.consumer_number !== null) { message.consumerNumber = BigInt(object.consumer_number); @@ -922,9 +922,9 @@ export const CheckResponse_ConsumerInfo = { }, toAmino(message: CheckResponse_ConsumerInfo, useInterfaces: boolean = true): 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; + obj.project_number = message.projectNumber !== BigInt(0) ? message.projectNumber.toString() : undefined; + obj.type = message.type === 0 ? undefined : message.type; + obj.consumer_number = message.consumerNumber !== BigInt(0) ? message.consumerNumber.toString() : undefined; return obj; }, fromProtoMsg(message: CheckResponse_ConsumerInfoProtoMsg, useInterfaces: boolean = true): CheckResponse_ConsumerInfo { @@ -1040,13 +1040,13 @@ export const ReportRequest = { }, toAmino(message: ReportRequest, useInterfaces: boolean = true): ReportRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; if (message.operations) { obj.operations = message.operations.map(e => e ? Operation.toAmino(e, useInterfaces) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromProtoMsg(message: ReportRequestProtoMsg, useInterfaces: boolean = true): ReportRequest { @@ -1165,10 +1165,10 @@ export const ReportResponse = { if (message.reportErrors) { obj.report_errors = message.reportErrors.map(e => e ? ReportResponse_ReportError.toAmino(e, useInterfaces) : undefined); } else { - obj.report_errors = []; + obj.report_errors = message.reportErrors; } - obj.service_config_id = message.serviceConfigId; - obj.service_rollout_id = message.serviceRolloutId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId === "" ? undefined : message.serviceRolloutId; return obj; }, fromProtoMsg(message: ReportResponseProtoMsg, useInterfaces: boolean = true): ReportResponse { @@ -1265,7 +1265,7 @@ export const ReportResponse_ReportError = { }, toAmino(message: ReportResponse_ReportError, useInterfaces: boolean = true): ReportResponse_ReportErrorAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; obj.status = message.status ? Status.toAmino(message.status, useInterfaces) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v2/service_controller.ts b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v2/service_controller.ts index 252690e647..c45936a5f8 100644 --- a/__fixtures__/v-next/outputv3/google/api/servicecontrol/v2/service_controller.ts +++ b/__fixtures__/v-next/outputv3/google/api/servicecontrol/v2/service_controller.ts @@ -395,15 +395,15 @@ export const CheckRequest = { }, toAmino(message: CheckRequest, useInterfaces: boolean = true): CheckRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.service_config_id = message.serviceConfigId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; obj.attributes = message.attributes ? AttributeContext.toAmino(message.attributes, useInterfaces) : undefined; if (message.resources) { obj.resources = message.resources.map(e => e ? ResourceInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.resources = []; + obj.resources = message.resources; } - obj.flags = message.flags; + obj.flags = message.flags === "" ? undefined : message.flags; return obj; }, fromProtoMsg(message: CheckRequestProtoMsg, useInterfaces: boolean = true): CheckRequest { @@ -543,11 +543,11 @@ export const ResourceInfo = { }, toAmino(message: ResourceInfo, useInterfaces: boolean = true): ResourceInfoAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.permission = message.permission; - obj.container = message.container; - obj.location = message.location; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; + obj.permission = message.permission === "" ? undefined : message.permission; + obj.container = message.container === "" ? undefined : message.container; + obj.location = message.location === "" ? undefined : message.location; return obj; }, fromProtoMsg(message: ResourceInfoProtoMsg, useInterfaces: boolean = true): ResourceInfo { @@ -641,8 +641,8 @@ export const CheckResponse_HeadersEntry = { }, toAmino(message: CheckResponse_HeadersEntry, useInterfaces: boolean = true): CheckResponse_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: CheckResponse_HeadersEntryProtoMsg, useInterfaces: boolean = true): CheckResponse_HeadersEntry { @@ -893,12 +893,12 @@ export const ReportRequest = { }, toAmino(message: ReportRequest, useInterfaces: boolean = true): ReportRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.service_config_id = message.serviceConfigId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; if (message.operations) { obj.operations = message.operations.map(e => e ? AttributeContext.toAmino(e, useInterfaces) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/servicemanagement/v1/resources.ts b/__fixtures__/v-next/outputv3/google/api/servicemanagement/v1/resources.ts index 91b99a45e7..cccc19fde9 100644 --- a/__fixtures__/v-next/outputv3/google/api/servicemanagement/v1/resources.ts +++ b/__fixtures__/v-next/outputv3/google/api/servicemanagement/v1/resources.ts @@ -864,8 +864,8 @@ export const ManagedService = { }, toAmino(message: ManagedService, useInterfaces: boolean = true): ManagedServiceAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.producer_project_id = message.producerProjectId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; return obj; }, fromProtoMsg(message: ManagedServiceProtoMsg, useInterfaces: boolean = true): ManagedService { @@ -1005,14 +1005,14 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } if (message.steps) { obj.steps = message.steps.map(e => e ? OperationMetadata_Step.toAmino(e, useInterfaces) : undefined); } else { - obj.steps = []; + obj.steps = message.steps; } - obj.progress_percentage = message.progressPercentage; + obj.progress_percentage = message.progressPercentage === 0 ? undefined : message.progressPercentage; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, @@ -1102,14 +1102,14 @@ export const OperationMetadata_Step = { message.description = object.description; } if (object.status !== undefined && object.status !== null) { - message.status = operationMetadata_StatusFromJSON(object.status); + message.status = object.status; } return message; }, toAmino(message: OperationMetadata_Step, useInterfaces: boolean = true): OperationMetadata_StepAmino { const obj: any = {}; - obj.description = message.description; - obj.status = message.status; + obj.description = message.description === "" ? undefined : message.description; + obj.status = message.status === 0 ? undefined : message.status; return obj; }, fromProtoMsg(message: OperationMetadata_StepProtoMsg, useInterfaces: boolean = true): OperationMetadata_Step { @@ -1210,7 +1210,7 @@ export const Diagnostic = { message.location = object.location; } if (object.kind !== undefined && object.kind !== null) { - message.kind = diagnostic_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.message !== undefined && object.message !== null) { message.message = object.message; @@ -1219,9 +1219,9 @@ export const Diagnostic = { }, toAmino(message: Diagnostic, useInterfaces: boolean = true): DiagnosticAmino { const obj: any = {}; - obj.location = message.location; - obj.kind = message.kind; - obj.message = message.message; + obj.location = message.location === "" ? undefined : message.location; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromProtoMsg(message: DiagnosticProtoMsg, useInterfaces: boolean = true): Diagnostic { @@ -1322,11 +1322,11 @@ export const ConfigSource = { }, toAmino(message: ConfigSource, useInterfaces: boolean = true): ConfigSourceAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; if (message.files) { obj.files = message.files.map(e => e ? ConfigFile.toAmino(e, useInterfaces) : undefined); } else { - obj.files = []; + obj.files = message.files; } return obj; }, @@ -1431,15 +1431,15 @@ export const ConfigFile = { message.fileContents = bytesFromBase64(object.file_contents); } if (object.file_type !== undefined && object.file_type !== null) { - message.fileType = configFile_FileTypeFromJSON(object.file_type); + message.fileType = object.file_type; } return message; }, toAmino(message: ConfigFile, useInterfaces: boolean = true): ConfigFileAmino { const obj: any = {}; - obj.file_path = message.filePath; + obj.file_path = message.filePath === "" ? undefined : message.filePath; obj.file_contents = message.fileContents ? base64FromBytes(message.fileContents) : undefined; - obj.file_type = message.fileType; + obj.file_type = message.fileType === 0 ? undefined : message.fileType; return obj; }, fromProtoMsg(message: ConfigFileProtoMsg, useInterfaces: boolean = true): ConfigFile { @@ -1519,7 +1519,7 @@ export const ConfigRef = { }, toAmino(message: ConfigRef, useInterfaces: boolean = true): ConfigRefAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: ConfigRefProtoMsg, useInterfaces: boolean = true): ConfigRef { @@ -1608,7 +1608,7 @@ export const ChangeReport = { if (message.configChanges) { obj.config_changes = message.configChanges.map(e => e ? ConfigChange.toAmino(e, useInterfaces) : undefined); } else { - obj.config_changes = []; + obj.config_changes = message.configChanges; } return obj; }, @@ -1768,7 +1768,7 @@ export const Rollout = { message.createdBy = object.created_by; } if (object.status !== undefined && object.status !== null) { - message.status = rollout_RolloutStatusFromJSON(object.status); + message.status = object.status; } if (object.traffic_percent_strategy !== undefined && object.traffic_percent_strategy !== null) { message.trafficPercentStrategy = Rollout_TrafficPercentStrategy.fromAmino(object.traffic_percent_strategy); @@ -1783,13 +1783,13 @@ export const Rollout = { }, toAmino(message: Rollout, useInterfaces: boolean = true): RolloutAmino { const obj: any = {}; - obj.rollout_id = message.rolloutId; + obj.rollout_id = message.rolloutId === "" ? undefined : message.rolloutId; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; - obj.created_by = message.createdBy; - obj.status = message.status; + obj.created_by = message.createdBy === "" ? undefined : message.createdBy; + obj.status = message.status === 0 ? undefined : message.status; obj.traffic_percent_strategy = message.trafficPercentStrategy ? Rollout_TrafficPercentStrategy.toAmino(message.trafficPercentStrategy, useInterfaces) : undefined; obj.delete_service_strategy = message.deleteServiceStrategy ? Rollout_DeleteServiceStrategy.toAmino(message.deleteServiceStrategy, useInterfaces) : undefined; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromProtoMsg(message: RolloutProtoMsg, useInterfaces: boolean = true): Rollout { @@ -1883,8 +1883,8 @@ export const Rollout_TrafficPercentStrategy_PercentagesEntry = { }, toAmino(message: Rollout_TrafficPercentStrategy_PercentagesEntry, useInterfaces: boolean = true): Rollout_TrafficPercentStrategy_PercentagesEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromProtoMsg(message: Rollout_TrafficPercentStrategy_PercentagesEntryProtoMsg, useInterfaces: boolean = true): Rollout_TrafficPercentStrategy_PercentagesEntry { diff --git a/__fixtures__/v-next/outputv3/google/api/servicemanagement/v1/servicemanager.ts b/__fixtures__/v-next/outputv3/google/api/servicemanagement/v1/servicemanager.ts index 918305c2e3..dd7be2f313 100644 --- a/__fixtures__/v-next/outputv3/google/api/servicemanagement/v1/servicemanager.ts +++ b/__fixtures__/v-next/outputv3/google/api/servicemanagement/v1/servicemanager.ts @@ -783,10 +783,10 @@ export const ListServicesRequest = { }, toAmino(message: ListServicesRequest, useInterfaces: boolean = true): 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; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; return obj; }, fromProtoMsg(message: ListServicesRequestProtoMsg, useInterfaces: boolean = true): ListServicesRequest { @@ -890,9 +890,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? ManagedService.toAmino(e, useInterfaces) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListServicesResponseProtoMsg, useInterfaces: boolean = true): ListServicesResponse { @@ -972,7 +972,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest, useInterfaces: boolean = true): GetServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromProtoMsg(message: GetServiceRequestProtoMsg, useInterfaces: boolean = true): GetServiceRequest { @@ -1134,7 +1134,7 @@ export const DeleteServiceRequest = { }, toAmino(message: DeleteServiceRequest, useInterfaces: boolean = true): DeleteServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromProtoMsg(message: DeleteServiceRequestProtoMsg, useInterfaces: boolean = true): DeleteServiceRequest { @@ -1214,7 +1214,7 @@ export const UndeleteServiceRequest = { }, toAmino(message: UndeleteServiceRequest, useInterfaces: boolean = true): UndeleteServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromProtoMsg(message: UndeleteServiceRequestProtoMsg, useInterfaces: boolean = true): UndeleteServiceRequest { @@ -1400,15 +1400,15 @@ export const GetServiceConfigRequest = { message.configId = object.config_id; } if (object.view !== undefined && object.view !== null) { - message.view = getServiceConfigRequest_ConfigViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetServiceConfigRequest, useInterfaces: boolean = true): GetServiceConfigRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.config_id = message.configId; - obj.view = message.view; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.config_id = message.configId === "" ? undefined : message.configId; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromProtoMsg(message: GetServiceConfigRequestProtoMsg, useInterfaces: boolean = true): GetServiceConfigRequest { @@ -1518,9 +1518,9 @@ export const ListServiceConfigsRequest = { }, toAmino(message: ListServiceConfigsRequest, useInterfaces: boolean = true): ListServiceConfigsRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromProtoMsg(message: ListServiceConfigsRequestProtoMsg, useInterfaces: boolean = true): ListServiceConfigsRequest { @@ -1624,9 +1624,9 @@ export const ListServiceConfigsResponse = { if (message.serviceConfigs) { obj.service_configs = message.serviceConfigs.map(e => e ? Service.toAmino(e, useInterfaces) : undefined); } else { - obj.service_configs = []; + obj.service_configs = message.serviceConfigs; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListServiceConfigsResponseProtoMsg, useInterfaces: boolean = true): ListServiceConfigsResponse { @@ -1723,7 +1723,7 @@ export const CreateServiceConfigRequest = { }, toAmino(message: CreateServiceConfigRequest, useInterfaces: boolean = true): CreateServiceConfigRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.service_config = message.serviceConfig ? Service.toAmino(message.serviceConfig, useInterfaces) : undefined; return obj; }, @@ -1836,9 +1836,9 @@ export const SubmitConfigSourceRequest = { }, toAmino(message: SubmitConfigSourceRequest, useInterfaces: boolean = true): SubmitConfigSourceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.config_source = message.configSource ? ConfigSource.toAmino(message.configSource, useInterfaces) : undefined; - obj.validate_only = message.validateOnly; + obj.validate_only = message.validateOnly === false ? undefined : message.validateOnly; return obj; }, fromProtoMsg(message: SubmitConfigSourceRequestProtoMsg, useInterfaces: boolean = true): SubmitConfigSourceRequest { @@ -2017,7 +2017,7 @@ export const CreateServiceRolloutRequest = { }, toAmino(message: CreateServiceRolloutRequest, useInterfaces: boolean = true): CreateServiceRolloutRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.rollout = message.rollout ? Rollout.toAmino(message.rollout, useInterfaces) : undefined; return obj; }, @@ -2143,10 +2143,10 @@ export const ListServiceRolloutsRequest = { }, toAmino(message: ListServiceRolloutsRequest, useInterfaces: boolean = true): ListServiceRolloutsRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; - obj.filter = message.filter; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromProtoMsg(message: ListServiceRolloutsRequestProtoMsg, useInterfaces: boolean = true): ListServiceRolloutsRequest { @@ -2250,9 +2250,9 @@ export const ListServiceRolloutsResponse = { if (message.rollouts) { obj.rollouts = message.rollouts.map(e => e ? Rollout.toAmino(e, useInterfaces) : undefined); } else { - obj.rollouts = []; + obj.rollouts = message.rollouts; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListServiceRolloutsResponseProtoMsg, useInterfaces: boolean = true): ListServiceRolloutsResponse { @@ -2347,8 +2347,8 @@ export const GetServiceRolloutRequest = { }, toAmino(message: GetServiceRolloutRequest, useInterfaces: boolean = true): GetServiceRolloutRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.rollout_id = message.rolloutId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.rollout_id = message.rolloutId === "" ? undefined : message.rolloutId; return obj; }, fromProtoMsg(message: GetServiceRolloutRequestProtoMsg, useInterfaces: boolean = true): GetServiceRolloutRequest { @@ -2585,17 +2585,17 @@ export const GenerateConfigReportResponse = { }, toAmino(message: GenerateConfigReportResponse, useInterfaces: boolean = true): GenerateConfigReportResponseAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.id = message.id; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.id = message.id === "" ? undefined : message.id; if (message.changeReports) { obj.change_reports = message.changeReports.map(e => e ? ChangeReport.toAmino(e, useInterfaces) : undefined); } else { - obj.change_reports = []; + obj.change_reports = message.changeReports; } if (message.diagnostics) { obj.diagnostics = message.diagnostics.map(e => e ? Diagnostic.toAmino(e, useInterfaces) : undefined); } else { - obj.diagnostics = []; + obj.diagnostics = message.diagnostics; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/serviceusage/v1/resources.ts b/__fixtures__/v-next/outputv3/google/api/serviceusage/v1/resources.ts index a0cd6150cb..98200f08c7 100644 --- a/__fixtures__/v-next/outputv3/google/api/serviceusage/v1/resources.ts +++ b/__fixtures__/v-next/outputv3/google/api/serviceusage/v1/resources.ts @@ -353,16 +353,16 @@ export const Service = { message.config = ServiceConfig.fromAmino(object.config); } if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: Service, useInterfaces: boolean = true): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.parent = message.parent; + obj.name = message.name === "" ? undefined : message.name; + obj.parent = message.parent === "" ? undefined : message.parent; obj.config = message.config ? ServiceConfig.toAmino(message.config, useInterfaces) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromProtoMsg(message: ServiceProtoMsg, useInterfaces: boolean = true): Service { @@ -605,12 +605,12 @@ export const ServiceConfig = { }, toAmino(message: ServiceConfig, useInterfaces: boolean = true): ServiceConfigAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e, useInterfaces) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation, useInterfaces) : undefined; obj.quota = message.quota ? Quota.toAmino(message.quota, useInterfaces) : undefined; @@ -619,12 +619,12 @@ export const ServiceConfig = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e, useInterfaces) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring, useInterfaces) : undefined; return obj; @@ -715,7 +715,7 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/serviceusage/v1/serviceusage.ts b/__fixtures__/v-next/outputv3/google/api/serviceusage/v1/serviceusage.ts index f16b014c6f..2449c0565a 100644 --- a/__fixtures__/v-next/outputv3/google/api/serviceusage/v1/serviceusage.ts +++ b/__fixtures__/v-next/outputv3/google/api/serviceusage/v1/serviceusage.ts @@ -587,7 +587,7 @@ export const EnableServiceRequest = { }, toAmino(message: EnableServiceRequest, useInterfaces: boolean = true): EnableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: EnableServiceRequestProtoMsg, useInterfaces: boolean = true): EnableServiceRequest { @@ -773,15 +773,15 @@ export const DisableServiceRequest = { message.disableDependentServices = object.disable_dependent_services; } if (object.check_if_service_has_usage !== undefined && object.check_if_service_has_usage !== null) { - message.checkIfServiceHasUsage = disableServiceRequest_CheckIfServiceHasUsageFromJSON(object.check_if_service_has_usage); + message.checkIfServiceHasUsage = object.check_if_service_has_usage; } return message; }, toAmino(message: DisableServiceRequest, useInterfaces: boolean = true): DisableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.disable_dependent_services = message.disableDependentServices; - obj.check_if_service_has_usage = message.checkIfServiceHasUsage; + obj.name = message.name === "" ? undefined : message.name; + obj.disable_dependent_services = message.disableDependentServices === false ? undefined : message.disableDependentServices; + obj.check_if_service_has_usage = message.checkIfServiceHasUsage === 0 ? undefined : message.checkIfServiceHasUsage; return obj; }, fromProtoMsg(message: DisableServiceRequestProtoMsg, useInterfaces: boolean = true): DisableServiceRequest { @@ -943,7 +943,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest, useInterfaces: boolean = true): GetServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: GetServiceRequestProtoMsg, useInterfaces: boolean = true): GetServiceRequest { @@ -1068,10 +1068,10 @@ export const ListServicesRequest = { }, toAmino(message: ListServicesRequest, useInterfaces: boolean = true): ListServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; - obj.filter = message.filter; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromProtoMsg(message: ListServicesRequestProtoMsg, useInterfaces: boolean = true): ListServicesRequest { @@ -1175,9 +1175,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e, useInterfaces) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListServicesResponseProtoMsg, useInterfaces: boolean = true): ListServicesResponse { @@ -1278,11 +1278,11 @@ export const BatchEnableServicesRequest = { }, toAmino(message: BatchEnableServicesRequest, useInterfaces: boolean = true): BatchEnableServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.serviceIds) { obj.service_ids = message.serviceIds.map(e => e); } else { - obj.service_ids = []; + obj.service_ids = message.serviceIds; } return obj; }, @@ -1393,12 +1393,12 @@ export const BatchEnableServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e, useInterfaces) : undefined); } else { - obj.services = []; + obj.services = message.services; } if (message.failures) { obj.failures = message.failures.map(e => e ? BatchEnableServicesResponse_EnableFailure.toAmino(e, useInterfaces) : undefined); } else { - obj.failures = []; + obj.failures = message.failures; } return obj; }, @@ -1494,8 +1494,8 @@ export const BatchEnableServicesResponse_EnableFailure = { }, toAmino(message: BatchEnableServicesResponse_EnableFailure, useInterfaces: boolean = true): BatchEnableServicesResponse_EnableFailureAmino { const obj: any = {}; - obj.service_id = message.serviceId; - obj.error_message = message.errorMessage; + obj.service_id = message.serviceId === "" ? undefined : message.serviceId; + obj.error_message = message.errorMessage === "" ? undefined : message.errorMessage; return obj; }, fromProtoMsg(message: BatchEnableServicesResponse_EnableFailureProtoMsg, useInterfaces: boolean = true): BatchEnableServicesResponse_EnableFailure { @@ -1596,11 +1596,11 @@ export const BatchGetServicesRequest = { }, toAmino(message: BatchGetServicesRequest, useInterfaces: boolean = true): BatchGetServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.names) { obj.names = message.names.map(e => e); } else { - obj.names = []; + obj.names = message.names; } return obj; }, @@ -1690,7 +1690,7 @@ export const BatchGetServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e, useInterfaces) : undefined); } else { - obj.services = []; + obj.services = message.services; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/serviceusage/v1beta1/resources.ts b/__fixtures__/v-next/outputv3/google/api/serviceusage/v1beta1/resources.ts index 0cfd705ae1..a55f2e5e48 100644 --- a/__fixtures__/v-next/outputv3/google/api/serviceusage/v1beta1/resources.ts +++ b/__fixtures__/v-next/outputv3/google/api/serviceusage/v1beta1/resources.ts @@ -1127,16 +1127,16 @@ export const Service = { message.config = ServiceConfig.fromAmino(object.config); } if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: Service, useInterfaces: boolean = true): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.parent = message.parent; + obj.name = message.name === "" ? undefined : message.name; + obj.parent = message.parent === "" ? undefined : message.parent; obj.config = message.config ? ServiceConfig.toAmino(message.config, useInterfaces) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromProtoMsg(message: ServiceProtoMsg, useInterfaces: boolean = true): Service { @@ -1379,12 +1379,12 @@ export const ServiceConfig = { }, toAmino(message: ServiceConfig, useInterfaces: boolean = true): ServiceConfigAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e, useInterfaces) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation, useInterfaces) : undefined; obj.quota = message.quota ? Quota.toAmino(message.quota, useInterfaces) : undefined; @@ -1393,12 +1393,12 @@ export const ServiceConfig = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e, useInterfaces) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring, useInterfaces) : undefined; return obj; @@ -1489,7 +1489,7 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, @@ -1657,20 +1657,20 @@ export const ConsumerQuotaMetric = { }, toAmino(message: ConsumerQuotaMetric, useInterfaces: boolean = true): ConsumerQuotaMetricAmino { const obj: any = {}; - obj.name = message.name; - obj.metric = message.metric; - obj.display_name = message.displayName; + obj.name = message.name === "" ? undefined : message.name; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.display_name = message.displayName === "" ? undefined : message.displayName; if (message.consumerQuotaLimits) { obj.consumer_quota_limits = message.consumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e, useInterfaces) : undefined); } else { - obj.consumer_quota_limits = []; + obj.consumer_quota_limits = message.consumerQuotaLimits; } if (message.descendantConsumerQuotaLimits) { obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e, useInterfaces) : undefined); } else { - obj.descendant_consumer_quota_limits = []; + obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits; } - obj.unit = message.unit; + obj.unit = message.unit === "" ? undefined : message.unit; return obj; }, fromProtoMsg(message: ConsumerQuotaMetricProtoMsg, useInterfaces: boolean = true): ConsumerQuotaMetric { @@ -1831,15 +1831,15 @@ export const ConsumerQuotaLimit = { }, toAmino(message: ConsumerQuotaLimit, useInterfaces: boolean = true): 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; + obj.name = message.name === "" ? undefined : message.name; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.is_precise = message.isPrecise === false ? undefined : message.isPrecise; + obj.allows_admin_overrides = message.allowsAdminOverrides === false ? undefined : message.allowsAdminOverrides; if (message.quotaBuckets) { obj.quota_buckets = message.quotaBuckets.map(e => e ? QuotaBucket.toAmino(e, useInterfaces) : undefined); } else { - obj.quota_buckets = []; + obj.quota_buckets = message.quotaBuckets; } return obj; }, @@ -1934,8 +1934,8 @@ export const QuotaBucket_DimensionsEntry = { }, toAmino(message: QuotaBucket_DimensionsEntry, useInterfaces: boolean = true): QuotaBucket_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: QuotaBucket_DimensionsEntryProtoMsg, useInterfaces: boolean = true): QuotaBucket_DimensionsEntry { @@ -2132,8 +2132,8 @@ export const QuotaBucket = { }, toAmino(message: QuotaBucket, useInterfaces: boolean = true): QuotaBucketAmino { const obj: any = {}; - obj.effective_limit = message.effectiveLimit ? message.effectiveLimit.toString() : undefined; - obj.default_limit = message.defaultLimit ? message.defaultLimit.toString() : undefined; + obj.effective_limit = message.effectiveLimit !== BigInt(0) ? message.effectiveLimit.toString() : undefined; + obj.default_limit = message.defaultLimit !== BigInt(0) ? message.defaultLimit.toString() : undefined; obj.producer_override = message.producerOverride ? QuotaOverride.toAmino(message.producerOverride, useInterfaces) : undefined; obj.consumer_override = message.consumerOverride ? QuotaOverride.toAmino(message.consumerOverride, useInterfaces) : undefined; obj.admin_override = message.adminOverride ? QuotaOverride.toAmino(message.adminOverride, useInterfaces) : undefined; @@ -2236,8 +2236,8 @@ export const QuotaOverride_DimensionsEntry = { }, toAmino(message: QuotaOverride_DimensionsEntry, useInterfaces: boolean = true): QuotaOverride_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: QuotaOverride_DimensionsEntryProtoMsg, useInterfaces: boolean = true): QuotaOverride_DimensionsEntry { @@ -2426,17 +2426,17 @@ export const QuotaOverride = { }, toAmino(message: QuotaOverride, useInterfaces: boolean = true): QuotaOverrideAmino { const obj: any = {}; - obj.name = message.name; - obj.override_value = message.overrideValue ? message.overrideValue.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.override_value = message.overrideValue !== BigInt(0) ? 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; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.admin_override_ancestor = message.adminOverrideAncestor === "" ? undefined : message.adminOverrideAncestor; return obj; }, fromProtoMsg(message: QuotaOverrideProtoMsg, useInterfaces: boolean = true): QuotaOverride { @@ -2525,7 +2525,7 @@ export const OverrideInlineSource = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e, useInterfaces) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -2620,8 +2620,8 @@ export const AdminQuotaPolicy_DimensionsEntry = { }, toAmino(message: AdminQuotaPolicy_DimensionsEntry, useInterfaces: boolean = true): AdminQuotaPolicy_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: AdminQuotaPolicy_DimensionsEntryProtoMsg, useInterfaces: boolean = true): AdminQuotaPolicy_DimensionsEntry { @@ -2810,17 +2810,17 @@ export const AdminQuotaPolicy = { }, toAmino(message: AdminQuotaPolicy, useInterfaces: boolean = true): AdminQuotaPolicyAmino { const obj: any = {}; - obj.name = message.name; - obj.policy_value = message.policyValue ? message.policyValue.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.policy_value = message.policyValue !== BigInt(0) ? 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; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.container = message.container === "" ? undefined : message.container; return obj; }, fromProtoMsg(message: AdminQuotaPolicyProtoMsg, useInterfaces: boolean = true): AdminQuotaPolicy { @@ -2915,8 +2915,8 @@ export const ServiceIdentity = { }, toAmino(message: ServiceIdentity, useInterfaces: boolean = true): ServiceIdentityAmino { const obj: any = {}; - obj.email = message.email; - obj.unique_id = message.uniqueId; + obj.email = message.email === "" ? undefined : message.email; + obj.unique_id = message.uniqueId === "" ? undefined : message.uniqueId; return obj; }, fromProtoMsg(message: ServiceIdentityProtoMsg, useInterfaces: boolean = true): ServiceIdentity { diff --git a/__fixtures__/v-next/outputv3/google/api/serviceusage/v1beta1/serviceusage.ts b/__fixtures__/v-next/outputv3/google/api/serviceusage/v1beta1/serviceusage.ts index eadd6b07aa..27ff3aabd2 100644 --- a/__fixtures__/v-next/outputv3/google/api/serviceusage/v1beta1/serviceusage.ts +++ b/__fixtures__/v-next/outputv3/google/api/serviceusage/v1beta1/serviceusage.ts @@ -1485,7 +1485,7 @@ export const EnableServiceRequest = { }, toAmino(message: EnableServiceRequest, useInterfaces: boolean = true): EnableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: EnableServiceRequestProtoMsg, useInterfaces: boolean = true): EnableServiceRequest { @@ -1565,7 +1565,7 @@ export const DisableServiceRequest = { }, toAmino(message: DisableServiceRequest, useInterfaces: boolean = true): DisableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: DisableServiceRequestProtoMsg, useInterfaces: boolean = true): DisableServiceRequest { @@ -1645,7 +1645,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest, useInterfaces: boolean = true): GetServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: GetServiceRequestProtoMsg, useInterfaces: boolean = true): GetServiceRequest { @@ -1770,10 +1770,10 @@ export const ListServicesRequest = { }, toAmino(message: ListServicesRequest, useInterfaces: boolean = true): ListServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; - obj.filter = message.filter; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromProtoMsg(message: ListServicesRequestProtoMsg, useInterfaces: boolean = true): ListServicesRequest { @@ -1877,9 +1877,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e, useInterfaces) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListServicesResponseProtoMsg, useInterfaces: boolean = true): ListServicesResponse { @@ -1980,11 +1980,11 @@ export const BatchEnableServicesRequest = { }, toAmino(message: BatchEnableServicesRequest, useInterfaces: boolean = true): BatchEnableServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.serviceIds) { obj.service_ids = message.serviceIds.map(e => e); } else { - obj.service_ids = []; + obj.service_ids = message.serviceIds; } return obj; }, @@ -2104,16 +2104,16 @@ export const ListConsumerQuotaMetricsRequest = { message.pageToken = object.page_token; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: ListConsumerQuotaMetricsRequest, useInterfaces: boolean = true): ListConsumerQuotaMetricsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; - obj.view = message.view; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromProtoMsg(message: ListConsumerQuotaMetricsRequestProtoMsg, useInterfaces: boolean = true): ListConsumerQuotaMetricsRequest { @@ -2217,9 +2217,9 @@ export const ListConsumerQuotaMetricsResponse = { if (message.metrics) { obj.metrics = message.metrics.map(e => e ? ConsumerQuotaMetric.toAmino(e, useInterfaces) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListConsumerQuotaMetricsResponseProtoMsg, useInterfaces: boolean = true): ListConsumerQuotaMetricsResponse { @@ -2308,14 +2308,14 @@ export const GetConsumerQuotaMetricRequest = { message.name = object.name; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetConsumerQuotaMetricRequest, useInterfaces: boolean = true): GetConsumerQuotaMetricRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.view = message.view; + obj.name = message.name === "" ? undefined : message.name; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromProtoMsg(message: GetConsumerQuotaMetricRequestProtoMsg, useInterfaces: boolean = true): GetConsumerQuotaMetricRequest { @@ -2404,14 +2404,14 @@ export const GetConsumerQuotaLimitRequest = { message.name = object.name; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetConsumerQuotaLimitRequest, useInterfaces: boolean = true): GetConsumerQuotaLimitRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.view = message.view; + obj.name = message.name === "" ? undefined : message.name; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromProtoMsg(message: GetConsumerQuotaLimitRequestProtoMsg, useInterfaces: boolean = true): GetConsumerQuotaLimitRequest { @@ -2548,18 +2548,18 @@ export const CreateAdminOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: CreateAdminOverrideRequest, useInterfaces: boolean = true): CreateAdminOverrideRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.override = message.override ? QuotaOverride.toAmino(message.override, useInterfaces) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2714,19 +2714,19 @@ export const UpdateAdminOverrideRequest = { if (object.update_mask !== undefined && object.update_mask !== null) { message.updateMask = FieldMask.fromAmino(object.update_mask); } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: UpdateAdminOverrideRequest, useInterfaces: boolean = true): UpdateAdminOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.override = message.override ? QuotaOverride.toAmino(message.override, useInterfaces) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask, useInterfaces) : undefined; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2847,17 +2847,17 @@ export const DeleteAdminOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: DeleteAdminOverrideRequest, useInterfaces: boolean = true): DeleteAdminOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.force = message.force; + obj.name = message.name === "" ? undefined : message.name; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2968,9 +2968,9 @@ export const ListAdminOverridesRequest = { }, toAmino(message: ListAdminOverridesRequest, useInterfaces: boolean = true): ListAdminOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromProtoMsg(message: ListAdminOverridesRequestProtoMsg, useInterfaces: boolean = true): ListAdminOverridesRequest { @@ -3074,9 +3074,9 @@ export const ListAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e, useInterfaces) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListAdminOverridesResponseProtoMsg, useInterfaces: boolean = true): ListAdminOverridesResponse { @@ -3165,7 +3165,7 @@ export const BatchCreateAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e, useInterfaces) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -3303,18 +3303,18 @@ export const ImportAdminOverridesRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: ImportAdminOverridesRequest, useInterfaces: boolean = true): ImportAdminOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource, useInterfaces) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3404,7 +3404,7 @@ export const ImportAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e, useInterfaces) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -3604,18 +3604,18 @@ export const CreateConsumerOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: CreateConsumerOverrideRequest, useInterfaces: boolean = true): CreateConsumerOverrideRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.override = message.override ? QuotaOverride.toAmino(message.override, useInterfaces) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3770,19 +3770,19 @@ export const UpdateConsumerOverrideRequest = { if (object.update_mask !== undefined && object.update_mask !== null) { message.updateMask = FieldMask.fromAmino(object.update_mask); } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: UpdateConsumerOverrideRequest, useInterfaces: boolean = true): UpdateConsumerOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.override = message.override ? QuotaOverride.toAmino(message.override, useInterfaces) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask, useInterfaces) : undefined; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3903,17 +3903,17 @@ export const DeleteConsumerOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: DeleteConsumerOverrideRequest, useInterfaces: boolean = true): DeleteConsumerOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.force = message.force; + obj.name = message.name === "" ? undefined : message.name; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -4024,9 +4024,9 @@ export const ListConsumerOverridesRequest = { }, toAmino(message: ListConsumerOverridesRequest, useInterfaces: boolean = true): ListConsumerOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromProtoMsg(message: ListConsumerOverridesRequestProtoMsg, useInterfaces: boolean = true): ListConsumerOverridesRequest { @@ -4130,9 +4130,9 @@ export const ListConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e, useInterfaces) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListConsumerOverridesResponseProtoMsg, useInterfaces: boolean = true): ListConsumerOverridesResponse { @@ -4221,7 +4221,7 @@ export const BatchCreateConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e, useInterfaces) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -4359,18 +4359,18 @@ export const ImportConsumerOverridesRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: ImportConsumerOverridesRequest, useInterfaces: boolean = true): ImportConsumerOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource, useInterfaces) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -4460,7 +4460,7 @@ export const ImportConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e, useInterfaces) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -4612,7 +4612,7 @@ export const ImportAdminQuotaPoliciesResponse = { if (message.policies) { obj.policies = message.policies.map(e => e ? AdminQuotaPolicy.toAmino(e, useInterfaces) : undefined); } else { - obj.policies = []; + obj.policies = message.policies; } return obj; }, @@ -4941,7 +4941,7 @@ export const GenerateServiceIdentityRequest = { }, toAmino(message: GenerateServiceIdentityRequest, useInterfaces: boolean = true): GenerateServiceIdentityRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; return obj; }, fromProtoMsg(message: GenerateServiceIdentityRequestProtoMsg, useInterfaces: boolean = true): GenerateServiceIdentityRequest { @@ -5032,14 +5032,14 @@ export const GetServiceIdentityResponse = { message.identity = ServiceIdentity.fromAmino(object.identity); } if (object.state !== undefined && object.state !== null) { - message.state = getServiceIdentityResponse_IdentityStateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: GetServiceIdentityResponse, useInterfaces: boolean = true): GetServiceIdentityResponseAmino { const obj: any = {}; obj.identity = message.identity ? ServiceIdentity.toAmino(message.identity, useInterfaces) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromProtoMsg(message: GetServiceIdentityResponseProtoMsg, useInterfaces: boolean = true): GetServiceIdentityResponse { diff --git a/__fixtures__/v-next/outputv3/google/api/source_info.ts b/__fixtures__/v-next/outputv3/google/api/source_info.ts index fa30c178ca..e872a5b86f 100644 --- a/__fixtures__/v-next/outputv3/google/api/source_info.ts +++ b/__fixtures__/v-next/outputv3/google/api/source_info.ts @@ -93,7 +93,7 @@ export const SourceInfo = { if (message.sourceFiles) { obj.source_files = message.sourceFiles.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.source_files = []; + obj.source_files = message.sourceFiles; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/api/system_parameter.ts b/__fixtures__/v-next/outputv3/google/api/system_parameter.ts index 19ca89b9e9..32749fd22e 100644 --- a/__fixtures__/v-next/outputv3/google/api/system_parameter.ts +++ b/__fixtures__/v-next/outputv3/google/api/system_parameter.ts @@ -279,7 +279,7 @@ export const SystemParameters = { if (message.rules) { obj.rules = message.rules.map(e => e ? SystemParameterRule.toAmino(e, useInterfaces) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -381,11 +381,11 @@ export const SystemParameterRule = { }, toAmino(message: SystemParameterRule, useInterfaces: boolean = true): SystemParameterRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; if (message.parameters) { obj.parameters = message.parameters.map(e => e ? SystemParameter.toAmino(e, useInterfaces) : undefined); } else { - obj.parameters = []; + obj.parameters = message.parameters; } return obj; }, @@ -496,9 +496,9 @@ export const SystemParameter = { }, toAmino(message: SystemParameter, useInterfaces: boolean = true): SystemParameterAmino { const obj: any = {}; - obj.name = message.name; - obj.http_header = message.httpHeader; - obj.url_query_parameter = message.urlQueryParameter; + obj.name = message.name === "" ? undefined : message.name; + obj.http_header = message.httpHeader === "" ? undefined : message.httpHeader; + obj.url_query_parameter = message.urlQueryParameter === "" ? undefined : message.urlQueryParameter; return obj; }, fromProtoMsg(message: SystemParameterProtoMsg, useInterfaces: boolean = true): SystemParameter { diff --git a/__fixtures__/v-next/outputv3/google/api/usage.ts b/__fixtures__/v-next/outputv3/google/api/usage.ts index 26ae272b0c..8f17414c69 100644 --- a/__fixtures__/v-next/outputv3/google/api/usage.ts +++ b/__fixtures__/v-next/outputv3/google/api/usage.ts @@ -316,14 +316,14 @@ export const Usage = { if (message.requirements) { obj.requirements = message.requirements.map(e => e); } else { - obj.requirements = []; + obj.requirements = message.requirements; } if (message.rules) { obj.rules = message.rules.map(e => e ? UsageRule.toAmino(e, useInterfaces) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.producer_notification_channel = message.producerNotificationChannel; + obj.producer_notification_channel = message.producerNotificationChannel === "" ? undefined : message.producerNotificationChannel; return obj; }, fromProtoMsg(message: UsageProtoMsg, useInterfaces: boolean = true): Usage { @@ -433,9 +433,9 @@ export const UsageRule = { }, toAmino(message: UsageRule, useInterfaces: boolean = true): UsageRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.allow_unregistered_calls = message.allowUnregisteredCalls; - obj.skip_service_control = message.skipServiceControl; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.allow_unregistered_calls = message.allowUnregisteredCalls === false ? undefined : message.allowUnregisteredCalls; + obj.skip_service_control = message.skipServiceControl === false ? undefined : message.skipServiceControl; return obj; }, fromProtoMsg(message: UsageRuleProtoMsg, useInterfaces: boolean = true): UsageRule { diff --git a/__fixtures__/v-next/outputv3/google/api/visibility.ts b/__fixtures__/v-next/outputv3/google/api/visibility.ts index b27f45ee0f..9ae81dae12 100644 --- a/__fixtures__/v-next/outputv3/google/api/visibility.ts +++ b/__fixtures__/v-next/outputv3/google/api/visibility.ts @@ -241,7 +241,7 @@ export const Visibility = { if (message.rules) { obj.rules = message.rules.map(e => e ? VisibilityRule.toAmino(e, useInterfaces) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -337,8 +337,8 @@ export const VisibilityRule = { }, toAmino(message: VisibilityRule, useInterfaces: boolean = true): VisibilityRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.restriction = message.restriction; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.restriction = message.restriction === "" ? undefined : message.restriction; return obj; }, fromProtoMsg(message: VisibilityRuleProtoMsg, useInterfaces: boolean = true): VisibilityRule { diff --git a/__fixtures__/v-next/outputv3/google/logging/type/http_request.ts b/__fixtures__/v-next/outputv3/google/logging/type/http_request.ts index 4fcfb571d7..fba641be83 100644 --- a/__fixtures__/v-next/outputv3/google/logging/type/http_request.ts +++ b/__fixtures__/v-next/outputv3/google/logging/type/http_request.ts @@ -468,21 +468,21 @@ export const HttpRequest = { }, toAmino(message: HttpRequest, useInterfaces: boolean = true): 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.request_method = message.requestMethod === "" ? undefined : message.requestMethod; + obj.request_url = message.requestUrl === "" ? undefined : message.requestUrl; + obj.request_size = message.requestSize !== BigInt(0) ? message.requestSize.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.response_size = message.responseSize !== BigInt(0) ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent === "" ? undefined : message.userAgent; + obj.remote_ip = message.remoteIp === "" ? undefined : message.remoteIp; + obj.server_ip = message.serverIp === "" ? undefined : message.serverIp; + obj.referer = message.referer === "" ? undefined : message.referer; obj.latency = message.latency ? Duration.toAmino(message.latency, useInterfaces) : 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; + obj.cache_lookup = message.cacheLookup === false ? undefined : message.cacheLookup; + obj.cache_hit = message.cacheHit === false ? undefined : message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer === false ? undefined : message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes !== BigInt(0) ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromProtoMsg(message: HttpRequestProtoMsg, useInterfaces: boolean = true): HttpRequest { diff --git a/__fixtures__/v-next/outputv3/google/logging/v2/log_entry.ts b/__fixtures__/v-next/outputv3/google/logging/v2/log_entry.ts index 11853200dd..5aa09fde0f 100644 --- a/__fixtures__/v-next/outputv3/google/logging/v2/log_entry.ts +++ b/__fixtures__/v-next/outputv3/google/logging/v2/log_entry.ts @@ -598,8 +598,8 @@ export const LogEntry_LabelsEntry = { }, toAmino(message: LogEntry_LabelsEntry, useInterfaces: boolean = true): LogEntry_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: LogEntry_LabelsEntryProtoMsg, useInterfaces: boolean = true): LogEntry_LabelsEntry { @@ -927,7 +927,7 @@ export const LogEntry = { message.receiveTimestamp = fromTimestamp(Timestamp.fromAmino(object.receive_timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.insert_id !== undefined && object.insert_id !== null) { message.insertId = object.insert_id; @@ -965,15 +965,15 @@ export const LogEntry = { }, toAmino(message: LogEntry, useInterfaces: boolean = true): LogEntryAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; obj.resource = message.resource ? MonitoredResource.toAmino(message.resource, useInterfaces) : undefined; obj.proto_payload = message.protoPayload ? Any.toAmino(message.protoPayload, useInterfaces) : undefined; - obj.text_payload = message.textPayload; + obj.text_payload = message.textPayload === null ? undefined : message.textPayload; obj.json_payload = message.jsonPayload ? Struct.toAmino(message.jsonPayload, useInterfaces) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.receive_timestamp = message.receiveTimestamp ? Timestamp.toAmino(toTimestamp(message.receiveTimestamp)) : undefined; - obj.severity = message.severity; - obj.insert_id = message.insertId; + obj.severity = message.severity === 0 ? undefined : message.severity; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest, useInterfaces) : undefined; obj.labels = {}; if (message.labels) { @@ -982,9 +982,9 @@ export const LogEntry = { }); } obj.operation = message.operation ? LogEntryOperation.toAmino(message.operation, useInterfaces) : undefined; - obj.trace = message.trace; - obj.span_id = message.spanId; - obj.trace_sampled = message.traceSampled; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.span_id = message.spanId === "" ? undefined : message.spanId; + obj.trace_sampled = message.traceSampled === false ? undefined : message.traceSampled; obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toAmino(message.sourceLocation, useInterfaces) : undefined; obj.split = message.split ? LogSplit.toAmino(message.split, useInterfaces) : undefined; return obj; @@ -1111,10 +1111,10 @@ export const LogEntryOperation = { }, toAmino(message: LogEntryOperation, useInterfaces: boolean = true): LogEntryOperationAmino { const obj: any = {}; - obj.id = message.id; - obj.producer = message.producer; - obj.first = message.first; - obj.last = message.last; + obj.id = message.id === "" ? undefined : message.id; + obj.producer = message.producer === "" ? undefined : message.producer; + obj.first = message.first === false ? undefined : message.first; + obj.last = message.last === false ? undefined : message.last; return obj; }, fromProtoMsg(message: LogEntryOperationProtoMsg, useInterfaces: boolean = true): LogEntryOperation { @@ -1226,9 +1226,9 @@ export const LogEntrySourceLocation = { }, toAmino(message: LogEntrySourceLocation, useInterfaces: boolean = true): LogEntrySourceLocationAmino { const obj: any = {}; - obj.file = message.file; - obj.line = message.line ? message.line.toString() : undefined; - obj.function = message.function; + obj.file = message.file === "" ? undefined : message.file; + obj.line = message.line !== BigInt(0) ? message.line.toString() : undefined; + obj.function = message.function === "" ? undefined : message.function; return obj; }, fromProtoMsg(message: LogEntrySourceLocationProtoMsg, useInterfaces: boolean = true): LogEntrySourceLocation { @@ -1338,9 +1338,9 @@ export const LogSplit = { }, toAmino(message: LogSplit, useInterfaces: boolean = true): LogSplitAmino { const obj: any = {}; - obj.uid = message.uid; - obj.index = message.index; - obj.total_splits = message.totalSplits; + obj.uid = message.uid === "" ? undefined : message.uid; + obj.index = message.index === 0 ? undefined : message.index; + obj.total_splits = message.totalSplits === 0 ? undefined : message.totalSplits; return obj; }, fromProtoMsg(message: LogSplitProtoMsg, useInterfaces: boolean = true): LogSplit { diff --git a/__fixtures__/v-next/outputv3/google/logging/v2/logging.ts b/__fixtures__/v-next/outputv3/google/logging/v2/logging.ts index cc5d6c1636..6a213a9b94 100644 --- a/__fixtures__/v-next/outputv3/google/logging/v2/logging.ts +++ b/__fixtures__/v-next/outputv3/google/logging/v2/logging.ts @@ -955,7 +955,7 @@ export const DeleteLogRequest = { }, toAmino(message: DeleteLogRequest, useInterfaces: boolean = true): DeleteLogRequestAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; return obj; }, fromProtoMsg(message: DeleteLogRequestProtoMsg, useInterfaces: boolean = true): DeleteLogRequest { @@ -1049,8 +1049,8 @@ export const WriteLogEntriesRequest_LabelsEntry = { }, toAmino(message: WriteLogEntriesRequest_LabelsEntry, useInterfaces: boolean = true): WriteLogEntriesRequest_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: WriteLogEntriesRequest_LabelsEntryProtoMsg, useInterfaces: boolean = true): WriteLogEntriesRequest_LabelsEntry { @@ -1245,7 +1245,7 @@ export const WriteLogEntriesRequest = { }, toAmino(message: WriteLogEntriesRequest, useInterfaces: boolean = true): WriteLogEntriesRequestAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; obj.resource = message.resource ? MonitoredResource.toAmino(message.resource, useInterfaces) : undefined; obj.labels = {}; if (message.labels) { @@ -1256,10 +1256,10 @@ export const WriteLogEntriesRequest = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } - obj.partial_success = message.partialSuccess; - obj.dry_run = message.dryRun; + obj.partial_success = message.partialSuccess === false ? undefined : message.partialSuccess; + obj.dry_run = message.dryRun === false ? undefined : message.dryRun; return obj; }, fromProtoMsg(message: WriteLogEntriesRequestProtoMsg, useInterfaces: boolean = true): WriteLogEntriesRequest { @@ -1417,7 +1417,7 @@ export const WriteLogEntriesPartialErrors_LogEntryErrorsEntry = { }, toAmino(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntry, useInterfaces: boolean = true): WriteLogEntriesPartialErrors_LogEntryErrorsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === 0 ? undefined : message.key; obj.value = message.value ? Status.toAmino(message.value, useInterfaces) : undefined; return obj; }, @@ -1684,12 +1684,12 @@ export const ListLogEntriesRequest = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } - obj.filter = message.filter; - obj.order_by = message.orderBy; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.order_by = message.orderBy === "" ? undefined : message.orderBy; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromProtoMsg(message: ListLogEntriesRequestProtoMsg, useInterfaces: boolean = true): ListLogEntriesRequest { @@ -1793,9 +1793,9 @@ export const ListLogEntriesResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListLogEntriesResponseProtoMsg, useInterfaces: boolean = true): ListLogEntriesResponse { @@ -1890,8 +1890,8 @@ export const ListMonitoredResourceDescriptorsRequest = { }, toAmino(message: ListMonitoredResourceDescriptorsRequest, useInterfaces: boolean = true): ListMonitoredResourceDescriptorsRequestAmino { const obj: any = {}; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromProtoMsg(message: ListMonitoredResourceDescriptorsRequestProtoMsg, useInterfaces: boolean = true): ListMonitoredResourceDescriptorsRequest { @@ -1995,9 +1995,9 @@ export const ListMonitoredResourceDescriptorsResponse = { if (message.resourceDescriptors) { obj.resource_descriptors = message.resourceDescriptors.map(e => e ? MonitoredResourceDescriptor.toAmino(e, useInterfaces) : undefined); } else { - obj.resource_descriptors = []; + obj.resource_descriptors = message.resourceDescriptors; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListMonitoredResourceDescriptorsResponseProtoMsg, useInterfaces: boolean = true): ListMonitoredResourceDescriptorsResponse { @@ -2128,13 +2128,13 @@ export const ListLogsRequest = { }, toAmino(message: ListLogsRequest, useInterfaces: boolean = true): ListLogsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, @@ -2239,9 +2239,9 @@ export const ListLogsResponse = { if (message.logNames) { obj.log_names = message.logNames.map(e => e); } else { - obj.log_names = []; + obj.log_names = message.logNames; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListLogsResponseProtoMsg, useInterfaces: boolean = true): ListLogsResponse { @@ -2362,9 +2362,9 @@ export const TailLogEntriesRequest = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } - obj.filter = message.filter; + obj.filter = message.filter === "" ? undefined : message.filter; obj.buffer_window = message.bufferWindow ? Duration.toAmino(message.bufferWindow, useInterfaces) : undefined; return obj; }, @@ -2475,12 +2475,12 @@ export const TailLogEntriesResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e, useInterfaces) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.suppressionInfo) { obj.suppression_info = message.suppressionInfo.map(e => e ? TailLogEntriesResponse_SuppressionInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.suppression_info = []; + obj.suppression_info = message.suppressionInfo; } return obj; }, @@ -2567,7 +2567,7 @@ export const TailLogEntriesResponse_SuppressionInfo = { fromAmino(object: TailLogEntriesResponse_SuppressionInfoAmino): TailLogEntriesResponse_SuppressionInfo { const message = createBaseTailLogEntriesResponse_SuppressionInfo(); if (object.reason !== undefined && object.reason !== null) { - message.reason = tailLogEntriesResponse_SuppressionInfo_ReasonFromJSON(object.reason); + message.reason = object.reason; } if (object.suppressed_count !== undefined && object.suppressed_count !== null) { message.suppressedCount = object.suppressed_count; @@ -2576,8 +2576,8 @@ export const TailLogEntriesResponse_SuppressionInfo = { }, toAmino(message: TailLogEntriesResponse_SuppressionInfo, useInterfaces: boolean = true): TailLogEntriesResponse_SuppressionInfoAmino { const obj: any = {}; - obj.reason = message.reason; - obj.suppressed_count = message.suppressedCount; + obj.reason = message.reason === 0 ? undefined : message.reason; + obj.suppressed_count = message.suppressedCount === 0 ? undefined : message.suppressedCount; return obj; }, fromProtoMsg(message: TailLogEntriesResponse_SuppressionInfoProtoMsg, useInterfaces: boolean = true): TailLogEntriesResponse_SuppressionInfo { diff --git a/__fixtures__/v-next/outputv3/google/logging/v2/logging_config.ts b/__fixtures__/v-next/outputv3/google/logging/v2/logging_config.ts index fbf55cdc33..afde758dfa 100644 --- a/__fixtures__/v-next/outputv3/google/logging/v2/logging_config.ts +++ b/__fixtures__/v-next/outputv3/google/logging/v2/logging_config.ts @@ -3059,7 +3059,7 @@ export const LogBucket = { message.locked = object.locked; } if (object.lifecycle_state !== undefined && object.lifecycle_state !== null) { - message.lifecycleState = lifecycleStateFromJSON(object.lifecycle_state); + message.lifecycleState = object.lifecycle_state; } message.restrictedFields = object.restricted_fields?.map(e => e) || []; if (object.cmek_settings !== undefined && object.cmek_settings !== null) { @@ -3069,17 +3069,17 @@ export const LogBucket = { }, toAmino(message: LogBucket, useInterfaces: boolean = true): LogBucketAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.retention_days = message.retentionDays; - obj.locked = message.locked; - obj.lifecycle_state = message.lifecycleState; + obj.retention_days = message.retentionDays === 0 ? undefined : message.retentionDays; + obj.locked = message.locked === false ? undefined : message.locked; + obj.lifecycle_state = message.lifecycleState === 0 ? undefined : message.lifecycleState; if (message.restrictedFields) { obj.restricted_fields = message.restrictedFields.map(e => e); } else { - obj.restricted_fields = []; + obj.restricted_fields = message.restrictedFields; } obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings, useInterfaces) : undefined; return obj; @@ -3221,11 +3221,11 @@ export const LogView = { }, toAmino(message: LogView, useInterfaces: boolean = true): LogViewAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.filter = message.filter; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromProtoMsg(message: LogViewProtoMsg, useInterfaces: boolean = true): LogView { @@ -3457,7 +3457,7 @@ export const LogSink = { } message.exclusions = object.exclusions?.map(e => LogExclusion.fromAmino(e)) || []; if (object.output_version_format !== undefined && object.output_version_format !== null) { - message.outputVersionFormat = logSink_VersionFormatFromJSON(object.output_version_format); + message.outputVersionFormat = object.output_version_format; } if (object.writer_identity !== undefined && object.writer_identity !== null) { message.writerIdentity = object.writer_identity; @@ -3478,19 +3478,19 @@ export const LogSink = { }, toAmino(message: LogSink, useInterfaces: boolean = true): LogSinkAmino { const obj: any = {}; - obj.name = message.name; - obj.destination = message.destination; - obj.filter = message.filter; - obj.description = message.description; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.destination = message.destination === "" ? undefined : message.destination; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.description = message.description === "" ? undefined : message.description; + obj.disabled = message.disabled === false ? undefined : message.disabled; if (message.exclusions) { obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e, useInterfaces) : undefined); } else { - obj.exclusions = []; + obj.exclusions = message.exclusions; } - obj.output_version_format = message.outputVersionFormat; - obj.writer_identity = message.writerIdentity; - obj.include_children = message.includeChildren; + obj.output_version_format = message.outputVersionFormat === 0 ? undefined : message.outputVersionFormat; + obj.writer_identity = message.writerIdentity === "" ? undefined : message.writerIdentity; + obj.include_children = message.includeChildren === false ? undefined : message.includeChildren; obj.bigquery_options = message.bigqueryOptions ? BigQueryOptions.toAmino(message.bigqueryOptions, useInterfaces) : undefined; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; @@ -3588,8 +3588,8 @@ export const BigQueryOptions = { }, toAmino(message: BigQueryOptions, useInterfaces: boolean = true): BigQueryOptionsAmino { const obj: any = {}; - obj.use_partitioned_tables = message.usePartitionedTables; - obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning; + obj.use_partitioned_tables = message.usePartitionedTables === false ? undefined : message.usePartitionedTables; + obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning === false ? undefined : message.usesTimestampColumnPartitioning; return obj; }, fromProtoMsg(message: BigQueryOptionsProtoMsg, useInterfaces: boolean = true): BigQueryOptions { @@ -3699,9 +3699,9 @@ export const ListBucketsRequest = { }, toAmino(message: ListBucketsRequest, useInterfaces: boolean = true): ListBucketsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromProtoMsg(message: ListBucketsRequestProtoMsg, useInterfaces: boolean = true): ListBucketsRequest { @@ -3805,9 +3805,9 @@ export const ListBucketsResponse = { if (message.buckets) { obj.buckets = message.buckets.map(e => e ? LogBucket.toAmino(e, useInterfaces) : undefined); } else { - obj.buckets = []; + obj.buckets = message.buckets; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListBucketsResponseProtoMsg, useInterfaces: boolean = true): ListBucketsResponse { @@ -3919,8 +3919,8 @@ export const CreateBucketRequest = { }, toAmino(message: CreateBucketRequest, useInterfaces: boolean = true): CreateBucketRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.bucket_id = message.bucketId; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.bucket_id = message.bucketId === "" ? undefined : message.bucketId; obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket, useInterfaces) : undefined; return obj; }, @@ -4035,7 +4035,7 @@ export const UpdateBucketRequest = { }, toAmino(message: UpdateBucketRequest, useInterfaces: boolean = true): UpdateBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket, useInterfaces) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask, useInterfaces) : undefined; return obj; @@ -4117,7 +4117,7 @@ export const GetBucketRequest = { }, toAmino(message: GetBucketRequest, useInterfaces: boolean = true): GetBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: GetBucketRequestProtoMsg, useInterfaces: boolean = true): GetBucketRequest { @@ -4197,7 +4197,7 @@ export const DeleteBucketRequest = { }, toAmino(message: DeleteBucketRequest, useInterfaces: boolean = true): DeleteBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: DeleteBucketRequestProtoMsg, useInterfaces: boolean = true): DeleteBucketRequest { @@ -4277,7 +4277,7 @@ export const UndeleteBucketRequest = { }, toAmino(message: UndeleteBucketRequest, useInterfaces: boolean = true): UndeleteBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: UndeleteBucketRequestProtoMsg, useInterfaces: boolean = true): UndeleteBucketRequest { @@ -4387,9 +4387,9 @@ export const ListViewsRequest = { }, toAmino(message: ListViewsRequest, useInterfaces: boolean = true): ListViewsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromProtoMsg(message: ListViewsRequestProtoMsg, useInterfaces: boolean = true): ListViewsRequest { @@ -4493,9 +4493,9 @@ export const ListViewsResponse = { if (message.views) { obj.views = message.views.map(e => e ? LogView.toAmino(e, useInterfaces) : undefined); } else { - obj.views = []; + obj.views = message.views; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListViewsResponseProtoMsg, useInterfaces: boolean = true): ListViewsResponse { @@ -4607,8 +4607,8 @@ export const CreateViewRequest = { }, toAmino(message: CreateViewRequest, useInterfaces: boolean = true): CreateViewRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.view_id = message.viewId; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.view_id = message.viewId === "" ? undefined : message.viewId; obj.view = message.view ? LogView.toAmino(message.view, useInterfaces) : undefined; return obj; }, @@ -4723,7 +4723,7 @@ export const UpdateViewRequest = { }, toAmino(message: UpdateViewRequest, useInterfaces: boolean = true): UpdateViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.view = message.view ? LogView.toAmino(message.view, useInterfaces) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask, useInterfaces) : undefined; return obj; @@ -4805,7 +4805,7 @@ export const GetViewRequest = { }, toAmino(message: GetViewRequest, useInterfaces: boolean = true): GetViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: GetViewRequestProtoMsg, useInterfaces: boolean = true): GetViewRequest { @@ -4885,7 +4885,7 @@ export const DeleteViewRequest = { }, toAmino(message: DeleteViewRequest, useInterfaces: boolean = true): DeleteViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: DeleteViewRequestProtoMsg, useInterfaces: boolean = true): DeleteViewRequest { @@ -4995,9 +4995,9 @@ export const ListSinksRequest = { }, toAmino(message: ListSinksRequest, useInterfaces: boolean = true): ListSinksRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromProtoMsg(message: ListSinksRequestProtoMsg, useInterfaces: boolean = true): ListSinksRequest { @@ -5101,9 +5101,9 @@ export const ListSinksResponse = { if (message.sinks) { obj.sinks = message.sinks.map(e => e ? LogSink.toAmino(e, useInterfaces) : undefined); } else { - obj.sinks = []; + obj.sinks = message.sinks; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListSinksResponseProtoMsg, useInterfaces: boolean = true): ListSinksResponse { @@ -5183,7 +5183,7 @@ export const GetSinkRequest = { }, toAmino(message: GetSinkRequest, useInterfaces: boolean = true): GetSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; return obj; }, fromProtoMsg(message: GetSinkRequestProtoMsg, useInterfaces: boolean = true): GetSinkRequest { @@ -5295,9 +5295,9 @@ export const CreateSinkRequest = { }, toAmino(message: CreateSinkRequest, useInterfaces: boolean = true): CreateSinkRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.sink = message.sink ? LogSink.toAmino(message.sink, useInterfaces) : undefined; - obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.unique_writer_identity = message.uniqueWriterIdentity === false ? undefined : message.uniqueWriterIdentity; return obj; }, fromProtoMsg(message: CreateSinkRequestProtoMsg, useInterfaces: boolean = true): CreateSinkRequest { @@ -5426,9 +5426,9 @@ export const UpdateSinkRequest = { }, toAmino(message: UpdateSinkRequest, useInterfaces: boolean = true): UpdateSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; obj.sink = message.sink ? LogSink.toAmino(message.sink, useInterfaces) : undefined; - obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.unique_writer_identity = message.uniqueWriterIdentity === false ? undefined : message.uniqueWriterIdentity; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask, useInterfaces) : undefined; return obj; }, @@ -5509,7 +5509,7 @@ export const DeleteSinkRequest = { }, toAmino(message: DeleteSinkRequest, useInterfaces: boolean = true): DeleteSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; return obj; }, fromProtoMsg(message: DeleteSinkRequestProtoMsg, useInterfaces: boolean = true): DeleteSinkRequest { @@ -5664,10 +5664,10 @@ export const LogExclusion = { }, toAmino(message: LogExclusion, useInterfaces: boolean = true): LogExclusionAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; - obj.filter = message.filter; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.disabled = message.disabled === false ? undefined : message.disabled; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; return obj; @@ -5779,9 +5779,9 @@ export const ListExclusionsRequest = { }, toAmino(message: ListExclusionsRequest, useInterfaces: boolean = true): ListExclusionsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromProtoMsg(message: ListExclusionsRequestProtoMsg, useInterfaces: boolean = true): ListExclusionsRequest { @@ -5885,9 +5885,9 @@ export const ListExclusionsResponse = { if (message.exclusions) { obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e, useInterfaces) : undefined); } else { - obj.exclusions = []; + obj.exclusions = message.exclusions; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListExclusionsResponseProtoMsg, useInterfaces: boolean = true): ListExclusionsResponse { @@ -5967,7 +5967,7 @@ export const GetExclusionRequest = { }, toAmino(message: GetExclusionRequest, useInterfaces: boolean = true): GetExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: GetExclusionRequestProtoMsg, useInterfaces: boolean = true): GetExclusionRequest { @@ -6064,7 +6064,7 @@ export const CreateExclusionRequest = { }, toAmino(message: CreateExclusionRequest, useInterfaces: boolean = true): CreateExclusionRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion, useInterfaces) : undefined; return obj; }, @@ -6179,7 +6179,7 @@ export const UpdateExclusionRequest = { }, toAmino(message: UpdateExclusionRequest, useInterfaces: boolean = true): UpdateExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion, useInterfaces) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask, useInterfaces) : undefined; return obj; @@ -6261,7 +6261,7 @@ export const DeleteExclusionRequest = { }, toAmino(message: DeleteExclusionRequest, useInterfaces: boolean = true): DeleteExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: DeleteExclusionRequestProtoMsg, useInterfaces: boolean = true): DeleteExclusionRequest { @@ -6341,7 +6341,7 @@ export const GetCmekSettingsRequest = { }, toAmino(message: GetCmekSettingsRequest, useInterfaces: boolean = true): GetCmekSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: GetCmekSettingsRequestProtoMsg, useInterfaces: boolean = true): GetCmekSettingsRequest { @@ -6455,7 +6455,7 @@ export const UpdateCmekSettingsRequest = { }, toAmino(message: UpdateCmekSettingsRequest, useInterfaces: boolean = true): UpdateCmekSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings, useInterfaces) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask, useInterfaces) : undefined; return obj; @@ -6567,9 +6567,9 @@ export const CmekSettings = { }, toAmino(message: CmekSettings, useInterfaces: boolean = true): CmekSettingsAmino { const obj: any = {}; - obj.name = message.name; - obj.kms_key_name = message.kmsKeyName; - obj.service_account_id = message.serviceAccountId; + obj.name = message.name === "" ? undefined : message.name; + obj.kms_key_name = message.kmsKeyName === "" ? undefined : message.kmsKeyName; + obj.service_account_id = message.serviceAccountId === "" ? undefined : message.serviceAccountId; return obj; }, fromProtoMsg(message: CmekSettingsProtoMsg, useInterfaces: boolean = true): CmekSettings { @@ -6649,7 +6649,7 @@ export const GetSettingsRequest = { }, toAmino(message: GetSettingsRequest, useInterfaces: boolean = true): GetSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: GetSettingsRequestProtoMsg, useInterfaces: boolean = true): GetSettingsRequest { @@ -6763,7 +6763,7 @@ export const UpdateSettingsRequest = { }, toAmino(message: UpdateSettingsRequest, useInterfaces: boolean = true): UpdateSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.settings = message.settings ? Settings.toAmino(message.settings, useInterfaces) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask, useInterfaces) : undefined; return obj; @@ -6905,11 +6905,11 @@ export const Settings = { }, toAmino(message: Settings, useInterfaces: boolean = true): 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; + obj.name = message.name === "" ? undefined : message.name; + obj.kms_key_name = message.kmsKeyName === "" ? undefined : message.kmsKeyName; + obj.kms_service_account_id = message.kmsServiceAccountId === "" ? undefined : message.kmsServiceAccountId; + obj.storage_location = message.storageLocation === "" ? undefined : message.storageLocation; + obj.disable_default_sink = message.disableDefaultSink === false ? undefined : message.disableDefaultSink; return obj; }, fromProtoMsg(message: SettingsProtoMsg, useInterfaces: boolean = true): Settings { @@ -7019,9 +7019,9 @@ export const CopyLogEntriesRequest = { }, toAmino(message: CopyLogEntriesRequest, useInterfaces: boolean = true): CopyLogEntriesRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.filter = message.filter; - obj.destination = message.destination; + obj.name = message.name === "" ? undefined : message.name; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.destination = message.destination === "" ? undefined : message.destination; return obj; }, fromProtoMsg(message: CopyLogEntriesRequestProtoMsg, useInterfaces: boolean = true): CopyLogEntriesRequest { @@ -7175,7 +7175,7 @@ export const CopyLogEntriesMetadata = { message.endTime = fromTimestamp(Timestamp.fromAmino(object.end_time)); } if (object.state !== undefined && object.state !== null) { - message.state = operationStateFromJSON(object.state); + message.state = object.state; } if (object.cancellation_requested !== undefined && object.cancellation_requested !== null) { message.cancellationRequested = object.cancellation_requested; @@ -7195,11 +7195,11 @@ export const CopyLogEntriesMetadata = { const obj: any = {}; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; - obj.state = message.state; - obj.cancellation_requested = message.cancellationRequested; + obj.state = message.state === 0 ? undefined : message.state; + obj.cancellation_requested = message.cancellationRequested === false ? undefined : message.cancellationRequested; obj.request = message.request ? CopyLogEntriesRequest.toAmino(message.request, useInterfaces) : undefined; - obj.progress = message.progress; - obj.writer_identity = message.writerIdentity; + obj.progress = message.progress === 0 ? undefined : message.progress; + obj.writer_identity = message.writerIdentity === "" ? undefined : message.writerIdentity; return obj; }, fromProtoMsg(message: CopyLogEntriesMetadataProtoMsg, useInterfaces: boolean = true): CopyLogEntriesMetadata { @@ -7281,7 +7281,7 @@ export const CopyLogEntriesResponse = { }, toAmino(message: CopyLogEntriesResponse, useInterfaces: boolean = true): CopyLogEntriesResponseAmino { const obj: any = {}; - obj.log_entries_copied_count = message.logEntriesCopiedCount ? message.logEntriesCopiedCount.toString() : undefined; + obj.log_entries_copied_count = message.logEntriesCopiedCount !== BigInt(0) ? message.logEntriesCopiedCount.toString() : undefined; return obj; }, fromProtoMsg(message: CopyLogEntriesResponseProtoMsg, useInterfaces: boolean = true): CopyLogEntriesResponse { diff --git a/__fixtures__/v-next/outputv3/google/logging/v2/logging_metrics.ts b/__fixtures__/v-next/outputv3/google/logging/v2/logging_metrics.ts index 532f536565..fbee2165d2 100644 --- a/__fixtures__/v-next/outputv3/google/logging/v2/logging_metrics.ts +++ b/__fixtures__/v-next/outputv3/google/logging/v2/logging_metrics.ts @@ -651,8 +651,8 @@ export const LogMetric_LabelExtractorsEntry = { }, toAmino(message: LogMetric_LabelExtractorsEntry, useInterfaces: boolean = true): LogMetric_LabelExtractorsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: LogMetric_LabelExtractorsEntryProtoMsg, useInterfaces: boolean = true): LogMetric_LabelExtractorsEntry { @@ -912,18 +912,18 @@ export const LogMetric = { message.updateTime = fromTimestamp(Timestamp.fromAmino(object.update_time)); } if (object.version !== undefined && object.version !== null) { - message.version = logMetric_ApiVersionFromJSON(object.version); + message.version = object.version; } return message; }, toAmino(message: LogMetric, useInterfaces: boolean = true): LogMetricAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; - obj.filter = message.filter; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.disabled = message.disabled === false ? undefined : message.disabled; obj.metric_descriptor = message.metricDescriptor ? MetricDescriptor.toAmino(message.metricDescriptor, useInterfaces) : undefined; - obj.value_extractor = message.valueExtractor; + obj.value_extractor = message.valueExtractor === "" ? undefined : message.valueExtractor; obj.label_extractors = {}; if (message.labelExtractors) { Object.entries(message.labelExtractors).forEach(([k, v]) => { @@ -933,7 +933,7 @@ export const LogMetric = { obj.bucket_options = message.bucketOptions ? Distribution_BucketOptions.toAmino(message.bucketOptions, useInterfaces) : undefined; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.version = message.version; + obj.version = message.version === 0 ? undefined : message.version; return obj; }, fromProtoMsg(message: LogMetricProtoMsg, useInterfaces: boolean = true): LogMetric { @@ -1043,9 +1043,9 @@ export const ListLogMetricsRequest = { }, toAmino(message: ListLogMetricsRequest, useInterfaces: boolean = true): ListLogMetricsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromProtoMsg(message: ListLogMetricsRequestProtoMsg, useInterfaces: boolean = true): ListLogMetricsRequest { @@ -1149,9 +1149,9 @@ export const ListLogMetricsResponse = { if (message.metrics) { obj.metrics = message.metrics.map(e => e ? LogMetric.toAmino(e, useInterfaces) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListLogMetricsResponseProtoMsg, useInterfaces: boolean = true): ListLogMetricsResponse { @@ -1231,7 +1231,7 @@ export const GetLogMetricRequest = { }, toAmino(message: GetLogMetricRequest, useInterfaces: boolean = true): GetLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; return obj; }, fromProtoMsg(message: GetLogMetricRequestProtoMsg, useInterfaces: boolean = true): GetLogMetricRequest { @@ -1328,7 +1328,7 @@ export const CreateLogMetricRequest = { }, toAmino(message: CreateLogMetricRequest, useInterfaces: boolean = true): CreateLogMetricRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.metric = message.metric ? LogMetric.toAmino(message.metric, useInterfaces) : undefined; return obj; }, @@ -1426,7 +1426,7 @@ export const UpdateLogMetricRequest = { }, toAmino(message: UpdateLogMetricRequest, useInterfaces: boolean = true): UpdateLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; obj.metric = message.metric ? LogMetric.toAmino(message.metric, useInterfaces) : undefined; return obj; }, @@ -1507,7 +1507,7 @@ export const DeleteLogMetricRequest = { }, toAmino(message: DeleteLogMetricRequest, useInterfaces: boolean = true): DeleteLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; return obj; }, fromProtoMsg(message: DeleteLogMetricRequestProtoMsg, useInterfaces: boolean = true): DeleteLogMetricRequest { diff --git a/__fixtures__/v-next/outputv3/google/longrunning/operations.ts b/__fixtures__/v-next/outputv3/google/longrunning/operations.ts index 18b628dbbf..4868a343b4 100644 --- a/__fixtures__/v-next/outputv3/google/longrunning/operations.ts +++ b/__fixtures__/v-next/outputv3/google/longrunning/operations.ts @@ -459,9 +459,9 @@ export const Operation = { }, toAmino(message: Operation, useInterfaces: boolean = true): OperationAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.metadata = message.metadata ? Any.toAmino(message.metadata, useInterfaces) : undefined; - obj.done = message.done; + obj.done = message.done === false ? undefined : message.done; obj.error = message.error ? Status.toAmino(message.error, useInterfaces) : undefined; obj.response = message.response ? Any.toAmino(message.response, useInterfaces) : undefined; return obj; @@ -543,7 +543,7 @@ export const GetOperationRequest = { }, toAmino(message: GetOperationRequest, useInterfaces: boolean = true): GetOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: GetOperationRequestProtoMsg, useInterfaces: boolean = true): GetOperationRequest { @@ -668,10 +668,10 @@ export const ListOperationsRequest = { }, toAmino(message: ListOperationsRequest, useInterfaces: boolean = true): ListOperationsRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.filter = message.filter; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.name = message.name === "" ? undefined : message.name; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromProtoMsg(message: ListOperationsRequestProtoMsg, useInterfaces: boolean = true): ListOperationsRequest { @@ -775,9 +775,9 @@ export const ListOperationsResponse = { if (message.operations) { obj.operations = message.operations.map(e => e ? Operation.toAmino(e, useInterfaces) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromProtoMsg(message: ListOperationsResponseProtoMsg, useInterfaces: boolean = true): ListOperationsResponse { @@ -857,7 +857,7 @@ export const CancelOperationRequest = { }, toAmino(message: CancelOperationRequest, useInterfaces: boolean = true): CancelOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: CancelOperationRequestProtoMsg, useInterfaces: boolean = true): CancelOperationRequest { @@ -937,7 +937,7 @@ export const DeleteOperationRequest = { }, toAmino(message: DeleteOperationRequest, useInterfaces: boolean = true): DeleteOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromProtoMsg(message: DeleteOperationRequestProtoMsg, useInterfaces: boolean = true): DeleteOperationRequest { @@ -1034,7 +1034,7 @@ export const WaitOperationRequest = { }, toAmino(message: WaitOperationRequest, useInterfaces: boolean = true): WaitOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timeout = message.timeout ? Duration.toAmino(message.timeout, useInterfaces) : undefined; return obj; }, @@ -1130,8 +1130,8 @@ export const OperationInfo = { }, toAmino(message: OperationInfo, useInterfaces: boolean = true): OperationInfoAmino { const obj: any = {}; - obj.response_type = message.responseType; - obj.metadata_type = message.metadataType; + obj.response_type = message.responseType === "" ? undefined : message.responseType; + obj.metadata_type = message.metadataType === "" ? undefined : message.metadataType; return obj; }, fromProtoMsg(message: OperationInfoProtoMsg, useInterfaces: boolean = true): OperationInfo { diff --git a/__fixtures__/v-next/outputv3/google/protobuf/api.ts b/__fixtures__/v-next/outputv3/google/protobuf/api.ts index fb71b1c680..50231ff1cd 100644 --- a/__fixtures__/v-next/outputv3/google/protobuf/api.ts +++ b/__fixtures__/v-next/outputv3/google/protobuf/api.ts @@ -615,31 +615,31 @@ export const Api = { } message.mixins = object.mixins?.map(e => Mixin.fromAmino(e)) || []; if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Api, useInterfaces: boolean = true): ApiAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.methods) { obj.methods = message.methods.map(e => e ? Method.toAmino(e, useInterfaces) : undefined); } else { - obj.methods = []; + obj.methods = message.methods; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e, useInterfaces) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.version = message.version; + obj.version = message.version === "" ? undefined : message.version; obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext, useInterfaces) : undefined; if (message.mixins) { obj.mixins = message.mixins.map(e => e ? Mixin.toAmino(e, useInterfaces) : undefined); } else { - obj.mixins = []; + obj.mixins = message.mixins; } - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromProtoMsg(message: ApiProtoMsg, useInterfaces: boolean = true): Api { @@ -809,23 +809,23 @@ export const Method = { } message.options = object.options?.map(e => Option.fromAmino(e)) || []; if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Method, useInterfaces: boolean = true): 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; + obj.name = message.name === "" ? undefined : message.name; + obj.request_type_url = message.requestTypeUrl === "" ? undefined : message.requestTypeUrl; + obj.request_streaming = message.requestStreaming === false ? undefined : message.requestStreaming; + obj.response_type_url = message.responseTypeUrl === "" ? undefined : message.responseTypeUrl; + obj.response_streaming = message.responseStreaming === false ? undefined : message.responseStreaming; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e, useInterfaces) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromProtoMsg(message: MethodProtoMsg, useInterfaces: boolean = true): Method { @@ -920,8 +920,8 @@ export const Mixin = { }, toAmino(message: Mixin, useInterfaces: boolean = true): MixinAmino { const obj: any = {}; - obj.name = message.name; - obj.root = message.root; + obj.name = message.name === "" ? undefined : message.name; + obj.root = message.root === "" ? undefined : message.root; return obj; }, fromProtoMsg(message: MixinProtoMsg, useInterfaces: boolean = true): Mixin { diff --git a/__fixtures__/v-next/outputv3/google/protobuf/compiler/plugin.ts b/__fixtures__/v-next/outputv3/google/protobuf/compiler/plugin.ts index 3a6ef08723..a339055628 100644 --- a/__fixtures__/v-next/outputv3/google/protobuf/compiler/plugin.ts +++ b/__fixtures__/v-next/outputv3/google/protobuf/compiler/plugin.ts @@ -382,10 +382,10 @@ export const Version = { }, toAmino(message: Version, useInterfaces: boolean = true): VersionAmino { const obj: any = {}; - obj.major = message.major; - obj.minor = message.minor; - obj.patch = message.patch; - obj.suffix = message.suffix; + obj.major = message.major === 0 ? undefined : message.major; + obj.minor = message.minor === 0 ? undefined : message.minor; + obj.patch = message.patch === 0 ? undefined : message.patch; + obj.suffix = message.suffix === "" ? undefined : message.suffix; return obj; }, fromProtoMsg(message: VersionProtoMsg, useInterfaces: boolean = true): Version { @@ -527,13 +527,13 @@ export const CodeGeneratorRequest = { if (message.fileToGenerate) { obj.file_to_generate = message.fileToGenerate.map(e => e); } else { - obj.file_to_generate = []; + obj.file_to_generate = message.fileToGenerate; } - obj.parameter = message.parameter; + obj.parameter = message.parameter === "" ? undefined : message.parameter; if (message.protoFile) { obj.proto_file = message.protoFile.map(e => e ? FileDescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.proto_file = []; + obj.proto_file = message.protoFile; } obj.compiler_version = message.compilerVersion ? Version.toAmino(message.compilerVersion, useInterfaces) : undefined; return obj; @@ -636,11 +636,11 @@ export const CodeGeneratorResponse = { }, toAmino(message: CodeGeneratorResponse, useInterfaces: boolean = true): CodeGeneratorResponseAmino { const obj: any = {}; - obj.error = message.error; + obj.error = message.error === "" ? undefined : message.error; if (message.file) { obj.file = message.file.map(e => e ? CodeGeneratorResponse_File.toAmino(e, useInterfaces) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -751,9 +751,9 @@ export const CodeGeneratorResponse_File = { }, toAmino(message: CodeGeneratorResponse_File, useInterfaces: boolean = true): CodeGeneratorResponse_FileAmino { const obj: any = {}; - obj.name = message.name; - obj.insertion_point = message.insertionPoint; - obj.content = message.content; + obj.name = message.name === "" ? undefined : message.name; + obj.insertion_point = message.insertionPoint === "" ? undefined : message.insertionPoint; + obj.content = message.content === "" ? undefined : message.content; return obj; }, fromProtoMsg(message: CodeGeneratorResponse_FileProtoMsg, useInterfaces: boolean = true): CodeGeneratorResponse_File { diff --git a/__fixtures__/v-next/outputv3/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputv3/google/protobuf/descriptor.ts index 621e4ffbfd..d6b71b097b 100644 --- a/__fixtures__/v-next/outputv3/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputv3/google/protobuf/descriptor.ts @@ -2162,7 +2162,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -2472,46 +2472,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto, useInterfaces: boolean = true): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } obj.options = message.options ? FileOptions.toAmino(message.options, useInterfaces) : undefined; obj.source_code_info = message.sourceCodeInfo ? SourceCodeInfo.toAmino(message.sourceCodeInfo, useInterfaces) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromProtoMsg(message: FileDescriptorProtoProtoMsg, useInterfaces: boolean = true): FileDescriptorProto { @@ -2776,47 +2776,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto, useInterfaces: boolean = true): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e, useInterfaces) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } obj.options = message.options ? MessageOptions.toAmino(message.options, useInterfaces) : undefined; if (message.reservedRange) { obj.reserved_range = message.reservedRange.map(e => e ? DescriptorProto_ReservedRange.toAmino(e, useInterfaces) : undefined); } else { - obj.reserved_range = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -2929,8 +2929,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange, useInterfaces: boolean = true): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options, useInterfaces) : undefined; return obj; }, @@ -3026,8 +3026,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange, useInterfaces: boolean = true): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromProtoMsg(message: DescriptorProto_ReservedRangeProtoMsg, useInterfaces: boolean = true): DescriptorProto_ReservedRange { @@ -3116,7 +3116,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e, useInterfaces) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -3307,10 +3307,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -3334,15 +3334,15 @@ export const FieldDescriptorProto = { }, toAmino(message: FieldDescriptorProto, useInterfaces: boolean = true): 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options, useInterfaces) : undefined; return obj; }, @@ -3440,7 +3440,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto, useInterfaces: boolean = true): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options, useInterfaces) : undefined; return obj; }, @@ -3601,22 +3601,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto, useInterfaces: boolean = true): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.value = []; + obj.value = message.value; } obj.options = message.options ? EnumOptions.toAmino(message.options, useInterfaces) : undefined; if (message.reservedRange) { obj.reserved_range = message.reservedRange.map(e => e ? EnumDescriptorProto_EnumReservedRange.toAmino(e, useInterfaces) : undefined); } else { - obj.reserved_range = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3712,8 +3712,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange, useInterfaces: boolean = true): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromProtoMsg(message: EnumDescriptorProto_EnumReservedRangeProtoMsg, useInterfaces: boolean = true): EnumDescriptorProto_EnumReservedRange { @@ -3825,8 +3825,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto, useInterfaces: boolean = true): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options, useInterfaces) : undefined; return obj; }, @@ -3945,11 +3945,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto, useInterfaces: boolean = true): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e, useInterfaces) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options, useInterfaces) : undefined; return obj; @@ -4108,12 +4108,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto, useInterfaces: boolean = true): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options, useInterfaces) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromProtoMsg(message: MethodDescriptorProtoProtoMsg, useInterfaces: boolean = true): MethodDescriptorProto { @@ -4450,7 +4450,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -4499,30 +4499,30 @@ export const FileOptions = { }, toAmino(message: FileOptions, useInterfaces: boolean = true): 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e, useInterfaces) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4669,14 +4669,14 @@ export const MessageOptions = { }, toAmino(message: MessageOptions, useInterfaces: boolean = true): 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e, useInterfaces) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4831,13 +4831,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -4853,16 +4853,16 @@ export const FieldOptions = { }, toAmino(message: FieldOptions, useInterfaces: boolean = true): 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e, useInterfaces) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4952,7 +4952,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e, useInterfaces) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5069,12 +5069,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions, useInterfaces: boolean = true): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e, useInterfaces) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5176,11 +5176,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions, useInterfaces: boolean = true): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e, useInterfaces) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5282,11 +5282,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions, useInterfaces: boolean = true): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e, useInterfaces) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5396,19 +5396,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions, useInterfaces: boolean = true): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e, useInterfaces) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5592,14 +5592,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e, useInterfaces) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromProtoMsg(message: UninterpretedOptionProtoMsg, useInterfaces: boolean = true): UninterpretedOption { @@ -5694,8 +5694,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart, useInterfaces: boolean = true): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromProtoMsg(message: UninterpretedOption_NamePartProtoMsg, useInterfaces: boolean = true): UninterpretedOption_NamePart { @@ -5784,7 +5784,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e, useInterfaces) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -5964,19 +5964,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -6066,7 +6066,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e, useInterfaces) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -6210,11 +6210,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromProtoMsg(message: GeneratedCodeInfo_AnnotationProtoMsg, useInterfaces: boolean = true): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/v-next/outputv3/google/protobuf/field_mask.ts b/__fixtures__/v-next/outputv3/google/protobuf/field_mask.ts index 4d66f0589d..fa9a8072f2 100644 --- a/__fixtures__/v-next/outputv3/google/protobuf/field_mask.ts +++ b/__fixtures__/v-next/outputv3/google/protobuf/field_mask.ts @@ -692,7 +692,7 @@ export const FieldMask = { if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/protobuf/source_context.ts b/__fixtures__/v-next/outputv3/google/protobuf/source_context.ts index c1cd67e065..f98fc8b4d3 100644 --- a/__fixtures__/v-next/outputv3/google/protobuf/source_context.ts +++ b/__fixtures__/v-next/outputv3/google/protobuf/source_context.ts @@ -98,7 +98,7 @@ export const SourceContext = { }, toAmino(message: SourceContext, useInterfaces: boolean = true): SourceContextAmino { const obj: any = {}; - obj.file_name = message.fileName; + obj.file_name = message.fileName === "" ? undefined : message.fileName; return obj; }, fromProtoMsg(message: SourceContextProtoMsg, useInterfaces: boolean = true): SourceContext { diff --git a/__fixtures__/v-next/outputv3/google/protobuf/struct.ts b/__fixtures__/v-next/outputv3/google/protobuf/struct.ts index 6e9e563bc6..d5335f5e5c 100644 --- a/__fixtures__/v-next/outputv3/google/protobuf/struct.ts +++ b/__fixtures__/v-next/outputv3/google/protobuf/struct.ts @@ -275,7 +275,7 @@ export const Struct_FieldsEntry = { }, toAmino(message: Struct_FieldsEntry, useInterfaces: boolean = true): Struct_FieldsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? Value.toAmino(message.value, useInterfaces) : undefined; return obj; }, @@ -531,7 +531,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.number_value !== undefined && object.number_value !== null) { message.numberValue = object.number_value; @@ -552,10 +552,10 @@ export const Value = { }, toAmino(message: Value, useInterfaces: boolean = true): 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.number_value = message.numberValue === null ? undefined : message.numberValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; obj.struct_value = message.structValue ? Struct.toAmino(message.structValue, useInterfaces) : undefined; obj.list_value = message.listValue ? ListValue.toAmino(message.listValue, useInterfaces) : undefined; return obj; @@ -646,7 +646,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e, useInterfaces) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/protobuf/type.ts b/__fixtures__/v-next/outputv3/google/protobuf/type.ts index 72bcdc68aa..29b8bed5da 100644 --- a/__fixtures__/v-next/outputv3/google/protobuf/type.ts +++ b/__fixtures__/v-next/outputv3/google/protobuf/type.ts @@ -630,30 +630,30 @@ export const Type = { message.sourceContext = SourceContext.fromAmino(object.source_context); } if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Type, useInterfaces: boolean = true): TypeAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.fields) { obj.fields = message.fields.map(e => e ? Field.toAmino(e, useInterfaces) : undefined); } else { - obj.fields = []; + obj.fields = message.fields; } if (message.oneofs) { obj.oneofs = message.oneofs.map(e => e); } else { - obj.oneofs = []; + obj.oneofs = message.oneofs; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e, useInterfaces) : undefined); } else { - obj.options = []; + obj.options = message.options; } obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext, useInterfaces) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromProtoMsg(message: TypeProtoMsg, useInterfaces: boolean = true): Type { @@ -843,10 +843,10 @@ export const Field = { fromAmino(object: FieldAmino): Field { const message = createBaseField(); if (object.kind !== undefined && object.kind !== null) { - message.kind = field_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.cardinality !== undefined && object.cardinality !== null) { - message.cardinality = field_CardinalityFromJSON(object.cardinality); + message.cardinality = object.cardinality; } if (object.number !== undefined && object.number !== null) { message.number = object.number; @@ -874,20 +874,20 @@ export const Field = { }, toAmino(message: Field, useInterfaces: boolean = true): 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; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.cardinality = message.cardinality === 0 ? undefined : message.cardinality; + obj.number = message.number === 0 ? undefined : message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.type_url = message.typeUrl === "" ? undefined : message.typeUrl; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.packed = message.packed === false ? undefined : message.packed; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e, useInterfaces) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.json_name = message.jsonName; - obj.default_value = message.defaultValue; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; return obj; }, fromProtoMsg(message: FieldProtoMsg, useInterfaces: boolean = true): Field { @@ -1035,25 +1035,25 @@ export const Enum = { message.sourceContext = SourceContext.fromAmino(object.source_context); } if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Enum, useInterfaces: boolean = true): EnumAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.enumvalue) { obj.enumvalue = message.enumvalue.map(e => e ? EnumValue.toAmino(e, useInterfaces) : undefined); } else { - obj.enumvalue = []; + obj.enumvalue = message.enumvalue; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e, useInterfaces) : undefined); } else { - obj.options = []; + obj.options = message.options; } obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext, useInterfaces) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromProtoMsg(message: EnumProtoMsg, useInterfaces: boolean = true): Enum { @@ -1169,12 +1169,12 @@ export const EnumValue = { }, toAmino(message: EnumValue, useInterfaces: boolean = true): EnumValueAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e, useInterfaces) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -1272,7 +1272,7 @@ export const Option = { }, toAmino(message: Option, useInterfaces: boolean = true): OptionAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.value = message.value ? Any.toAmino(message.value, useInterfaces) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/google/protobuf/wrappers.ts b/__fixtures__/v-next/outputv3/google/protobuf/wrappers.ts index de58e40d54..e679c3d51d 100644 --- a/__fixtures__/v-next/outputv3/google/protobuf/wrappers.ts +++ b/__fixtures__/v-next/outputv3/google/protobuf/wrappers.ts @@ -335,7 +335,7 @@ export const DoubleValue = { }, toAmino(message: DoubleValue, useInterfaces: boolean = true): DoubleValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromProtoMsg(message: DoubleValueProtoMsg, useInterfaces: boolean = true): DoubleValue { @@ -415,7 +415,7 @@ export const FloatValue = { }, toAmino(message: FloatValue, useInterfaces: boolean = true): FloatValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromProtoMsg(message: FloatValueProtoMsg, useInterfaces: boolean = true): FloatValue { @@ -497,7 +497,7 @@ export const Int64Value = { }, toAmino(message: Int64Value, useInterfaces: boolean = true): Int64ValueAmino { const obj: any = {}; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromProtoMsg(message: Int64ValueProtoMsg, useInterfaces: boolean = true): Int64Value { @@ -579,7 +579,7 @@ export const UInt64Value = { }, toAmino(message: UInt64Value, useInterfaces: boolean = true): UInt64ValueAmino { const obj: any = {}; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromProtoMsg(message: UInt64ValueProtoMsg, useInterfaces: boolean = true): UInt64Value { @@ -659,7 +659,7 @@ export const Int32Value = { }, toAmino(message: Int32Value, useInterfaces: boolean = true): Int32ValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromProtoMsg(message: Int32ValueProtoMsg, useInterfaces: boolean = true): Int32Value { @@ -739,7 +739,7 @@ export const UInt32Value = { }, toAmino(message: UInt32Value, useInterfaces: boolean = true): UInt32ValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromProtoMsg(message: UInt32ValueProtoMsg, useInterfaces: boolean = true): UInt32Value { @@ -819,7 +819,7 @@ export const BoolValue = { }, toAmino(message: BoolValue, useInterfaces: boolean = true): BoolValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === false ? undefined : message.value; return obj; }, fromProtoMsg(message: BoolValueProtoMsg, useInterfaces: boolean = true): BoolValue { @@ -899,7 +899,7 @@ export const StringValue = { }, toAmino(message: StringValue, useInterfaces: boolean = true): StringValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: StringValueProtoMsg, useInterfaces: boolean = true): StringValue { diff --git a/__fixtures__/v-next/outputv3/google/rpc/context/attribute_context.ts b/__fixtures__/v-next/outputv3/google/rpc/context/attribute_context.ts index 8fb69f4979..256c915d23 100644 --- a/__fixtures__/v-next/outputv3/google/rpc/context/attribute_context.ts +++ b/__fixtures__/v-next/outputv3/google/rpc/context/attribute_context.ts @@ -1156,7 +1156,7 @@ export const AttributeContext = { if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, @@ -1251,8 +1251,8 @@ export const AttributeContext_Peer_LabelsEntry = { }, toAmino(message: AttributeContext_Peer_LabelsEntry, useInterfaces: boolean = true): AttributeContext_Peer_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: AttributeContext_Peer_LabelsEntryProtoMsg, useInterfaces: boolean = true): AttributeContext_Peer_LabelsEntry { @@ -1426,16 +1426,16 @@ export const AttributeContext_Peer = { }, toAmino(message: AttributeContext_Peer, useInterfaces: boolean = true): AttributeContext_PeerAmino { const obj: any = {}; - obj.ip = message.ip; - obj.port = message.port ? message.port.toString() : undefined; + obj.ip = message.ip === "" ? undefined : message.ip; + obj.port = message.port !== BigInt(0) ? 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; + obj.principal = message.principal === "" ? undefined : message.principal; + obj.region_code = message.regionCode === "" ? undefined : message.regionCode; return obj; }, fromProtoMsg(message: AttributeContext_PeerProtoMsg, useInterfaces: boolean = true): AttributeContext_Peer { @@ -1560,10 +1560,10 @@ export const AttributeContext_Api = { }, toAmino(message: AttributeContext_Api, useInterfaces: boolean = true): AttributeContext_ApiAmino { const obj: any = {}; - obj.service = message.service; - obj.operation = message.operation; - obj.protocol = message.protocol; - obj.version = message.version; + obj.service = message.service === "" ? undefined : message.service; + obj.operation = message.operation === "" ? undefined : message.operation; + obj.protocol = message.protocol === "" ? undefined : message.protocol; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromProtoMsg(message: AttributeContext_ApiProtoMsg, useInterfaces: boolean = true): AttributeContext_Api { @@ -1717,18 +1717,18 @@ export const AttributeContext_Auth = { }, toAmino(message: AttributeContext_Auth, useInterfaces: boolean = true): AttributeContext_AuthAmino { const obj: any = {}; - obj.principal = message.principal; + obj.principal = message.principal === "" ? undefined : message.principal; if (message.audiences) { obj.audiences = message.audiences.map(e => e); } else { - obj.audiences = []; + obj.audiences = message.audiences; } - obj.presenter = message.presenter; + obj.presenter = message.presenter === "" ? undefined : message.presenter; obj.claims = message.claims ? Struct.toAmino(message.claims, useInterfaces) : undefined; if (message.accessLevels) { obj.access_levels = message.accessLevels.map(e => e); } else { - obj.access_levels = []; + obj.access_levels = message.accessLevels; } return obj; }, @@ -1823,8 +1823,8 @@ export const AttributeContext_Request_HeadersEntry = { }, toAmino(message: AttributeContext_Request_HeadersEntry, useInterfaces: boolean = true): AttributeContext_Request_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: AttributeContext_Request_HeadersEntryProtoMsg, useInterfaces: boolean = true): AttributeContext_Request_HeadersEntry { @@ -2105,22 +2105,22 @@ export const AttributeContext_Request = { }, toAmino(message: AttributeContext_Request, useInterfaces: boolean = true): AttributeContext_RequestAmino { const obj: any = {}; - obj.id = message.id; - obj.method = message.method; + obj.id = message.id === "" ? undefined : message.id; + obj.method = message.method === "" ? undefined : 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.path = message.path === "" ? undefined : message.path; + obj.host = message.host === "" ? undefined : message.host; + obj.scheme = message.scheme === "" ? undefined : message.scheme; + obj.query = message.query === "" ? undefined : message.query; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.size = message.size ? message.size.toString() : undefined; - obj.protocol = message.protocol; - obj.reason = message.reason; + obj.size = message.size !== BigInt(0) ? message.size.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; + obj.reason = message.reason === "" ? undefined : message.reason; obj.auth = message.auth ? AttributeContext_Auth.toAmino(message.auth, useInterfaces) : undefined; return obj; }, @@ -2215,8 +2215,8 @@ export const AttributeContext_Response_HeadersEntry = { }, toAmino(message: AttributeContext_Response_HeadersEntry, useInterfaces: boolean = true): AttributeContext_Response_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: AttributeContext_Response_HeadersEntryProtoMsg, useInterfaces: boolean = true): AttributeContext_Response_HeadersEntry { @@ -2394,8 +2394,8 @@ export const AttributeContext_Response = { }, toAmino(message: AttributeContext_Response, useInterfaces: boolean = true): AttributeContext_ResponseAmino { const obj: any = {}; - obj.code = message.code ? message.code.toString() : undefined; - obj.size = message.size ? message.size.toString() : undefined; + obj.code = message.code !== BigInt(0) ? message.code.toString() : undefined; + obj.size = message.size !== BigInt(0) ? message.size.toString() : undefined; obj.headers = {}; if (message.headers) { Object.entries(message.headers).forEach(([k, v]) => { @@ -2497,8 +2497,8 @@ export const AttributeContext_Resource_LabelsEntry = { }, toAmino(message: AttributeContext_Resource_LabelsEntry, useInterfaces: boolean = true): AttributeContext_Resource_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: AttributeContext_Resource_LabelsEntryProtoMsg, useInterfaces: boolean = true): AttributeContext_Resource_LabelsEntry { @@ -2586,8 +2586,8 @@ export const AttributeContext_Resource_AnnotationsEntry = { }, toAmino(message: AttributeContext_Resource_AnnotationsEntry, useInterfaces: boolean = true): AttributeContext_Resource_AnnotationsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: AttributeContext_Resource_AnnotationsEntryProtoMsg, useInterfaces: boolean = true): AttributeContext_Resource_AnnotationsEntry { @@ -2902,28 +2902,28 @@ export const AttributeContext_Resource = { }, toAmino(message: AttributeContext_Resource, useInterfaces: boolean = true): AttributeContext_ResourceAmino { const obj: any = {}; - obj.service = message.service; - obj.name = message.name; - obj.type = message.type; + obj.service = message.service === "" ? undefined : message.service; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { obj.labels[k] = v; }); } - obj.uid = message.uid; + obj.uid = message.uid === "" ? undefined : message.uid; obj.annotations = {}; if (message.annotations) { Object.entries(message.annotations).forEach(([k, v]) => { obj.annotations[k] = v; }); } - obj.display_name = message.displayName; + obj.display_name = message.displayName === "" ? undefined : message.displayName; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; obj.delete_time = message.deleteTime ? Timestamp.toAmino(toTimestamp(message.deleteTime)) : undefined; - obj.etag = message.etag; - obj.location = message.location; + obj.etag = message.etag === "" ? undefined : message.etag; + obj.location = message.location === "" ? undefined : message.location; return obj; }, fromProtoMsg(message: AttributeContext_ResourceProtoMsg, useInterfaces: boolean = true): AttributeContext_Resource { diff --git a/__fixtures__/v-next/outputv3/google/rpc/error_details.ts b/__fixtures__/v-next/outputv3/google/rpc/error_details.ts index b92898d157..df632dc1b7 100644 --- a/__fixtures__/v-next/outputv3/google/rpc/error_details.ts +++ b/__fixtures__/v-next/outputv3/google/rpc/error_details.ts @@ -888,9 +888,9 @@ export const DebugInfo = { if (message.stackEntries) { obj.stack_entries = message.stackEntries.map(e => e); } else { - obj.stack_entries = []; + obj.stack_entries = message.stackEntries; } - obj.detail = message.detail; + obj.detail = message.detail === "" ? undefined : message.detail; return obj; }, fromProtoMsg(message: DebugInfoProtoMsg, useInterfaces: boolean = true): DebugInfo { @@ -979,7 +979,7 @@ export const QuotaFailure = { if (message.violations) { obj.violations = message.violations.map(e => e ? QuotaFailure_Violation.toAmino(e, useInterfaces) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -1075,8 +1075,8 @@ export const QuotaFailure_Violation = { }, toAmino(message: QuotaFailure_Violation, useInterfaces: boolean = true): QuotaFailure_ViolationAmino { const obj: any = {}; - obj.subject = message.subject; - obj.description = message.description; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromProtoMsg(message: QuotaFailure_ViolationProtoMsg, useInterfaces: boolean = true): QuotaFailure_Violation { @@ -1170,8 +1170,8 @@ export const ErrorInfo_MetadataEntry = { }, toAmino(message: ErrorInfo_MetadataEntry, useInterfaces: boolean = true): ErrorInfo_MetadataEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: ErrorInfo_MetadataEntryProtoMsg, useInterfaces: boolean = true): ErrorInfo_MetadataEntry { @@ -1313,8 +1313,8 @@ export const ErrorInfo = { }, toAmino(message: ErrorInfo, useInterfaces: boolean = true): ErrorInfoAmino { const obj: any = {}; - obj.reason = message.reason; - obj.domain = message.domain; + obj.reason = message.reason === "" ? undefined : message.reason; + obj.domain = message.domain === "" ? undefined : message.domain; obj.metadata = {}; if (message.metadata) { Object.entries(message.metadata).forEach(([k, v]) => { @@ -1409,7 +1409,7 @@ export const PreconditionFailure = { if (message.violations) { obj.violations = message.violations.map(e => e ? PreconditionFailure_Violation.toAmino(e, useInterfaces) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -1520,9 +1520,9 @@ export const PreconditionFailure_Violation = { }, toAmino(message: PreconditionFailure_Violation, useInterfaces: boolean = true): PreconditionFailure_ViolationAmino { const obj: any = {}; - obj.type = message.type; - obj.subject = message.subject; - obj.description = message.description; + obj.type = message.type === "" ? undefined : message.type; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromProtoMsg(message: PreconditionFailure_ViolationProtoMsg, useInterfaces: boolean = true): PreconditionFailure_Violation { @@ -1611,7 +1611,7 @@ export const BadRequest = { if (message.fieldViolations) { obj.field_violations = message.fieldViolations.map(e => e ? BadRequest_FieldViolation.toAmino(e, useInterfaces) : undefined); } else { - obj.field_violations = []; + obj.field_violations = message.fieldViolations; } return obj; }, @@ -1707,8 +1707,8 @@ export const BadRequest_FieldViolation = { }, toAmino(message: BadRequest_FieldViolation, useInterfaces: boolean = true): BadRequest_FieldViolationAmino { const obj: any = {}; - obj.field = message.field; - obj.description = message.description; + obj.field = message.field === "" ? undefined : message.field; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromProtoMsg(message: BadRequest_FieldViolationProtoMsg, useInterfaces: boolean = true): BadRequest_FieldViolation { @@ -1803,8 +1803,8 @@ export const RequestInfo = { }, toAmino(message: RequestInfo, useInterfaces: boolean = true): RequestInfoAmino { const obj: any = {}; - obj.request_id = message.requestId; - obj.serving_data = message.servingData; + obj.request_id = message.requestId === "" ? undefined : message.requestId; + obj.serving_data = message.servingData === "" ? undefined : message.servingData; return obj; }, fromProtoMsg(message: RequestInfoProtoMsg, useInterfaces: boolean = true): RequestInfo { @@ -1929,10 +1929,10 @@ export const ResourceInfo = { }, toAmino(message: ResourceInfo, useInterfaces: boolean = true): ResourceInfoAmino { const obj: any = {}; - obj.resource_type = message.resourceType; - obj.resource_name = message.resourceName; - obj.owner = message.owner; - obj.description = message.description; + obj.resource_type = message.resourceType === "" ? undefined : message.resourceType; + obj.resource_name = message.resourceName === "" ? undefined : message.resourceName; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromProtoMsg(message: ResourceInfoProtoMsg, useInterfaces: boolean = true): ResourceInfo { @@ -2021,7 +2021,7 @@ export const Help = { if (message.links) { obj.links = message.links.map(e => e ? Help_Link.toAmino(e, useInterfaces) : undefined); } else { - obj.links = []; + obj.links = message.links; } return obj; }, @@ -2117,8 +2117,8 @@ export const Help_Link = { }, toAmino(message: Help_Link, useInterfaces: boolean = true): Help_LinkAmino { const obj: any = {}; - obj.description = message.description; - obj.url = message.url; + obj.description = message.description === "" ? undefined : message.description; + obj.url = message.url === "" ? undefined : message.url; return obj; }, fromProtoMsg(message: Help_LinkProtoMsg, useInterfaces: boolean = true): Help_Link { @@ -2213,8 +2213,8 @@ export const LocalizedMessage = { }, toAmino(message: LocalizedMessage, useInterfaces: boolean = true): LocalizedMessageAmino { const obj: any = {}; - obj.locale = message.locale; - obj.message = message.message; + obj.locale = message.locale === "" ? undefined : message.locale; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromProtoMsg(message: LocalizedMessageProtoMsg, useInterfaces: boolean = true): LocalizedMessage { diff --git a/__fixtures__/v-next/outputv3/google/rpc/status.ts b/__fixtures__/v-next/outputv3/google/rpc/status.ts index aafa679e61..009a54655e 100644 --- a/__fixtures__/v-next/outputv3/google/rpc/status.ts +++ b/__fixtures__/v-next/outputv3/google/rpc/status.ts @@ -168,12 +168,12 @@ export const Status = { }, toAmino(message: Status, useInterfaces: boolean = true): StatusAmino { const obj: any = {}; - obj.code = message.code; - obj.message = message.message; + obj.code = message.code === 0 ? undefined : message.code; + obj.message = message.message === "" ? undefined : message.message; if (message.details) { obj.details = message.details.map(e => e ? Any.toAmino(e, useInterfaces) : undefined); } else { - obj.details = []; + obj.details = message.details; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/helpers.ts b/__fixtures__/v-next/outputv3/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/v-next/outputv3/helpers.ts +++ b/__fixtures__/v-next/outputv3/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/genesis.ts b/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/genesis.ts index 9a57055c5e..da8d3b71ed 100644 --- a/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/genesis.ts @@ -127,11 +127,11 @@ export const GenesisState = { }, toAmino(message: GenesisState, useInterfaces: boolean = true): GenesisStateAmino { const obj: any = {}; - obj.port_id = message.portId; + obj.port_id = message.portId === "" ? undefined : message.portId; if (message.denomTraces) { obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e, useInterfaces) : undefined); } else { - obj.denom_traces = []; + obj.denom_traces = message.denomTraces; } obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/query.ts b/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/query.ts index ea1351ae25..562d9eb164 100644 --- a/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/query.ts +++ b/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/query.ts @@ -209,7 +209,7 @@ export const QueryDenomTraceRequest = { }, toAmino(message: QueryDenomTraceRequest, useInterfaces: boolean = true): QueryDenomTraceRequestAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === "" ? undefined : message.hash; return obj; }, fromProtoMsg(message: QueryDenomTraceRequestProtoMsg, useInterfaces: boolean = true): QueryDenomTraceRequest { @@ -482,7 +482,7 @@ export const QueryDenomTracesResponse = { if (message.denomTraces) { obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e, useInterfaces) : undefined); } else { - obj.denom_traces = []; + obj.denom_traces = message.denomTraces; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/transfer.ts b/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/transfer.ts index 71e4f6c769..6fac066c6f 100644 --- a/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/transfer.ts +++ b/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/transfer.ts @@ -169,8 +169,8 @@ export const DenomTrace = { }, toAmino(message: DenomTrace, useInterfaces: boolean = true): DenomTraceAmino { const obj: any = {}; - obj.path = message.path; - obj.base_denom = message.baseDenom; + obj.path = message.path === "" ? undefined : message.path; + obj.base_denom = message.baseDenom === "" ? undefined : message.baseDenom; return obj; }, fromProtoMsg(message: DenomTraceProtoMsg, useInterfaces: boolean = true): DenomTrace { @@ -266,8 +266,8 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.send_enabled = message.sendEnabled; - obj.receive_enabled = message.receiveEnabled; + obj.send_enabled = message.sendEnabled === false ? undefined : message.sendEnabled; + obj.receive_enabled = message.receiveEnabled === false ? undefined : message.receiveEnabled; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/tx.ts b/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/tx.ts index c1e26ab7a0..36601ec59e 100644 --- a/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/tx.ts +++ b/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/tx.ts @@ -246,13 +246,13 @@ export const MsgTransfer = { }, toAmino(message: MsgTransfer, useInterfaces: boolean = true): MsgTransferAmino { const obj: any = {}; - obj.source_port = message.sourcePort; - obj.source_channel = message.sourceChannel; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; obj.token = message.token ? Coin.toAmino(message.token, useInterfaces) : undefined; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight, useInterfaces) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromProtoMsg(message: MsgTransferProtoMsg, useInterfaces: boolean = true): MsgTransfer { diff --git a/__fixtures__/v-next/outputv3/ibc/applications/transfer/v2/packet.ts b/__fixtures__/v-next/outputv3/ibc/applications/transfer/v2/packet.ts index c80bf752fa..1a1131d33c 100644 --- a/__fixtures__/v-next/outputv3/ibc/applications/transfer/v2/packet.ts +++ b/__fixtures__/v-next/outputv3/ibc/applications/transfer/v2/packet.ts @@ -156,10 +156,10 @@ export const FungibleTokenPacketData = { }, toAmino(message: FungibleTokenPacketData, useInterfaces: boolean = true): FungibleTokenPacketDataAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromProtoMsg(message: FungibleTokenPacketDataProtoMsg, useInterfaces: boolean = true): FungibleTokenPacketData { diff --git a/__fixtures__/v-next/outputv3/ibc/core/channel/v1/channel.ts b/__fixtures__/v-next/outputv3/ibc/core/channel/v1/channel.ts index 16b4d8f917..2bb12547b1 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/channel/v1/channel.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/channel/v1/channel.ts @@ -523,10 +523,10 @@ export const Channel = { fromAmino(object: ChannelAmino): Channel { const message = createBaseChannel(); if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -539,15 +539,15 @@ export const Channel = { }, toAmino(message: Channel, useInterfaces: boolean = true): ChannelAmino { const obj: any = {}; - obj.state = message.state; - obj.ordering = message.ordering; + obj.state = message.state === 0 ? undefined : message.state; + obj.ordering = message.ordering === 0 ? undefined : message.ordering; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty, useInterfaces) : undefined; if (message.connectionHops) { obj.connection_hops = message.connectionHops.map(e => e); } else { - obj.connection_hops = []; + obj.connection_hops = message.connectionHops; } - obj.version = message.version; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromProtoMsg(message: ChannelProtoMsg, useInterfaces: boolean = true): Channel { @@ -704,10 +704,10 @@ export const IdentifiedChannel = { fromAmino(object: IdentifiedChannelAmino): IdentifiedChannel { const message = createBaseIdentifiedChannel(); if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -726,17 +726,17 @@ export const IdentifiedChannel = { }, toAmino(message: IdentifiedChannel, useInterfaces: boolean = true): IdentifiedChannelAmino { const obj: any = {}; - obj.state = message.state; - obj.ordering = message.ordering; + obj.state = message.state === 0 ? undefined : message.state; + obj.ordering = message.ordering === 0 ? undefined : message.ordering; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty, useInterfaces) : undefined; if (message.connectionHops) { obj.connection_hops = message.connectionHops.map(e => e); } else { - obj.connection_hops = []; + obj.connection_hops = message.connectionHops; } - obj.version = message.version; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.version = message.version === "" ? undefined : message.version; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromProtoMsg(message: IdentifiedChannelProtoMsg, useInterfaces: boolean = true): IdentifiedChannel { @@ -832,8 +832,8 @@ export const Counterparty = { }, toAmino(message: Counterparty, useInterfaces: boolean = true): CounterpartyAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromProtoMsg(message: CounterpartyProtoMsg, useInterfaces: boolean = true): Counterparty { @@ -1025,14 +1025,14 @@ export const Packet = { }, toAmino(message: Packet, useInterfaces: boolean = true): 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; + obj.destination_port = message.destinationPort === "" ? undefined : message.destinationPort; + obj.destination_channel = message.destinationChannel === "" ? undefined : message.destinationChannel; obj.data = message.data ? base64FromBytes(message.data) : undefined; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight, useInterfaces) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromProtoMsg(message: PacketProtoMsg, useInterfaces: boolean = true): Packet { @@ -1160,9 +1160,9 @@ export const PacketState = { }, toAmino(message: PacketState, useInterfaces: boolean = true): PacketStateAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1260,7 +1260,7 @@ export const Acknowledgement = { toAmino(message: Acknowledgement, useInterfaces: boolean = true): AcknowledgementAmino { const obj: any = {}; obj.result = message.result ? base64FromBytes(message.result) : undefined; - obj.error = message.error; + obj.error = message.error === null ? undefined : message.error; return obj; }, fromProtoMsg(message: AcknowledgementProtoMsg, useInterfaces: boolean = true): Acknowledgement { diff --git a/__fixtures__/v-next/outputv3/ibc/core/channel/v1/genesis.ts b/__fixtures__/v-next/outputv3/ibc/core/channel/v1/genesis.ts index d3cbfc92a1..e6723ebcfe 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/channel/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/channel/v1/genesis.ts @@ -289,39 +289,39 @@ export const GenesisState = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e, useInterfaces) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } if (message.acknowledgements) { obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e, useInterfaces) : undefined); } else { - obj.acknowledgements = []; + obj.acknowledgements = message.acknowledgements; } if (message.commitments) { obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e, useInterfaces) : undefined); } else { - obj.commitments = []; + obj.commitments = message.commitments; } if (message.receipts) { obj.receipts = message.receipts.map(e => e ? PacketState.toAmino(e, useInterfaces) : undefined); } else { - obj.receipts = []; + obj.receipts = message.receipts; } if (message.sendSequences) { obj.send_sequences = message.sendSequences.map(e => e ? PacketSequence.toAmino(e, useInterfaces) : undefined); } else { - obj.send_sequences = []; + obj.send_sequences = message.sendSequences; } if (message.recvSequences) { obj.recv_sequences = message.recvSequences.map(e => e ? PacketSequence.toAmino(e, useInterfaces) : undefined); } else { - obj.recv_sequences = []; + obj.recv_sequences = message.recvSequences; } if (message.ackSequences) { obj.ack_sequences = message.ackSequences.map(e => e ? PacketSequence.toAmino(e, useInterfaces) : undefined); } else { - obj.ack_sequences = []; + obj.ack_sequences = message.ackSequences; } - obj.next_channel_sequence = message.nextChannelSequence ? message.nextChannelSequence.toString() : undefined; + obj.next_channel_sequence = message.nextChannelSequence !== BigInt(0) ? message.nextChannelSequence.toString() : undefined; return obj; }, fromProtoMsg(message: GenesisStateProtoMsg, useInterfaces: boolean = true): GenesisState { @@ -434,9 +434,9 @@ export const PacketSequence = { }, toAmino(message: PacketSequence, useInterfaces: boolean = true): PacketSequenceAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromProtoMsg(message: PacketSequenceProtoMsg, useInterfaces: boolean = true): PacketSequence { diff --git a/__fixtures__/v-next/outputv3/ibc/core/channel/v1/query.ts b/__fixtures__/v-next/outputv3/ibc/core/channel/v1/query.ts index 91adb7cb9f..4b5e3f60e0 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/channel/v1/query.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/channel/v1/query.ts @@ -1003,8 +1003,8 @@ export const QueryChannelRequest = { }, toAmino(message: QueryChannelRequest, useInterfaces: boolean = true): QueryChannelRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromProtoMsg(message: QueryChannelRequestProtoMsg, useInterfaces: boolean = true): QueryChannelRequest { @@ -1328,7 +1328,7 @@ export const QueryChannelsResponse = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e, useInterfaces) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; obj.height = message.height ? Height.toAmino(message.height, useInterfaces) : {}; @@ -1429,7 +1429,7 @@ export const QueryConnectionChannelsRequest = { }, toAmino(message: QueryConnectionChannelsRequest, useInterfaces: boolean = true): QueryConnectionChannelsRequestAmino { const obj: any = {}; - obj.connection = message.connection; + obj.connection = message.connection === "" ? undefined : message.connection; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1554,7 +1554,7 @@ export const QueryConnectionChannelsResponse = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e, useInterfaces) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; obj.height = message.height ? Height.toAmino(message.height, useInterfaces) : {}; @@ -1653,8 +1653,8 @@ export const QueryChannelClientStateRequest = { }, toAmino(message: QueryChannelClientStateRequest, useInterfaces: boolean = true): QueryChannelClientStateRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromProtoMsg(message: QueryChannelClientStateRequestProtoMsg, useInterfaces: boolean = true): QueryChannelClientStateRequest { @@ -1901,10 +1901,10 @@ export const QueryChannelConsensusStateRequest = { }, toAmino(message: QueryChannelConsensusStateRequest, useInterfaces: boolean = true): 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromProtoMsg(message: QueryChannelConsensusStateRequestProtoMsg, useInterfaces: boolean = true): QueryChannelConsensusStateRequest { @@ -2035,7 +2035,7 @@ export const QueryChannelConsensusStateResponse = { toAmino(message: QueryChannelConsensusStateResponse, useInterfaces: boolean = true): QueryChannelConsensusStateResponseAmino { const obj: any = {}; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState, useInterfaces) : undefined; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; return obj; @@ -2150,9 +2150,9 @@ export const QueryPacketCommitmentRequest = { }, toAmino(message: QueryPacketCommitmentRequest, useInterfaces: boolean = true): QueryPacketCommitmentRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromProtoMsg(message: QueryPacketCommitmentRequestProtoMsg, useInterfaces: boolean = true): QueryPacketCommitmentRequest { @@ -2380,8 +2380,8 @@ export const QueryPacketCommitmentsRequest = { }, toAmino(message: QueryPacketCommitmentsRequest, useInterfaces: boolean = true): QueryPacketCommitmentsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -2506,7 +2506,7 @@ export const QueryPacketCommitmentsResponse = { if (message.commitments) { obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e, useInterfaces) : undefined); } else { - obj.commitments = []; + obj.commitments = message.commitments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; obj.height = message.height ? Height.toAmino(message.height, useInterfaces) : {}; @@ -2622,9 +2622,9 @@ export const QueryPacketReceiptRequest = { }, toAmino(message: QueryPacketReceiptRequest, useInterfaces: boolean = true): QueryPacketReceiptRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromProtoMsg(message: QueryPacketReceiptRequestProtoMsg, useInterfaces: boolean = true): QueryPacketReceiptRequest { @@ -2737,7 +2737,7 @@ export const QueryPacketReceiptResponse = { }, toAmino(message: QueryPacketReceiptResponse, useInterfaces: boolean = true): QueryPacketReceiptResponseAmino { const obj: any = {}; - obj.received = message.received; + obj.received = message.received === false ? undefined : message.received; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; return obj; @@ -2852,9 +2852,9 @@ export const QueryPacketAcknowledgementRequest = { }, toAmino(message: QueryPacketAcknowledgementRequest, useInterfaces: boolean = true): QueryPacketAcknowledgementRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromProtoMsg(message: QueryPacketAcknowledgementRequestProtoMsg, useInterfaces: boolean = true): QueryPacketAcknowledgementRequest { @@ -3112,13 +3112,13 @@ export const QueryPacketAcknowledgementsRequest = { }, toAmino(message: QueryPacketAcknowledgementsRequest, useInterfaces: boolean = true): QueryPacketAcknowledgementsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; if (message.packetCommitmentSequences) { obj.packet_commitment_sequences = message.packetCommitmentSequences.map(e => e.toString()); } else { - obj.packet_commitment_sequences = []; + obj.packet_commitment_sequences = message.packetCommitmentSequences; } return obj; }, @@ -3243,7 +3243,7 @@ export const QueryPacketAcknowledgementsResponse = { if (message.acknowledgements) { obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e, useInterfaces) : undefined); } else { - obj.acknowledgements = []; + obj.acknowledgements = message.acknowledgements; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; obj.height = message.height ? Height.toAmino(message.height, useInterfaces) : {}; @@ -3372,12 +3372,12 @@ export const QueryUnreceivedPacketsRequest = { }, toAmino(message: QueryUnreceivedPacketsRequest, useInterfaces: boolean = true): QueryUnreceivedPacketsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; if (message.packetCommitmentSequences) { obj.packet_commitment_sequences = message.packetCommitmentSequences.map(e => e.toString()); } else { - obj.packet_commitment_sequences = []; + obj.packet_commitment_sequences = message.packetCommitmentSequences; } return obj; }, @@ -3494,7 +3494,7 @@ export const QueryUnreceivedPacketsResponse = { if (message.sequences) { obj.sequences = message.sequences.map(e => e.toString()); } else { - obj.sequences = []; + obj.sequences = message.sequences; } obj.height = message.height ? Height.toAmino(message.height, useInterfaces) : {}; return obj; @@ -3622,12 +3622,12 @@ export const QueryUnreceivedAcksRequest = { }, toAmino(message: QueryUnreceivedAcksRequest, useInterfaces: boolean = true): QueryUnreceivedAcksRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; if (message.packetAckSequences) { obj.packet_ack_sequences = message.packetAckSequences.map(e => e.toString()); } else { - obj.packet_ack_sequences = []; + obj.packet_ack_sequences = message.packetAckSequences; } return obj; }, @@ -3744,7 +3744,7 @@ export const QueryUnreceivedAcksResponse = { if (message.sequences) { obj.sequences = message.sequences.map(e => e.toString()); } else { - obj.sequences = []; + obj.sequences = message.sequences; } obj.height = message.height ? Height.toAmino(message.height, useInterfaces) : {}; return obj; @@ -3842,8 +3842,8 @@ export const QueryNextSequenceReceiveRequest = { }, toAmino(message: QueryNextSequenceReceiveRequest, useInterfaces: boolean = true): QueryNextSequenceReceiveRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromProtoMsg(message: QueryNextSequenceReceiveRequestProtoMsg, useInterfaces: boolean = true): QueryNextSequenceReceiveRequest { @@ -3958,7 +3958,7 @@ export const QueryNextSequenceReceiveResponse = { }, toAmino(message: QueryNextSequenceReceiveResponse, useInterfaces: boolean = true): QueryNextSequenceReceiveResponseAmino { const obj: any = {}; - obj.next_sequence_receive = message.nextSequenceReceive ? message.nextSequenceReceive.toString() : undefined; + obj.next_sequence_receive = message.nextSequenceReceive !== BigInt(0) ? message.nextSequenceReceive.toString() : undefined; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; return obj; diff --git a/__fixtures__/v-next/outputv3/ibc/core/channel/v1/tx.ts b/__fixtures__/v-next/outputv3/ibc/core/channel/v1/tx.ts index 0f15e822b2..f2e8093c68 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/channel/v1/tx.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/channel/v1/tx.ts @@ -560,9 +560,9 @@ export const MsgChannelOpenInit = { }, toAmino(message: MsgChannelOpenInit, useInterfaces: boolean = true): MsgChannelOpenInitAmino { const obj: any = {}; - obj.port_id = message.portId; + obj.port_id = message.portId === "" ? undefined : message.portId; obj.channel = message.channel ? Channel.toAmino(message.channel, useInterfaces) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgChannelOpenInitProtoMsg, useInterfaces: boolean = true): MsgChannelOpenInit { @@ -800,13 +800,13 @@ export const MsgChannelOpenTry = { }, toAmino(message: MsgChannelOpenTry, useInterfaces: boolean = true): MsgChannelOpenTryAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.previous_channel_id = message.previousChannelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.previous_channel_id = message.previousChannelId === "" ? undefined : message.previousChannelId; obj.channel = message.channel ? Channel.toAmino(message.channel, useInterfaces) : undefined; - obj.counterparty_version = message.counterpartyVersion; + obj.counterparty_version = message.counterpartyVersion === "" ? undefined : message.counterpartyVersion; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgChannelOpenTryProtoMsg, useInterfaces: boolean = true): MsgChannelOpenTry { @@ -1042,13 +1042,13 @@ export const MsgChannelOpenAck = { }, toAmino(message: MsgChannelOpenAck, useInterfaces: boolean = true): 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.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.counterparty_channel_id = message.counterpartyChannelId === "" ? undefined : message.counterpartyChannelId; + obj.counterparty_version = message.counterpartyVersion === "" ? undefined : message.counterpartyVersion; obj.proof_try = message.proofTry ? base64FromBytes(message.proofTry) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgChannelOpenAckProtoMsg, useInterfaces: boolean = true): MsgChannelOpenAck { @@ -1254,11 +1254,11 @@ export const MsgChannelOpenConfirm = { }, toAmino(message: MsgChannelOpenConfirm, useInterfaces: boolean = true): MsgChannelOpenConfirmAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.proof_ack = message.proofAck ? base64FromBytes(message.proofAck) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgChannelOpenConfirmProtoMsg, useInterfaces: boolean = true): MsgChannelOpenConfirm { @@ -1432,9 +1432,9 @@ export const MsgChannelCloseInit = { }, toAmino(message: MsgChannelCloseInit, useInterfaces: boolean = true): MsgChannelCloseInitAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; - obj.signer = message.signer; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgChannelCloseInitProtoMsg, useInterfaces: boolean = true): MsgChannelCloseInit { @@ -1640,11 +1640,11 @@ export const MsgChannelCloseConfirm = { }, toAmino(message: MsgChannelCloseConfirm, useInterfaces: boolean = true): MsgChannelCloseConfirmAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgChannelCloseConfirmProtoMsg, useInterfaces: boolean = true): MsgChannelCloseConfirm { @@ -1840,7 +1840,7 @@ export const MsgRecvPacket = { obj.packet = message.packet ? Packet.toAmino(message.packet, useInterfaces) : undefined; obj.proof_commitment = message.proofCommitment ? base64FromBytes(message.proofCommitment) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgRecvPacketProtoMsg, useInterfaces: boolean = true): MsgRecvPacket { @@ -2053,8 +2053,8 @@ export const MsgTimeout = { obj.packet = message.packet ? Packet.toAmino(message.packet, useInterfaces) : undefined; obj.proof_unreceived = message.proofUnreceived ? base64FromBytes(message.proofUnreceived) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; - obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; - obj.signer = message.signer; + obj.next_sequence_recv = message.nextSequenceRecv !== BigInt(0) ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgTimeoutProtoMsg, useInterfaces: boolean = true): MsgTimeout { @@ -2283,8 +2283,8 @@ export const MsgTimeoutOnClose = { obj.proof_unreceived = message.proofUnreceived ? base64FromBytes(message.proofUnreceived) : undefined; obj.proof_close = message.proofClose ? base64FromBytes(message.proofClose) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; - obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; - obj.signer = message.signer; + obj.next_sequence_recv = message.nextSequenceRecv !== BigInt(0) ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgTimeoutOnCloseProtoMsg, useInterfaces: boolean = true): MsgTimeoutOnClose { @@ -2496,7 +2496,7 @@ export const MsgAcknowledgement = { obj.acknowledgement = message.acknowledgement ? base64FromBytes(message.acknowledgement) : undefined; obj.proof_acked = message.proofAcked ? base64FromBytes(message.proofAcked) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgAcknowledgementProtoMsg, useInterfaces: boolean = true): MsgAcknowledgement { diff --git a/__fixtures__/v-next/outputv3/ibc/core/client/v1/client.ts b/__fixtures__/v-next/outputv3/ibc/core/client/v1/client.ts index 0459278266..3a2feccbf3 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/client/v1/client.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/client/v1/client.ts @@ -363,7 +363,7 @@ export const IdentifiedClientState = { }, toAmino(message: IdentifiedClientState, useInterfaces: boolean = true): IdentifiedClientStateAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.client_state = message.clientState ? Any.toAmino(message.clientState, useInterfaces) : undefined; return obj; }, @@ -567,11 +567,11 @@ export const ClientConsensusStates = { }, toAmino(message: ClientConsensusStates, useInterfaces: boolean = true): ClientConsensusStatesAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.consensusStates) { obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e, useInterfaces) : undefined); } else { - obj.consensus_states = []; + obj.consensus_states = message.consensusStates; } return obj; }, @@ -699,10 +699,10 @@ export const ClientUpdateProposal = { }, toAmino(message: ClientUpdateProposal, useInterfaces: boolean = true): ClientUpdateProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.subject_client_id = message.subjectClientId; - obj.substitute_client_id = message.substituteClientId; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.subject_client_id = message.subjectClientId === "" ? undefined : message.subjectClientId; + obj.substitute_client_id = message.substituteClientId === "" ? undefined : message.substituteClientId; return obj; }, fromProtoMsg(message: ClientUpdateProposalProtoMsg, useInterfaces: boolean = true): ClientUpdateProposal { @@ -833,8 +833,8 @@ export const UpgradeProposal = { }, toAmino(message: UpgradeProposal, useInterfaces: boolean = true): UpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.plan = message.plan ? Plan.toAmino(message.plan, useInterfaces) : undefined; obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState, useInterfaces) : undefined; return obj; @@ -932,8 +932,8 @@ export const Height = { }, toAmino(message: Height, useInterfaces: boolean = true): HeightAmino { const obj: any = {}; - obj.revision_number = message.revisionNumber ? message.revisionNumber.toString() : undefined; - obj.revision_height = message.revisionHeight ? message.revisionHeight.toString() : undefined; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromProtoMsg(message: HeightProtoMsg, useInterfaces: boolean = true): Height { @@ -1023,7 +1023,7 @@ export const Params = { if (message.allowedClients) { obj.allowed_clients = message.allowedClients.map(e => e); } else { - obj.allowed_clients = []; + obj.allowed_clients = message.allowedClients; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/ibc/core/client/v1/genesis.ts b/__fixtures__/v-next/outputv3/ibc/core/client/v1/genesis.ts index 65be1b2bd2..8288d915ad 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/client/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/client/v1/genesis.ts @@ -268,21 +268,21 @@ export const GenesisState = { if (message.clients) { obj.clients = message.clients.map(e => e ? IdentifiedClientState.toAmino(e, useInterfaces) : undefined); } else { - obj.clients = []; + obj.clients = message.clients; } if (message.clientsConsensus) { obj.clients_consensus = message.clientsConsensus.map(e => e ? ClientConsensusStates.toAmino(e, useInterfaces) : undefined); } else { - obj.clients_consensus = []; + obj.clients_consensus = message.clientsConsensus; } if (message.clientsMetadata) { obj.clients_metadata = message.clientsMetadata.map(e => e ? IdentifiedGenesisMetadata.toAmino(e, useInterfaces) : undefined); } else { - obj.clients_metadata = []; + obj.clients_metadata = message.clientsMetadata; } obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : undefined; - obj.create_localhost = message.createLocalhost; - obj.next_client_sequence = message.nextClientSequence ? message.nextClientSequence.toString() : undefined; + obj.create_localhost = message.createLocalhost === false ? undefined : message.createLocalhost; + obj.next_client_sequence = message.nextClientSequence !== BigInt(0) ? message.nextClientSequence.toString() : undefined; return obj; }, fromProtoMsg(message: GenesisStateProtoMsg, useInterfaces: boolean = true): GenesisState { @@ -481,11 +481,11 @@ export const IdentifiedGenesisMetadata = { }, toAmino(message: IdentifiedGenesisMetadata, useInterfaces: boolean = true): IdentifiedGenesisMetadataAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.clientMetadata) { obj.client_metadata = message.clientMetadata.map(e => e ? GenesisMetadata.toAmino(e, useInterfaces) : undefined); } else { - obj.client_metadata = []; + obj.client_metadata = message.clientMetadata; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/ibc/core/client/v1/query.ts b/__fixtures__/v-next/outputv3/ibc/core/client/v1/query.ts index bce9ddb1c5..c838adac96 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/client/v1/query.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/client/v1/query.ts @@ -537,7 +537,7 @@ export const QueryClientStateRequest = { }, toAmino(message: QueryClientStateRequest, useInterfaces: boolean = true): QueryClientStateRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromProtoMsg(message: QueryClientStateRequestProtoMsg, useInterfaces: boolean = true): QueryClientStateRequest { @@ -844,7 +844,7 @@ export const QueryClientStatesResponse = { if (message.clientStates) { obj.client_states = message.clientStates.map(e => e ? IdentifiedClientState.toAmino(e, useInterfaces) : undefined); } else { - obj.client_states = []; + obj.client_states = message.clientStates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -976,10 +976,10 @@ export const QueryConsensusStateRequest = { }, toAmino(message: QueryConsensusStateRequest, useInterfaces: boolean = true): 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; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; + obj.latest_height = message.latestHeight === false ? undefined : message.latestHeight; return obj; }, fromProtoMsg(message: QueryConsensusStateRequestProtoMsg, useInterfaces: boolean = true): QueryConsensusStateRequest { @@ -1194,7 +1194,7 @@ export const QueryConsensusStatesRequest = { }, toAmino(message: QueryConsensusStatesRequest, useInterfaces: boolean = true): QueryConsensusStatesRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1302,7 +1302,7 @@ export const QueryConsensusStatesResponse = { if (message.consensusStates) { obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e, useInterfaces) : undefined); } else { - obj.consensus_states = []; + obj.consensus_states = message.consensusStates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1385,7 +1385,7 @@ export const QueryClientStatusRequest = { }, toAmino(message: QueryClientStatusRequest, useInterfaces: boolean = true): QueryClientStatusRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromProtoMsg(message: QueryClientStatusRequestProtoMsg, useInterfaces: boolean = true): QueryClientStatusRequest { @@ -1466,7 +1466,7 @@ export const QueryClientStatusResponse = { }, toAmino(message: QueryClientStatusResponse, useInterfaces: boolean = true): QueryClientStatusResponseAmino { const obj: any = {}; - obj.status = message.status; + obj.status = message.status === "" ? undefined : message.status; return obj; }, fromProtoMsg(message: QueryClientStatusResponseProtoMsg, useInterfaces: boolean = true): QueryClientStatusResponse { diff --git a/__fixtures__/v-next/outputv3/ibc/core/client/v1/tx.ts b/__fixtures__/v-next/outputv3/ibc/core/client/v1/tx.ts index 2dd4cb5fed..7c5f84c443 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/client/v1/tx.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/client/v1/tx.ts @@ -318,7 +318,7 @@ export const MsgCreateClient = { const obj: any = {}; obj.client_state = message.clientState ? Any.toAmino(message.clientState, useInterfaces) : undefined; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState, useInterfaces) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgCreateClientProtoMsg, useInterfaces: boolean = true): MsgCreateClient { @@ -494,9 +494,9 @@ export const MsgUpdateClient = { }, toAmino(message: MsgUpdateClient, useInterfaces: boolean = true): MsgUpdateClientAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.header = message.header ? Any.toAmino(message.header, useInterfaces) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgUpdateClientProtoMsg, useInterfaces: boolean = true): MsgUpdateClient { @@ -719,12 +719,12 @@ export const MsgUpgradeClient = { }, toAmino(message: MsgUpgradeClient, useInterfaces: boolean = true): MsgUpgradeClientAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.client_state = message.clientState ? Any.toAmino(message.clientState, useInterfaces) : undefined; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState, useInterfaces) : undefined; obj.proof_upgrade_client = message.proofUpgradeClient ? base64FromBytes(message.proofUpgradeClient) : undefined; obj.proof_upgrade_consensus_state = message.proofUpgradeConsensusState ? base64FromBytes(message.proofUpgradeConsensusState) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgUpgradeClientProtoMsg, useInterfaces: boolean = true): MsgUpgradeClient { @@ -900,9 +900,9 @@ export const MsgSubmitMisbehaviour = { }, toAmino(message: MsgSubmitMisbehaviour, useInterfaces: boolean = true): MsgSubmitMisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.misbehaviour = message.misbehaviour ? Any.toAmino(message.misbehaviour, useInterfaces) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgSubmitMisbehaviourProtoMsg, useInterfaces: boolean = true): MsgSubmitMisbehaviour { diff --git a/__fixtures__/v-next/outputv3/ibc/core/commitment/v1/commitment.ts b/__fixtures__/v-next/outputv3/ibc/core/commitment/v1/commitment.ts index efb4c63102..607fa9075e 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/commitment/v1/commitment.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/commitment/v1/commitment.ts @@ -353,7 +353,7 @@ export const MerklePath = { if (message.keyPath) { obj.key_path = message.keyPath.map(e => e); } else { - obj.key_path = []; + obj.key_path = message.keyPath; } return obj; }, @@ -444,7 +444,7 @@ export const MerkleProof = { if (message.proofs) { obj.proofs = message.proofs.map(e => e ? CommitmentProof.toAmino(e, useInterfaces) : undefined); } else { - obj.proofs = []; + obj.proofs = message.proofs; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/ibc/core/connection/v1/connection.ts b/__fixtures__/v-next/outputv3/ibc/core/connection/v1/connection.ts index 0797a8c22a..b1a2fb135f 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/connection/v1/connection.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/connection/v1/connection.ts @@ -444,7 +444,7 @@ export const ConnectionEnd = { } message.versions = object.versions?.map(e => Version.fromAmino(e)) || []; if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -456,15 +456,15 @@ export const ConnectionEnd = { }, toAmino(message: ConnectionEnd, useInterfaces: boolean = true): ConnectionEndAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.versions) { obj.versions = message.versions.map(e => e ? Version.toAmino(e, useInterfaces) : undefined); } else { - obj.versions = []; + obj.versions = message.versions; } - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty, useInterfaces) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; return obj; }, fromProtoMsg(message: ConnectionEndProtoMsg, useInterfaces: boolean = true): ConnectionEnd { @@ -618,7 +618,7 @@ export const IdentifiedConnection = { } message.versions = object.versions?.map(e => Version.fromAmino(e)) || []; if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -630,16 +630,16 @@ export const IdentifiedConnection = { }, toAmino(message: IdentifiedConnection, useInterfaces: boolean = true): IdentifiedConnectionAmino { const obj: any = {}; - obj.id = message.id; - obj.client_id = message.clientId; + obj.id = message.id === "" ? undefined : message.id; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.versions) { obj.versions = message.versions.map(e => e ? Version.toAmino(e, useInterfaces) : undefined); } else { - obj.versions = []; + obj.versions = message.versions; } - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty, useInterfaces) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; return obj; }, fromProtoMsg(message: IdentifiedConnectionProtoMsg, useInterfaces: boolean = true): IdentifiedConnection { @@ -752,8 +752,8 @@ export const Counterparty = { }, toAmino(message: Counterparty, useInterfaces: boolean = true): CounterpartyAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.connection_id = message.connectionId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.prefix = message.prefix ? MerklePrefix.toAmino(message.prefix, useInterfaces) : undefined; return obj; }, @@ -844,7 +844,7 @@ export const ClientPaths = { if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, @@ -947,11 +947,11 @@ export const ConnectionPaths = { }, toAmino(message: ConnectionPaths, useInterfaces: boolean = true): ConnectionPathsAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, @@ -1054,11 +1054,11 @@ export const Version = { }, toAmino(message: Version, useInterfaces: boolean = true): VersionAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; if (message.features) { obj.features = message.features.map(e => e); } else { - obj.features = []; + obj.features = message.features; } return obj; }, @@ -1142,7 +1142,7 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.max_expected_time_per_block = message.maxExpectedTimePerBlock ? message.maxExpectedTimePerBlock.toString() : undefined; + obj.max_expected_time_per_block = message.maxExpectedTimePerBlock !== BigInt(0) ? message.maxExpectedTimePerBlock.toString() : undefined; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/ibc/core/connection/v1/genesis.ts b/__fixtures__/v-next/outputv3/ibc/core/connection/v1/genesis.ts index 9c50e8075c..c506945b51 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/connection/v1/genesis.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/connection/v1/genesis.ts @@ -158,14 +158,14 @@ export const GenesisState = { if (message.connections) { obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e, useInterfaces) : undefined); } else { - obj.connections = []; + obj.connections = message.connections; } if (message.clientConnectionPaths) { obj.client_connection_paths = message.clientConnectionPaths.map(e => e ? ConnectionPaths.toAmino(e, useInterfaces) : undefined); } else { - obj.client_connection_paths = []; + obj.client_connection_paths = message.clientConnectionPaths; } - obj.next_connection_sequence = message.nextConnectionSequence ? message.nextConnectionSequence.toString() : undefined; + obj.next_connection_sequence = message.nextConnectionSequence !== BigInt(0) ? message.nextConnectionSequence.toString() : undefined; obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/ibc/core/connection/v1/query.ts b/__fixtures__/v-next/outputv3/ibc/core/connection/v1/query.ts index 8f6613ed30..272d158ef0 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/connection/v1/query.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/connection/v1/query.ts @@ -402,7 +402,7 @@ export const QueryConnectionRequest = { }, toAmino(message: QueryConnectionRequest, useInterfaces: boolean = true): QueryConnectionRequestAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromProtoMsg(message: QueryConnectionRequestProtoMsg, useInterfaces: boolean = true): QueryConnectionRequest { @@ -726,7 +726,7 @@ export const QueryConnectionsResponse = { if (message.connections) { obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e, useInterfaces) : undefined); } else { - obj.connections = []; + obj.connections = message.connections; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; obj.height = message.height ? Height.toAmino(message.height, useInterfaces) : {}; @@ -810,7 +810,7 @@ export const QueryClientConnectionsRequest = { }, toAmino(message: QueryClientConnectionsRequest, useInterfaces: boolean = true): QueryClientConnectionsRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromProtoMsg(message: QueryClientConnectionsRequestProtoMsg, useInterfaces: boolean = true): QueryClientConnectionsRequest { @@ -932,7 +932,7 @@ export const QueryClientConnectionsResponse = { if (message.connectionPaths) { obj.connection_paths = message.connectionPaths.map(e => e); } else { - obj.connection_paths = []; + obj.connection_paths = message.connectionPaths; } obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; @@ -1016,7 +1016,7 @@ export const QueryConnectionClientStateRequest = { }, toAmino(message: QueryConnectionClientStateRequest, useInterfaces: boolean = true): QueryConnectionClientStateRequestAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromProtoMsg(message: QueryConnectionClientStateRequestProtoMsg, useInterfaces: boolean = true): QueryConnectionClientStateRequest { @@ -1248,9 +1248,9 @@ export const QueryConnectionConsensusStateRequest = { }, toAmino(message: QueryConnectionConsensusStateRequest, useInterfaces: boolean = true): 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; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromProtoMsg(message: QueryConnectionConsensusStateRequestProtoMsg, useInterfaces: boolean = true): QueryConnectionConsensusStateRequest { @@ -1381,7 +1381,7 @@ export const QueryConnectionConsensusStateResponse = { toAmino(message: QueryConnectionConsensusStateResponse, useInterfaces: boolean = true): QueryConnectionConsensusStateResponseAmino { const obj: any = {}; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState, useInterfaces) : undefined; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; return obj; diff --git a/__fixtures__/v-next/outputv3/ibc/core/connection/v1/tx.ts b/__fixtures__/v-next/outputv3/ibc/core/connection/v1/tx.ts index f9a19fd99d..0601a121cc 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/connection/v1/tx.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/connection/v1/tx.ts @@ -408,11 +408,11 @@ export const MsgConnectionOpenInit = { }, toAmino(message: MsgConnectionOpenInit, useInterfaces: boolean = true): MsgConnectionOpenInitAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty, useInterfaces) : undefined; obj.version = message.version ? Version.toAmino(message.version, useInterfaces) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; - obj.signer = message.signer; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgConnectionOpenInitProtoMsg, useInterfaces: boolean = true): MsgConnectionOpenInit { @@ -737,22 +737,22 @@ export const MsgConnectionOpenTry = { }, toAmino(message: MsgConnectionOpenTry, useInterfaces: boolean = true): MsgConnectionOpenTryAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.previous_connection_id = message.previousConnectionId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.previous_connection_id = message.previousConnectionId === "" ? undefined : message.previousConnectionId; obj.client_state = message.clientState ? Any.toAmino(message.clientState, useInterfaces) : undefined; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty, useInterfaces) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; if (message.counterpartyVersions) { obj.counterparty_versions = message.counterpartyVersions.map(e => e ? Version.toAmino(e, useInterfaces) : undefined); } else { - obj.counterparty_versions = []; + obj.counterparty_versions = message.counterpartyVersions; } obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_client = message.proofClient ? base64FromBytes(message.proofClient) : undefined; obj.proof_consensus = message.proofConsensus ? base64FromBytes(message.proofConsensus) : undefined; obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight, useInterfaces) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgConnectionOpenTryProtoMsg, useInterfaces: boolean = true): MsgConnectionOpenTry { @@ -1039,8 +1039,8 @@ export const MsgConnectionOpenAck = { }, toAmino(message: MsgConnectionOpenAck, useInterfaces: boolean = true): MsgConnectionOpenAckAmino { const obj: any = {}; - obj.connection_id = message.connectionId; - obj.counterparty_connection_id = message.counterpartyConnectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.counterparty_connection_id = message.counterpartyConnectionId === "" ? undefined : message.counterpartyConnectionId; obj.version = message.version ? Version.toAmino(message.version, useInterfaces) : undefined; obj.client_state = message.clientState ? Any.toAmino(message.clientState, useInterfaces) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; @@ -1048,7 +1048,7 @@ export const MsgConnectionOpenAck = { obj.proof_client = message.proofClient ? base64FromBytes(message.proofClient) : undefined; obj.proof_consensus = message.proofConsensus ? base64FromBytes(message.proofConsensus) : undefined; obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight, useInterfaces) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgConnectionOpenAckProtoMsg, useInterfaces: boolean = true): MsgConnectionOpenAck { @@ -1239,10 +1239,10 @@ export const MsgConnectionOpenConfirm = { }, toAmino(message: MsgConnectionOpenConfirm, useInterfaces: boolean = true): MsgConnectionOpenConfirmAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.proof_ack = message.proofAck ? base64FromBytes(message.proofAck) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight, useInterfaces) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromProtoMsg(message: MsgConnectionOpenConfirmProtoMsg, useInterfaces: boolean = true): MsgConnectionOpenConfirm { diff --git a/__fixtures__/v-next/outputv3/ibc/core/port/v1/query.ts b/__fixtures__/v-next/outputv3/ibc/core/port/v1/query.ts index f0d4db4794..740be18fbb 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/port/v1/query.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/port/v1/query.ts @@ -178,7 +178,7 @@ export const QueryAppVersionRequest = { message.connectionId = object.connection_id; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -190,11 +190,11 @@ export const QueryAppVersionRequest = { }, toAmino(message: QueryAppVersionRequest, useInterfaces: boolean = true): QueryAppVersionRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.connection_id = message.connectionId; - obj.ordering = message.ordering; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.ordering = message.ordering === 0 ? undefined : message.ordering; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty, useInterfaces) : undefined; - obj.proposed_version = message.proposedVersion; + obj.proposed_version = message.proposedVersion === "" ? undefined : message.proposedVersion; return obj; }, fromProtoMsg(message: QueryAppVersionRequestProtoMsg, useInterfaces: boolean = true): QueryAppVersionRequest { @@ -290,8 +290,8 @@ export const QueryAppVersionResponse = { }, toAmino(message: QueryAppVersionResponse, useInterfaces: boolean = true): QueryAppVersionResponseAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.version = message.version; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromProtoMsg(message: QueryAppVersionResponseProtoMsg, useInterfaces: boolean = true): QueryAppVersionResponse { diff --git a/__fixtures__/v-next/outputv3/ibc/lightclients/localhost/v1/localhost.ts b/__fixtures__/v-next/outputv3/ibc/lightclients/localhost/v1/localhost.ts index 1120b8c804..5b235aec28 100644 --- a/__fixtures__/v-next/outputv3/ibc/lightclients/localhost/v1/localhost.ts +++ b/__fixtures__/v-next/outputv3/ibc/lightclients/localhost/v1/localhost.ts @@ -116,7 +116,7 @@ export const ClientState = { }, toAmino(message: ClientState, useInterfaces: boolean = true): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; obj.height = message.height ? Height.toAmino(message.height, useInterfaces) : {}; return obj; }, diff --git a/__fixtures__/v-next/outputv3/ibc/lightclients/solomachine/v1/solomachine.ts b/__fixtures__/v-next/outputv3/ibc/lightclients/solomachine/v1/solomachine.ts index b2cff52827..bc58c11336 100644 --- a/__fixtures__/v-next/outputv3/ibc/lightclients/solomachine/v1/solomachine.ts +++ b/__fixtures__/v-next/outputv3/ibc/lightclients/solomachine/v1/solomachine.ts @@ -699,10 +699,10 @@ export const ClientState = { }, toAmino(message: ClientState, useInterfaces: boolean = true): ClientStateAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.frozen_sequence = message.frozenSequence ? message.frozenSequence.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.frozen_sequence = message.frozenSequence !== BigInt(0) ? message.frozenSequence.toString() : undefined; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState, useInterfaces) : undefined; - obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal === false ? undefined : message.allowUpdateAfterProposal; return obj; }, fromProtoMsg(message: ClientStateProtoMsg, useInterfaces: boolean = true): ClientState { @@ -818,8 +818,8 @@ export const ConsensusState = { toAmino(message: ConsensusState, useInterfaces: boolean = true): ConsensusStateAmino { const obj: any = {}; obj.public_key = message.publicKey ? Any.toAmino(message.publicKey, useInterfaces) : undefined; - obj.diversifier = message.diversifier; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromProtoMsg(message: ConsensusStateProtoMsg, useInterfaces: boolean = true): ConsensusState { @@ -966,11 +966,11 @@ export const Header = { }, toAmino(message: Header, useInterfaces: boolean = true): HeaderAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey, useInterfaces) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromProtoMsg(message: HeaderProtoMsg, useInterfaces: boolean = true): Header { @@ -1102,8 +1102,8 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour, useInterfaces: boolean = true): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.signature_one = message.signatureOne ? SignatureAndData.toAmino(message.signatureOne, useInterfaces) : undefined; obj.signature_two = message.signatureTwo ? SignatureAndData.toAmino(message.signatureTwo, useInterfaces) : undefined; return obj; @@ -1221,7 +1221,7 @@ export const SignatureAndData = { message.signature = bytesFromBase64(object.signature); } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1234,9 +1234,9 @@ export const SignatureAndData = { toAmino(message: SignatureAndData, useInterfaces: boolean = true): SignatureAndDataAmino { const obj: any = {}; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; - obj.data_type = message.dataType; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromProtoMsg(message: SignatureAndDataProtoMsg, useInterfaces: boolean = true): SignatureAndData { @@ -1335,7 +1335,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData, useInterfaces: boolean = true): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromProtoMsg(message: TimestampedSignatureDataProtoMsg, useInterfaces: boolean = true): TimestampedSignatureData { @@ -1471,7 +1471,7 @@ export const SignBytes = { message.diversifier = object.diversifier; } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1480,10 +1480,10 @@ export const SignBytes = { }, toAmino(message: SignBytes, useInterfaces: boolean = true): 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1583,7 +1583,7 @@ export const HeaderData = { toAmino(message: HeaderData, useInterfaces: boolean = true): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey, useInterfaces) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromProtoMsg(message: HeaderDataProtoMsg, useInterfaces: boolean = true): HeaderData { @@ -2353,7 +2353,7 @@ export const NextSequenceRecvData = { toAmino(message: NextSequenceRecvData, useInterfaces: boolean = true): NextSequenceRecvDataAmino { const obj: any = {}; obj.path = message.path ? base64FromBytes(message.path) : undefined; - obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + obj.next_seq_recv = message.nextSeqRecv !== BigInt(0) ? message.nextSeqRecv.toString() : undefined; return obj; }, fromProtoMsg(message: NextSequenceRecvDataProtoMsg, useInterfaces: boolean = true): NextSequenceRecvData { diff --git a/__fixtures__/v-next/outputv3/ibc/lightclients/solomachine/v2/solomachine.ts b/__fixtures__/v-next/outputv3/ibc/lightclients/solomachine/v2/solomachine.ts index 18fe2cf836..22f0553f5b 100644 --- a/__fixtures__/v-next/outputv3/ibc/lightclients/solomachine/v2/solomachine.ts +++ b/__fixtures__/v-next/outputv3/ibc/lightclients/solomachine/v2/solomachine.ts @@ -697,10 +697,10 @@ export const ClientState = { }, toAmino(message: ClientState, useInterfaces: boolean = true): ClientStateAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.is_frozen = message.isFrozen; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.is_frozen = message.isFrozen === false ? undefined : message.isFrozen; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState, useInterfaces) : undefined; - obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal === false ? undefined : message.allowUpdateAfterProposal; return obj; }, fromProtoMsg(message: ClientStateProtoMsg, useInterfaces: boolean = true): ClientState { @@ -816,8 +816,8 @@ export const ConsensusState = { toAmino(message: ConsensusState, useInterfaces: boolean = true): ConsensusStateAmino { const obj: any = {}; obj.public_key = message.publicKey ? Any.toAmino(message.publicKey, useInterfaces) : undefined; - obj.diversifier = message.diversifier; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromProtoMsg(message: ConsensusStateProtoMsg, useInterfaces: boolean = true): ConsensusState { @@ -964,11 +964,11 @@ export const Header = { }, toAmino(message: Header, useInterfaces: boolean = true): HeaderAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey, useInterfaces) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromProtoMsg(message: HeaderProtoMsg, useInterfaces: boolean = true): Header { @@ -1100,8 +1100,8 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour, useInterfaces: boolean = true): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.signature_one = message.signatureOne ? SignatureAndData.toAmino(message.signatureOne, useInterfaces) : undefined; obj.signature_two = message.signatureTwo ? SignatureAndData.toAmino(message.signatureTwo, useInterfaces) : undefined; return obj; @@ -1219,7 +1219,7 @@ export const SignatureAndData = { message.signature = bytesFromBase64(object.signature); } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1232,9 +1232,9 @@ export const SignatureAndData = { toAmino(message: SignatureAndData, useInterfaces: boolean = true): SignatureAndDataAmino { const obj: any = {}; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; - obj.data_type = message.dataType; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromProtoMsg(message: SignatureAndDataProtoMsg, useInterfaces: boolean = true): SignatureAndData { @@ -1333,7 +1333,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData, useInterfaces: boolean = true): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromProtoMsg(message: TimestampedSignatureDataProtoMsg, useInterfaces: boolean = true): TimestampedSignatureData { @@ -1469,7 +1469,7 @@ export const SignBytes = { message.diversifier = object.diversifier; } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1478,10 +1478,10 @@ export const SignBytes = { }, toAmino(message: SignBytes, useInterfaces: boolean = true): 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1581,7 +1581,7 @@ export const HeaderData = { toAmino(message: HeaderData, useInterfaces: boolean = true): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey, useInterfaces) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromProtoMsg(message: HeaderDataProtoMsg, useInterfaces: boolean = true): HeaderData { @@ -2351,7 +2351,7 @@ export const NextSequenceRecvData = { toAmino(message: NextSequenceRecvData, useInterfaces: boolean = true): NextSequenceRecvDataAmino { const obj: any = {}; obj.path = message.path ? base64FromBytes(message.path) : undefined; - obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + obj.next_seq_recv = message.nextSeqRecv !== BigInt(0) ? message.nextSeqRecv.toString() : undefined; return obj; }, fromProtoMsg(message: NextSequenceRecvDataProtoMsg, useInterfaces: boolean = true): NextSequenceRecvData { diff --git a/__fixtures__/v-next/outputv3/ibc/lightclients/tendermint/v1/tendermint.ts b/__fixtures__/v-next/outputv3/ibc/lightclients/tendermint/v1/tendermint.ts index 67e81e1d44..bbe739e33b 100644 --- a/__fixtures__/v-next/outputv3/ibc/lightclients/tendermint/v1/tendermint.ts +++ b/__fixtures__/v-next/outputv3/ibc/lightclients/tendermint/v1/tendermint.ts @@ -509,7 +509,7 @@ export const ClientState = { }, toAmino(message: ClientState, useInterfaces: boolean = true): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; obj.trust_level = message.trustLevel ? Fraction.toAmino(message.trustLevel, useInterfaces) : undefined; obj.trusting_period = message.trustingPeriod ? Duration.toAmino(message.trustingPeriod, useInterfaces) : undefined; obj.unbonding_period = message.unbondingPeriod ? Duration.toAmino(message.unbondingPeriod, useInterfaces) : undefined; @@ -519,15 +519,15 @@ export const ClientState = { if (message.proofSpecs) { obj.proof_specs = message.proofSpecs.map(e => e ? ProofSpec.toAmino(e, useInterfaces) : undefined); } else { - obj.proof_specs = []; + obj.proof_specs = message.proofSpecs; } if (message.upgradePath) { obj.upgrade_path = message.upgradePath.map(e => e); } else { - obj.upgrade_path = []; + obj.upgrade_path = message.upgradePath; } - obj.allow_update_after_expiry = message.allowUpdateAfterExpiry; - obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour; + obj.allow_update_after_expiry = message.allowUpdateAfterExpiry === false ? undefined : message.allowUpdateAfterExpiry; + obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour === false ? undefined : message.allowUpdateAfterMisbehaviour; return obj; }, fromProtoMsg(message: ClientStateProtoMsg, useInterfaces: boolean = true): ClientState { @@ -757,7 +757,7 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour, useInterfaces: boolean = true): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.header_1 = message.header1 ? Header.toAmino(message.header1, useInterfaces) : undefined; obj.header_2 = message.header2 ? Header.toAmino(message.header2, useInterfaces) : undefined; return obj; @@ -996,8 +996,8 @@ export const Fraction = { }, toAmino(message: Fraction, useInterfaces: boolean = true): FractionAmino { const obj: any = {}; - obj.numerator = message.numerator ? message.numerator.toString() : undefined; - obj.denominator = message.denominator ? message.denominator.toString() : undefined; + obj.numerator = message.numerator !== BigInt(0) ? message.numerator.toString() : undefined; + obj.denominator = message.denominator !== BigInt(0) ? message.denominator.toString() : undefined; return obj; }, fromProtoMsg(message: FractionProtoMsg, useInterfaces: boolean = true): Fraction { diff --git a/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/claim.ts b/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/claim.ts index 056c226a1e..a66a9d7fe8 100644 --- a/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/claim.ts +++ b/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/claim.ts @@ -196,16 +196,16 @@ export const ClaimRecord = { }, toAmino(message: ClaimRecord, useInterfaces: boolean = true): ClaimRecordAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.initialClaimableAmount) { obj.initial_claimable_amount = message.initialClaimableAmount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.initial_claimable_amount = []; + obj.initial_claimable_amount = message.initialClaimableAmount; } if (message.actionCompleted) { obj.action_completed = message.actionCompleted.map(e => e); } else { - obj.action_completed = []; + obj.action_completed = message.actionCompleted; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/genesis.ts index 93fd764abd..b1514a49f7 100644 --- a/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/genesis.ts @@ -142,7 +142,7 @@ export const GenesisState = { if (message.claimRecords) { obj.claim_records = message.claimRecords.map(e => e ? ClaimRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.claim_records = []; + obj.claim_records = message.claimRecords; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/params.ts b/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/params.ts index 97809ce2b0..ab7ece9347 100644 --- a/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/params.ts @@ -147,7 +147,7 @@ export const Params = { obj.airdrop_start_time = message.airdropStartTime ? Timestamp.toAmino(toTimestamp(message.airdropStartTime)) : undefined; obj.duration_until_decay = message.durationUntilDecay ? Duration.toAmino(message.durationUntilDecay, useInterfaces) : undefined; obj.duration_of_decay = message.durationOfDecay ? Duration.toAmino(message.durationOfDecay, useInterfaces) : undefined; - obj.claim_denom = message.claimDenom; + obj.claim_denom = message.claimDenom === "" ? undefined : message.claimDenom; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/query.ts b/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/query.ts index c165f9342f..ecad52bf64 100644 --- a/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/query.ts @@ -278,7 +278,7 @@ export const QueryModuleAccountBalanceResponse = { if (message.moduleAccountBalance) { obj.moduleAccountBalance = message.moduleAccountBalance.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.moduleAccountBalance = []; + obj.moduleAccountBalance = message.moduleAccountBalance; } return obj; }, @@ -506,7 +506,7 @@ export const QueryClaimRecordRequest = { }, toAmino(message: QueryClaimRecordRequest, useInterfaces: boolean = true): QueryClaimRecordRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: QueryClaimRecordRequestProtoMsg, useInterfaces: boolean = true): QueryClaimRecordRequest { @@ -679,14 +679,14 @@ export const QueryClaimableForActionRequest = { message.address = object.address; } if (object.action !== undefined && object.action !== null) { - message.action = actionFromJSON(object.action); + message.action = object.action; } return message; }, toAmino(message: QueryClaimableForActionRequest, useInterfaces: boolean = true): QueryClaimableForActionRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.action = message.action; + obj.address = message.address === "" ? undefined : message.address; + obj.action = message.action === 0 ? undefined : message.action; return obj; }, fromProtoMsg(message: QueryClaimableForActionRequestProtoMsg, useInterfaces: boolean = true): QueryClaimableForActionRequest { @@ -776,7 +776,7 @@ export const QueryClaimableForActionResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -858,7 +858,7 @@ export const QueryTotalClaimableRequest = { }, toAmino(message: QueryTotalClaimableRequest, useInterfaces: boolean = true): QueryTotalClaimableRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: QueryTotalClaimableRequestProtoMsg, useInterfaces: boolean = true): QueryTotalClaimableRequest { @@ -948,7 +948,7 @@ export const QueryTotalClaimableResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/epochs/genesis.ts b/__fixtures__/v-next/outputv3/osmosis/epochs/genesis.ts index f41bbb00f3..0be5ac998d 100644 --- a/__fixtures__/v-next/outputv3/osmosis/epochs/genesis.ts +++ b/__fixtures__/v-next/outputv3/osmosis/epochs/genesis.ts @@ -313,13 +313,13 @@ export const EpochInfo = { }, toAmino(message: EpochInfo, useInterfaces: boolean = true): EpochInfoAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; obj.current_epoch_start_time = message.currentEpochStartTime ? Timestamp.toAmino(toTimestamp(message.currentEpochStartTime)) : undefined; - obj.epoch_counting_started = message.epochCountingStarted; - obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + obj.epoch_counting_started = message.epochCountingStarted === false ? undefined : message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight !== BigInt(0) ? message.currentEpochStartHeight.toString() : undefined; return obj; }, fromProtoMsg(message: EpochInfoProtoMsg, useInterfaces: boolean = true): EpochInfo { @@ -409,7 +409,7 @@ export const GenesisState = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/epochs/query.ts b/__fixtures__/v-next/outputv3/osmosis/epochs/query.ts index 478e7747fa..d0380c17e8 100644 --- a/__fixtures__/v-next/outputv3/osmosis/epochs/query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/epochs/query.ts @@ -185,7 +185,7 @@ export const QueryEpochsInfoResponse = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, @@ -267,7 +267,7 @@ export const QueryCurrentEpochRequest = { }, toAmino(message: QueryCurrentEpochRequest, useInterfaces: boolean = true): QueryCurrentEpochRequestAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; return obj; }, fromProtoMsg(message: QueryCurrentEpochRequestProtoMsg, useInterfaces: boolean = true): QueryCurrentEpochRequest { @@ -350,7 +350,7 @@ export const QueryCurrentEpochResponse = { }, toAmino(message: QueryCurrentEpochResponse, useInterfaces: boolean = true): QueryCurrentEpochResponseAmino { const obj: any = {}; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; return obj; }, fromProtoMsg(message: QueryCurrentEpochResponseProtoMsg, useInterfaces: boolean = true): QueryCurrentEpochResponse { diff --git a/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/balancer/balancerPool.ts b/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/balancer/balancerPool.ts index 456e447138..b05d3d5ce6 100644 --- a/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/balancer/balancerPool.ts +++ b/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/balancer/balancerPool.ts @@ -381,12 +381,12 @@ export const SmoothWeightChangeParams = { if (message.initialPoolWeights) { obj.initial_pool_weights = message.initialPoolWeights.map(e => e ? PoolAsset.toAmino(e, useInterfaces) : undefined); } else { - obj.initial_pool_weights = []; + obj.initial_pool_weights = message.initialPoolWeights; } if (message.targetPoolWeights) { obj.target_pool_weights = message.targetPoolWeights.map(e => e ? PoolAsset.toAmino(e, useInterfaces) : undefined); } else { - obj.target_pool_weights = []; + obj.target_pool_weights = message.targetPoolWeights; } return obj; }, @@ -500,8 +500,8 @@ export const PoolParams = { }, toAmino(message: PoolParams, useInterfaces: boolean = true): PoolParamsAmino { const obj: any = {}; - obj.swap_fee = message.swapFee; - obj.exit_fee = message.exitFee; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; + obj.exit_fee = message.exitFee === "" ? undefined : message.exitFee; obj.smooth_weight_change_params = message.smoothWeightChangeParams ? SmoothWeightChangeParams.toAmino(message.smoothWeightChangeParams, useInterfaces) : undefined; return obj; }, @@ -601,7 +601,7 @@ export const PoolAsset = { toAmino(message: PoolAsset, useInterfaces: boolean = true): PoolAssetAmino { const obj: any = {}; obj.token = message.token ? Coin.toAmino(message.token, useInterfaces) : undefined; - obj.weight = message.weight; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromProtoMsg(message: PoolAssetProtoMsg, useInterfaces: boolean = true): PoolAsset { @@ -785,17 +785,17 @@ export const Pool = { }, toAmino(message: Pool, useInterfaces: boolean = true): PoolAmino { const obj: any = {}; - obj.address = message.address; - obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams, useInterfaces) : undefined; - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; obj.total_shares = message.totalShares ? Coin.toAmino(message.totalShares, useInterfaces) : undefined; if (message.poolAssets) { obj.pool_assets = message.poolAssets.map(e => e ? PoolAsset.toAmino(e, useInterfaces) : undefined); } else { - obj.pool_assets = []; + obj.pool_assets = message.poolAssets; } - obj.total_weight = message.totalWeight; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; return obj; }, fromProtoMsg(message: PoolProtoMsg, useInterfaces: boolean = true): Pool { diff --git a/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/balancer/tx/tx.ts b/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/balancer/tx/tx.ts index 91da230b1d..d7d491de65 100644 --- a/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/balancer/tx/tx.ts +++ b/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/balancer/tx/tx.ts @@ -161,14 +161,14 @@ export const MsgCreateBalancerPool = { }, toAmino(message: MsgCreateBalancerPool, useInterfaces: boolean = true): MsgCreateBalancerPoolAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams, useInterfaces) : undefined; if (message.poolAssets) { obj.pool_assets = message.poolAssets.map(e => e ? PoolAsset.toAmino(e, useInterfaces) : undefined); } else { - obj.pool_assets = []; + obj.pool_assets = message.poolAssets; } - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; return obj; }, fromProtoMsg(message: MsgCreateBalancerPoolProtoMsg, useInterfaces: boolean = true): MsgCreateBalancerPool { @@ -251,7 +251,7 @@ export const MsgCreateBalancerPoolResponse = { }, toAmino(message: MsgCreateBalancerPoolResponse, useInterfaces: boolean = true): MsgCreateBalancerPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromProtoMsg(message: MsgCreateBalancerPoolResponseProtoMsg, useInterfaces: boolean = true): MsgCreateBalancerPoolResponse { diff --git a/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts b/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts index d05930eb79..fd10e57147 100644 --- a/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts +++ b/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts @@ -184,8 +184,8 @@ export const PoolParams = { }, toAmino(message: PoolParams, useInterfaces: boolean = true): PoolParamsAmino { const obj: any = {}; - obj.swap_fee = message.swapFee; - obj.exit_fee = message.exitFee; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; + obj.exit_fee = message.exitFee === "" ? undefined : message.exitFee; return obj; }, fromProtoMsg(message: PoolParamsProtoMsg, useInterfaces: boolean = true): PoolParams { @@ -399,22 +399,22 @@ export const Pool = { }, toAmino(message: Pool, useInterfaces: boolean = true): PoolAmino { const obj: any = {}; - obj.address = message.address; - obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams, useInterfaces) : undefined; - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; obj.total_shares = message.totalShares ? Coin.toAmino(message.totalShares, useInterfaces) : undefined; if (message.poolLiquidity) { obj.pool_liquidity = message.poolLiquidity.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.pool_liquidity = []; + obj.pool_liquidity = message.poolLiquidity; } if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } - obj.scaling_factor_controller = message.scalingFactorController; + obj.scaling_factor_controller = message.scalingFactorController === "" ? undefined : message.scalingFactorController; return obj; }, fromProtoMsg(message: PoolProtoMsg, useInterfaces: boolean = true): Pool { diff --git a/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/stableswap/tx.ts b/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/stableswap/tx.ts index e4dabc081e..f20ea6bacf 100644 --- a/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/stableswap/tx.ts +++ b/__fixtures__/v-next/outputv3/osmosis/gamm/pool-models/stableswap/tx.ts @@ -251,20 +251,20 @@ export const MsgCreateStableswapPool = { }, toAmino(message: MsgCreateStableswapPool, useInterfaces: boolean = true): MsgCreateStableswapPoolAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams, useInterfaces) : undefined; if (message.initialPoolLiquidity) { obj.initial_pool_liquidity = message.initialPoolLiquidity.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.initial_pool_liquidity = []; + obj.initial_pool_liquidity = message.initialPoolLiquidity; } if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } - obj.future_pool_governor = message.futurePoolGovernor; - obj.scaling_factor_controller = message.scalingFactorController; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; + obj.scaling_factor_controller = message.scalingFactorController === "" ? undefined : message.scalingFactorController; return obj; }, fromProtoMsg(message: MsgCreateStableswapPoolProtoMsg, useInterfaces: boolean = true): MsgCreateStableswapPool { @@ -347,7 +347,7 @@ export const MsgCreateStableswapPoolResponse = { }, toAmino(message: MsgCreateStableswapPoolResponse, useInterfaces: boolean = true): MsgCreateStableswapPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromProtoMsg(message: MsgCreateStableswapPoolResponseProtoMsg, useInterfaces: boolean = true): MsgCreateStableswapPoolResponse { @@ -475,12 +475,12 @@ export const MsgStableSwapAdjustScalingFactors = { }, toAmino(message: MsgStableSwapAdjustScalingFactors, useInterfaces: boolean = true): MsgStableSwapAdjustScalingFactorsAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/genesis.ts index d6b02e2c3d..c127633c4c 100644 --- a/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/genesis.ts @@ -126,7 +126,7 @@ export const Params = { if (message.poolCreationFee) { obj.pool_creation_fee = message.poolCreationFee.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.pool_creation_fee = []; + obj.pool_creation_fee = message.poolCreationFee; } return obj; }, @@ -251,9 +251,9 @@ export const GenesisState = { if (message.pools) { obj.pools = message.pools.map(e => e ? PoolI_ToAmino((e as Any), useInterfaces) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } - obj.next_pool_number = message.nextPoolNumber ? message.nextPoolNumber.toString() : undefined; + obj.next_pool_number = message.nextPoolNumber !== BigInt(0) ? message.nextPoolNumber.toString() : undefined; obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : undefined; return obj; }, @@ -282,7 +282,7 @@ export const PoolI_InterfaceDecoder = (input: BinaryReader | Uint8Array): Pool1 return data; } }; -export const PoolI_FromAmino = (content: AnyAmino) => { +export const PoolI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "osmosis/gamm/pool": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/query.ts b/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/query.ts index 51f36a034c..136ac8c911 100644 --- a/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/query.ts @@ -594,7 +594,7 @@ export const QueryPoolRequest = { }, toAmino(message: QueryPoolRequest, useInterfaces: boolean = true): QueryPoolRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryPoolRequestProtoMsg, useInterfaces: boolean = true): QueryPoolRequest { @@ -867,7 +867,7 @@ export const QueryPoolsResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? PoolI_ToAmino((e as Any), useInterfaces) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1015,7 +1015,7 @@ export const QueryNumPoolsResponse = { }, toAmino(message: QueryNumPoolsResponse, useInterfaces: boolean = true): QueryNumPoolsResponseAmino { const obj: any = {}; - obj.num_pools = message.numPools ? message.numPools.toString() : undefined; + obj.num_pools = message.numPools !== BigInt(0) ? message.numPools.toString() : undefined; return obj; }, fromProtoMsg(message: QueryNumPoolsResponseProtoMsg, useInterfaces: boolean = true): QueryNumPoolsResponse { @@ -1098,7 +1098,7 @@ export const QueryPoolTypeRequest = { }, toAmino(message: QueryPoolTypeRequest, useInterfaces: boolean = true): QueryPoolTypeRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryPoolTypeRequestProtoMsg, useInterfaces: boolean = true): QueryPoolTypeRequest { @@ -1179,7 +1179,7 @@ export const QueryPoolTypeResponse = { }, toAmino(message: QueryPoolTypeResponse, useInterfaces: boolean = true): QueryPoolTypeResponseAmino { const obj: any = {}; - obj.pool_type = message.poolType; + obj.pool_type = message.poolType === "" ? undefined : message.poolType; return obj; }, fromProtoMsg(message: QueryPoolTypeResponseProtoMsg, useInterfaces: boolean = true): QueryPoolTypeResponse { @@ -1283,11 +1283,11 @@ export const QueryCalcJoinPoolSharesRequest = { }, toAmino(message: QueryCalcJoinPoolSharesRequest, useInterfaces: boolean = true): QueryCalcJoinPoolSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.tokensIn) { obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.tokens_in = []; + obj.tokens_in = message.tokensIn; } return obj; }, @@ -1390,11 +1390,11 @@ export const QueryCalcJoinPoolSharesResponse = { }, toAmino(message: QueryCalcJoinPoolSharesResponse, useInterfaces: boolean = true): QueryCalcJoinPoolSharesResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } return obj; }, @@ -1493,8 +1493,8 @@ export const QueryCalcExitPoolCoinsFromSharesRequest = { }, toAmino(message: QueryCalcExitPoolCoinsFromSharesRequest, useInterfaces: boolean = true): QueryCalcExitPoolCoinsFromSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.share_in_amount = message.shareInAmount; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; return obj; }, fromProtoMsg(message: QueryCalcExitPoolCoinsFromSharesRequestProtoMsg, useInterfaces: boolean = true): QueryCalcExitPoolCoinsFromSharesRequest { @@ -1584,7 +1584,7 @@ export const QueryCalcExitPoolCoinsFromSharesResponse = { if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } return obj; }, @@ -1668,7 +1668,7 @@ export const QueryPoolParamsRequest = { }, toAmino(message: QueryPoolParamsRequest, useInterfaces: boolean = true): QueryPoolParamsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryPoolParamsRequestProtoMsg, useInterfaces: boolean = true): QueryPoolParamsRequest { @@ -1834,7 +1834,7 @@ export const QueryTotalPoolLiquidityRequest = { }, toAmino(message: QueryTotalPoolLiquidityRequest, useInterfaces: boolean = true): QueryTotalPoolLiquidityRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryTotalPoolLiquidityRequestProtoMsg, useInterfaces: boolean = true): QueryTotalPoolLiquidityRequest { @@ -1924,7 +1924,7 @@ export const QueryTotalPoolLiquidityResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, @@ -2008,7 +2008,7 @@ export const QueryTotalSharesRequest = { }, toAmino(message: QueryTotalSharesRequest, useInterfaces: boolean = true): QueryTotalSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryTotalSharesRequestProtoMsg, useInterfaces: boolean = true): QueryTotalSharesRequest { @@ -2195,11 +2195,11 @@ export const QueryCalcJoinPoolNoSwapSharesRequest = { }, toAmino(message: QueryCalcJoinPoolNoSwapSharesRequest, useInterfaces: boolean = true): QueryCalcJoinPoolNoSwapSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.tokensIn) { obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.tokens_in = []; + obj.tokens_in = message.tokensIn; } return obj; }, @@ -2305,9 +2305,9 @@ export const QueryCalcJoinPoolNoSwapSharesResponse = { if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } - obj.shares_out = message.sharesOut; + obj.shares_out = message.sharesOut === "" ? undefined : message.sharesOut; return obj; }, fromProtoMsg(message: QueryCalcJoinPoolNoSwapSharesResponseProtoMsg, useInterfaces: boolean = true): QueryCalcJoinPoolNoSwapSharesResponse { @@ -2420,9 +2420,9 @@ export const QuerySpotPriceRequest = { }, toAmino(message: QuerySpotPriceRequest, useInterfaces: boolean = true): 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromProtoMsg(message: QuerySpotPriceRequestProtoMsg, useInterfaces: boolean = true): QuerySpotPriceRequest { @@ -2544,9 +2544,9 @@ export const QueryPoolsWithFilterRequest = { if (message.minLiquidity) { obj.min_liquidity = message.minLiquidity.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.min_liquidity = []; + obj.min_liquidity = message.minLiquidity; } - obj.pool_type = message.poolType; + obj.pool_type = message.poolType === "" ? undefined : message.poolType; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -2654,7 +2654,7 @@ export const QueryPoolsWithFilterResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? PoolI_ToAmino((e as Any), useInterfaces) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -2737,7 +2737,7 @@ export const QuerySpotPriceResponse = { }, toAmino(message: QuerySpotPriceResponse, useInterfaces: boolean = true): QuerySpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromProtoMsg(message: QuerySpotPriceResponseProtoMsg, useInterfaces: boolean = true): QuerySpotPriceResponse { @@ -2871,13 +2871,13 @@ export const QuerySwapExactAmountInRequest = { }, toAmino(message: QuerySwapExactAmountInRequest, useInterfaces: boolean = true): QuerySwapExactAmountInRequestAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_in = message.tokenIn; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn === "" ? undefined : message.tokenIn; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e, useInterfaces) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } return obj; }, @@ -2959,7 +2959,7 @@ export const QuerySwapExactAmountInResponse = { }, toAmino(message: QuerySwapExactAmountInResponse, useInterfaces: boolean = true): QuerySwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromProtoMsg(message: QuerySwapExactAmountInResponseProtoMsg, useInterfaces: boolean = true): QuerySwapExactAmountInResponse { @@ -3093,14 +3093,14 @@ export const QuerySwapExactAmountOutRequest = { }, toAmino(message: QuerySwapExactAmountOutRequest, useInterfaces: boolean = true): QuerySwapExactAmountOutRequestAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e, useInterfaces) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_out = message.tokenOut; + obj.token_out = message.tokenOut === "" ? undefined : message.tokenOut; return obj; }, fromProtoMsg(message: QuerySwapExactAmountOutRequestProtoMsg, useInterfaces: boolean = true): QuerySwapExactAmountOutRequest { @@ -3181,7 +3181,7 @@ export const QuerySwapExactAmountOutResponse = { }, toAmino(message: QuerySwapExactAmountOutResponse, useInterfaces: boolean = true): QuerySwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromProtoMsg(message: QuerySwapExactAmountOutResponseProtoMsg, useInterfaces: boolean = true): QuerySwapExactAmountOutResponse { @@ -3334,7 +3334,7 @@ export const QueryTotalLiquidityResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, @@ -3363,7 +3363,7 @@ export const PoolI_InterfaceDecoder = (input: BinaryReader | Uint8Array): Pool1 return data; } }; -export const PoolI_FromAmino = (content: AnyAmino) => { +export const PoolI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "osmosis/gamm/pool": return Any.fromPartial({ diff --git a/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/tx.ts index 10fcd0f940..79ecb635e3 100644 --- a/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/tx.ts @@ -483,13 +483,13 @@ export const MsgJoinPool = { }, toAmino(message: MsgJoinPool, useInterfaces: boolean = true): MsgJoinPoolAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.share_out_amount = message.shareOutAmount; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenInMaxs) { obj.token_in_maxs = message.tokenInMaxs.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.token_in_maxs = []; + obj.token_in_maxs = message.tokenInMaxs; } return obj; }, @@ -592,11 +592,11 @@ export const MsgJoinPoolResponse = { }, toAmino(message: MsgJoinPoolResponse, useInterfaces: boolean = true): MsgJoinPoolResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenIn) { obj.token_in = message.tokenIn.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.token_in = []; + obj.token_in = message.tokenIn; } return obj; }, @@ -731,13 +731,13 @@ export const MsgExitPool = { }, toAmino(message: MsgExitPool, useInterfaces: boolean = true): MsgExitPoolAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.share_in_amount = message.shareInAmount; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; if (message.tokenOutMins) { obj.token_out_mins = message.tokenOutMins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.token_out_mins = []; + obj.token_out_mins = message.tokenOutMins; } return obj; }, @@ -828,7 +828,7 @@ export const MsgExitPoolResponse = { if (message.tokenOut) { obj.token_out = message.tokenOut.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.token_out = []; + obj.token_out = message.tokenOut; } return obj; }, @@ -927,8 +927,8 @@ export const SwapAmountInRoute = { }, toAmino(message: SwapAmountInRoute, useInterfaces: boolean = true): SwapAmountInRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_out_denom = message.tokenOutDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; return obj; }, fromProtoMsg(message: SwapAmountInRouteProtoMsg, useInterfaces: boolean = true): SwapAmountInRoute { @@ -1062,14 +1062,14 @@ export const MsgSwapExactAmountIn = { }, toAmino(message: MsgSwapExactAmountIn, useInterfaces: boolean = true): MsgSwapExactAmountInAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e, useInterfaces) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn, useInterfaces) : undefined; - obj.token_out_min_amount = message.tokenOutMinAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromProtoMsg(message: MsgSwapExactAmountInProtoMsg, useInterfaces: boolean = true): MsgSwapExactAmountIn { @@ -1150,7 +1150,7 @@ export const MsgSwapExactAmountInResponse = { }, toAmino(message: MsgSwapExactAmountInResponse, useInterfaces: boolean = true): MsgSwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromProtoMsg(message: MsgSwapExactAmountInResponseProtoMsg, useInterfaces: boolean = true): MsgSwapExactAmountInResponse { @@ -1248,8 +1248,8 @@ export const SwapAmountOutRoute = { }, toAmino(message: SwapAmountOutRoute, useInterfaces: boolean = true): SwapAmountOutRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_in_denom = message.tokenInDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; return obj; }, fromProtoMsg(message: SwapAmountOutRouteProtoMsg, useInterfaces: boolean = true): SwapAmountOutRoute { @@ -1383,13 +1383,13 @@ export const MsgSwapExactAmountOut = { }, toAmino(message: MsgSwapExactAmountOut, useInterfaces: boolean = true): MsgSwapExactAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e, useInterfaces) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_in_max_amount = message.tokenInMaxAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut, useInterfaces) : undefined; return obj; }, @@ -1471,7 +1471,7 @@ export const MsgSwapExactAmountOutResponse = { }, toAmino(message: MsgSwapExactAmountOutResponse, useInterfaces: boolean = true): MsgSwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromProtoMsg(message: MsgSwapExactAmountOutResponseProtoMsg, useInterfaces: boolean = true): MsgSwapExactAmountOutResponse { @@ -1601,10 +1601,10 @@ export const MsgJoinSwapExternAmountIn = { }, toAmino(message: MsgJoinSwapExternAmountIn, useInterfaces: boolean = true): MsgJoinSwapExternAmountInAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn, useInterfaces) : undefined; - obj.share_out_min_amount = message.shareOutMinAmount; + obj.share_out_min_amount = message.shareOutMinAmount === "" ? undefined : message.shareOutMinAmount; return obj; }, fromProtoMsg(message: MsgJoinSwapExternAmountInProtoMsg, useInterfaces: boolean = true): MsgJoinSwapExternAmountIn { @@ -1685,7 +1685,7 @@ export const MsgJoinSwapExternAmountInResponse = { }, toAmino(message: MsgJoinSwapExternAmountInResponse, useInterfaces: boolean = true): MsgJoinSwapExternAmountInResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; return obj; }, fromProtoMsg(message: MsgJoinSwapExternAmountInResponseProtoMsg, useInterfaces: boolean = true): MsgJoinSwapExternAmountInResponse { @@ -1828,11 +1828,11 @@ export const MsgJoinSwapShareAmountOut = { }, toAmino(message: MsgJoinSwapShareAmountOut, useInterfaces: boolean = true): 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; return obj; }, fromProtoMsg(message: MsgJoinSwapShareAmountOutProtoMsg, useInterfaces: boolean = true): MsgJoinSwapShareAmountOut { @@ -1913,7 +1913,7 @@ export const MsgJoinSwapShareAmountOutResponse = { }, toAmino(message: MsgJoinSwapShareAmountOutResponse, useInterfaces: boolean = true): MsgJoinSwapShareAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromProtoMsg(message: MsgJoinSwapShareAmountOutResponseProtoMsg, useInterfaces: boolean = true): MsgJoinSwapShareAmountOutResponse { @@ -2056,11 +2056,11 @@ export const MsgExitSwapShareAmountIn = { }, toAmino(message: MsgExitSwapShareAmountIn, useInterfaces: boolean = true): 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromProtoMsg(message: MsgExitSwapShareAmountInProtoMsg, useInterfaces: boolean = true): MsgExitSwapShareAmountIn { @@ -2141,7 +2141,7 @@ export const MsgExitSwapShareAmountInResponse = { }, toAmino(message: MsgExitSwapShareAmountInResponse, useInterfaces: boolean = true): MsgExitSwapShareAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromProtoMsg(message: MsgExitSwapShareAmountInResponseProtoMsg, useInterfaces: boolean = true): MsgExitSwapShareAmountInResponse { @@ -2271,10 +2271,10 @@ export const MsgExitSwapExternAmountOut = { }, toAmino(message: MsgExitSwapExternAmountOut, useInterfaces: boolean = true): MsgExitSwapExternAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut, useInterfaces) : undefined; - obj.share_in_max_amount = message.shareInMaxAmount; + obj.share_in_max_amount = message.shareInMaxAmount === "" ? undefined : message.shareInMaxAmount; return obj; }, fromProtoMsg(message: MsgExitSwapExternAmountOutProtoMsg, useInterfaces: boolean = true): MsgExitSwapExternAmountOut { @@ -2355,7 +2355,7 @@ export const MsgExitSwapExternAmountOutResponse = { }, toAmino(message: MsgExitSwapExternAmountOutResponse, useInterfaces: boolean = true): MsgExitSwapExternAmountOutResponseAmino { const obj: any = {}; - obj.share_in_amount = message.shareInAmount; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; return obj; }, fromProtoMsg(message: MsgExitSwapExternAmountOutResponseProtoMsg, useInterfaces: boolean = true): MsgExitSwapExternAmountOutResponse { diff --git a/__fixtures__/v-next/outputv3/osmosis/gamm/v2/query.ts b/__fixtures__/v-next/outputv3/osmosis/gamm/v2/query.ts index 4005b4212d..cb99c63f8e 100644 --- a/__fixtures__/v-next/outputv3/osmosis/gamm/v2/query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/gamm/v2/query.ts @@ -156,9 +156,9 @@ export const QuerySpotPriceRequest = { }, toAmino(message: QuerySpotPriceRequest, useInterfaces: boolean = true): 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromProtoMsg(message: QuerySpotPriceRequestProtoMsg, useInterfaces: boolean = true): QuerySpotPriceRequest { @@ -239,7 +239,7 @@ export const QuerySpotPriceResponse = { }, toAmino(message: QuerySpotPriceResponse, useInterfaces: boolean = true): QuerySpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromProtoMsg(message: QuerySpotPriceResponseProtoMsg, useInterfaces: boolean = true): QuerySpotPriceResponse { diff --git a/__fixtures__/v-next/outputv3/osmosis/ibc-rate-limit/v1beta1/params.ts b/__fixtures__/v-next/outputv3/osmosis/ibc-rate-limit/v1beta1/params.ts index d923170541..4acec0de5f 100644 --- a/__fixtures__/v-next/outputv3/osmosis/ibc-rate-limit/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv3/osmosis/ibc-rate-limit/v1beta1/params.ts @@ -82,7 +82,7 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/osmosis/incentives/gauge.ts b/__fixtures__/v-next/outputv3/osmosis/incentives/gauge.ts index 356e18648c..fe9142a197 100644 --- a/__fixtures__/v-next/outputv3/osmosis/incentives/gauge.ts +++ b/__fixtures__/v-next/outputv3/osmosis/incentives/gauge.ts @@ -311,21 +311,21 @@ export const Gauge = { }, toAmino(message: Gauge, useInterfaces: boolean = true): GaugeAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.is_perpetual = message.isPerpetual; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.is_perpetual = message.isPerpetual === false ? undefined : message.isPerpetual; obj.distribute_to = message.distributeTo ? QueryCondition.toAmino(message.distributeTo, useInterfaces) : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; - obj.filled_epochs = message.filledEpochs ? message.filledEpochs.toString() : undefined; + obj.num_epochs_paid_over = message.numEpochsPaidOver !== BigInt(0) ? message.numEpochsPaidOver.toString() : undefined; + obj.filled_epochs = message.filledEpochs !== BigInt(0) ? message.filledEpochs.toString() : undefined; if (message.distributedCoins) { obj.distributed_coins = message.distributedCoins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.distributed_coins = []; + obj.distributed_coins = message.distributedCoins; } return obj; }, @@ -416,7 +416,7 @@ export const LockableDurationsInfo = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e, useInterfaces) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/incentives/genesis.ts b/__fixtures__/v-next/outputv3/osmosis/incentives/genesis.ts index 937a1835b9..81d9b1c27f 100644 --- a/__fixtures__/v-next/outputv3/osmosis/incentives/genesis.ts +++ b/__fixtures__/v-next/outputv3/osmosis/incentives/genesis.ts @@ -188,14 +188,14 @@ export const GenesisState = { if (message.gauges) { obj.gauges = message.gauges.map(e => e ? Gauge.toAmino(e, useInterfaces) : undefined); } else { - obj.gauges = []; + obj.gauges = message.gauges; } if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e, useInterfaces) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } - obj.last_gauge_id = message.lastGaugeId ? message.lastGaugeId.toString() : undefined; + obj.last_gauge_id = message.lastGaugeId !== BigInt(0) ? message.lastGaugeId.toString() : undefined; return obj; }, fromProtoMsg(message: GenesisStateProtoMsg, useInterfaces: boolean = true): GenesisState { diff --git a/__fixtures__/v-next/outputv3/osmosis/incentives/params.ts b/__fixtures__/v-next/outputv3/osmosis/incentives/params.ts index b6f74054c0..fb01fa70b8 100644 --- a/__fixtures__/v-next/outputv3/osmosis/incentives/params.ts +++ b/__fixtures__/v-next/outputv3/osmosis/incentives/params.ts @@ -90,7 +90,7 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.distr_epoch_identifier = message.distrEpochIdentifier; + obj.distr_epoch_identifier = message.distrEpochIdentifier === "" ? undefined : message.distrEpochIdentifier; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/osmosis/incentives/query.ts b/__fixtures__/v-next/outputv3/osmosis/incentives/query.ts index f122816b98..9224a10def 100644 --- a/__fixtures__/v-next/outputv3/osmosis/incentives/query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/incentives/query.ts @@ -453,7 +453,7 @@ export const ModuleToDistributeCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -537,7 +537,7 @@ export const GaugeByIDRequest = { }, toAmino(message: GaugeByIDRequest, useInterfaces: boolean = true): GaugeByIDRequestAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; return obj; }, fromProtoMsg(message: GaugeByIDRequestProtoMsg, useInterfaces: boolean = true): GaugeByIDRequest { @@ -810,7 +810,7 @@ export const GaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e, useInterfaces) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1002,7 +1002,7 @@ export const ActiveGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e, useInterfaces) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1102,7 +1102,7 @@ export const ActiveGaugesPerDenomRequest = { }, toAmino(message: ActiveGaugesPerDenomRequest, useInterfaces: boolean = true): ActiveGaugesPerDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1210,7 +1210,7 @@ export const ActiveGaugesPerDenomResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e, useInterfaces) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1402,7 +1402,7 @@ export const UpcomingGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e, useInterfaces) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1502,7 +1502,7 @@ export const UpcomingGaugesPerDenomRequest = { }, toAmino(message: UpcomingGaugesPerDenomRequest, useInterfaces: boolean = true): UpcomingGaugesPerDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination, useInterfaces) : undefined; return obj; }, @@ -1610,7 +1610,7 @@ export const UpcomingGaugesPerDenomResponse = { if (message.upcomingGauges) { obj.upcoming_gauges = message.upcomingGauges.map(e => e ? Gauge.toAmino(e, useInterfaces) : undefined); } else { - obj.upcoming_gauges = []; + obj.upcoming_gauges = message.upcomingGauges; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1740,13 +1740,13 @@ export const RewardsEstRequest = { }, toAmino(message: RewardsEstRequest, useInterfaces: boolean = true): RewardsEstRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; if (message.lockIds) { obj.lock_ids = message.lockIds.map(e => e.toString()); } else { - obj.lock_ids = []; + obj.lock_ids = message.lockIds; } - obj.end_epoch = message.endEpoch ? message.endEpoch.toString() : undefined; + obj.end_epoch = message.endEpoch !== BigInt(0) ? message.endEpoch.toString() : undefined; return obj; }, fromProtoMsg(message: RewardsEstRequestProtoMsg, useInterfaces: boolean = true): RewardsEstRequest { @@ -1836,7 +1836,7 @@ export const RewardsEstResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1990,7 +1990,7 @@ export const QueryLockableDurationsResponse = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e, useInterfaces) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/incentives/tx.ts b/__fixtures__/v-next/outputv3/osmosis/incentives/tx.ts index 84375627f4..027f96787d 100644 --- a/__fixtures__/v-next/outputv3/osmosis/incentives/tx.ts +++ b/__fixtures__/v-next/outputv3/osmosis/incentives/tx.ts @@ -263,16 +263,16 @@ export const MsgCreateGauge = { }, toAmino(message: MsgCreateGauge, useInterfaces: boolean = true): MsgCreateGaugeAmino { const obj: any = {}; - obj.is_perpetual = message.isPerpetual; - obj.owner = message.owner; + obj.is_perpetual = message.isPerpetual === false ? undefined : message.isPerpetual; + obj.owner = message.owner === "" ? undefined : message.owner; obj.distribute_to = message.distributeTo ? QueryCondition.toAmino(message.distributeTo, useInterfaces) : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; + obj.num_epochs_paid_over = message.numEpochsPaidOver !== BigInt(0) ? message.numEpochsPaidOver.toString() : undefined; return obj; }, fromProtoMsg(message: MsgCreateGaugeProtoMsg, useInterfaces: boolean = true): MsgCreateGauge { @@ -454,12 +454,12 @@ export const MsgAddToGauge = { }, toAmino(message: MsgAddToGauge, useInterfaces: boolean = true): MsgAddToGaugeAmino { const obj: any = {}; - obj.owner = message.owner; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; if (message.rewards) { obj.rewards = message.rewards.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/lockup/genesis.ts b/__fixtures__/v-next/outputv3/osmosis/lockup/genesis.ts index f4611d3984..88dc36a363 100644 --- a/__fixtures__/v-next/outputv3/osmosis/lockup/genesis.ts +++ b/__fixtures__/v-next/outputv3/osmosis/lockup/genesis.ts @@ -133,16 +133,16 @@ export const GenesisState = { }, toAmino(message: GenesisState, useInterfaces: boolean = true): GenesisStateAmino { const obj: any = {}; - obj.last_lock_id = message.lastLockId ? message.lastLockId.toString() : undefined; + obj.last_lock_id = message.lastLockId !== BigInt(0) ? message.lastLockId.toString() : undefined; if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e, useInterfaces) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e, useInterfaces) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputv3/osmosis/lockup/lock.ts index 84646e962d..4c2052e96e 100644 --- a/__fixtures__/v-next/outputv3/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputv3/osmosis/lockup/lock.ts @@ -392,14 +392,14 @@ export const PeriodLock = { }, toAmino(message: PeriodLock, useInterfaces: boolean = true): PeriodLockAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; - obj.owner = message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -513,7 +513,7 @@ export const QueryCondition = { fromAmino(object: QueryConditionAmino): QueryCondition { const message = createBaseQueryCondition(); if (object.lock_query_type !== undefined && object.lock_query_type !== null) { - message.lockQueryType = lockQueryTypeFromJSON(object.lock_query_type); + message.lockQueryType = object.lock_query_type; } if (object.denom !== undefined && object.denom !== null) { message.denom = object.denom; @@ -528,8 +528,8 @@ export const QueryCondition = { }, toAmino(message: QueryCondition, useInterfaces: boolean = true): QueryConditionAmino { const obj: any = {}; - obj.lock_query_type = message.lockQueryType; - obj.denom = message.denom; + obj.lock_query_type = message.lockQueryType === 0 ? undefined : message.lockQueryType; + obj.denom = message.denom === "" ? undefined : message.denom; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; @@ -661,8 +661,8 @@ export const SyntheticLock = { }, toAmino(message: SyntheticLock, useInterfaces: boolean = true): SyntheticLockAmino { const obj: any = {}; - obj.underlying_lock_id = message.underlyingLockId ? message.underlyingLockId.toString() : undefined; - obj.synth_denom = message.synthDenom; + obj.underlying_lock_id = message.underlyingLockId !== BigInt(0) ? message.underlyingLockId.toString() : undefined; + obj.synth_denom = message.synthDenom === "" ? undefined : message.synthDenom; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/osmosis/lockup/params.ts b/__fixtures__/v-next/outputv3/osmosis/lockup/params.ts index a1d1704f98..2178c9bf65 100644 --- a/__fixtures__/v-next/outputv3/osmosis/lockup/params.ts +++ b/__fixtures__/v-next/outputv3/osmosis/lockup/params.ts @@ -88,7 +88,7 @@ export const Params = { if (message.forceUnlockAllowedAddresses) { obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses.map(e => e); } else { - obj.force_unlock_allowed_addresses = []; + obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/lockup/query.ts b/__fixtures__/v-next/outputv3/osmosis/lockup/query.ts index e6604853f2..810a20396c 100644 --- a/__fixtures__/v-next/outputv3/osmosis/lockup/query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/lockup/query.ts @@ -600,7 +600,7 @@ export const ModuleBalanceResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -754,7 +754,7 @@ export const ModuleLockedAmountResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -836,7 +836,7 @@ export const AccountUnlockableCoinsRequest = { }, toAmino(message: AccountUnlockableCoinsRequest, useInterfaces: boolean = true): AccountUnlockableCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromProtoMsg(message: AccountUnlockableCoinsRequestProtoMsg, useInterfaces: boolean = true): AccountUnlockableCoinsRequest { @@ -926,7 +926,7 @@ export const AccountUnlockableCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1008,7 +1008,7 @@ export const AccountUnlockingCoinsRequest = { }, toAmino(message: AccountUnlockingCoinsRequest, useInterfaces: boolean = true): AccountUnlockingCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromProtoMsg(message: AccountUnlockingCoinsRequestProtoMsg, useInterfaces: boolean = true): AccountUnlockingCoinsRequest { @@ -1098,7 +1098,7 @@ export const AccountUnlockingCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1180,7 +1180,7 @@ export const AccountLockedCoinsRequest = { }, toAmino(message: AccountLockedCoinsRequest, useInterfaces: boolean = true): AccountLockedCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromProtoMsg(message: AccountLockedCoinsRequestProtoMsg, useInterfaces: boolean = true): AccountLockedCoinsRequest { @@ -1270,7 +1270,7 @@ export const AccountLockedCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1367,7 +1367,7 @@ export const AccountLockedPastTimeRequest = { }, toAmino(message: AccountLockedPastTimeRequest, useInterfaces: boolean = true): AccountLockedPastTimeRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1458,7 +1458,7 @@ export const AccountLockedPastTimeResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e, useInterfaces) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1555,7 +1555,7 @@ export const AccountLockedPastTimeNotUnlockingOnlyRequest = { }, toAmino(message: AccountLockedPastTimeNotUnlockingOnlyRequest, useInterfaces: boolean = true): AccountLockedPastTimeNotUnlockingOnlyRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1646,7 +1646,7 @@ export const AccountLockedPastTimeNotUnlockingOnlyResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e, useInterfaces) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1743,7 +1743,7 @@ export const AccountUnlockedBeforeTimeRequest = { }, toAmino(message: AccountUnlockedBeforeTimeRequest, useInterfaces: boolean = true): AccountUnlockedBeforeTimeRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1834,7 +1834,7 @@ export const AccountUnlockedBeforeTimeResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e, useInterfaces) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1946,9 +1946,9 @@ export const AccountLockedPastTimeDenomRequest = { }, toAmino(message: AccountLockedPastTimeDenomRequest, useInterfaces: boolean = true): AccountLockedPastTimeDenomRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: AccountLockedPastTimeDenomRequestProtoMsg, useInterfaces: boolean = true): AccountLockedPastTimeDenomRequest { @@ -2038,7 +2038,7 @@ export const AccountLockedPastTimeDenomResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e, useInterfaces) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2137,7 +2137,7 @@ export const LockedDenomRequest = { }, toAmino(message: LockedDenomRequest, useInterfaces: boolean = true): LockedDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; return obj; }, @@ -2219,7 +2219,7 @@ export const LockedDenomResponse = { }, toAmino(message: LockedDenomResponse, useInterfaces: boolean = true): LockedDenomResponseAmino { const obj: any = {}; - obj.amount = message.amount; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromProtoMsg(message: LockedDenomResponseProtoMsg, useInterfaces: boolean = true): LockedDenomResponse { @@ -2302,7 +2302,7 @@ export const LockedRequest = { }, toAmino(message: LockedRequest, useInterfaces: boolean = true): LockedRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromProtoMsg(message: LockedRequestProtoMsg, useInterfaces: boolean = true): LockedRequest { @@ -2468,7 +2468,7 @@ export const SyntheticLockupsByLockupIDRequest = { }, toAmino(message: SyntheticLockupsByLockupIDRequest, useInterfaces: boolean = true): SyntheticLockupsByLockupIDRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromProtoMsg(message: SyntheticLockupsByLockupIDRequestProtoMsg, useInterfaces: boolean = true): SyntheticLockupsByLockupIDRequest { @@ -2558,7 +2558,7 @@ export const SyntheticLockupsByLockupIDResponse = { if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e, useInterfaces) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, @@ -2657,7 +2657,7 @@ export const AccountLockedLongerDurationRequest = { }, toAmino(message: AccountLockedLongerDurationRequest, useInterfaces: boolean = true): AccountLockedLongerDurationRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; return obj; }, @@ -2748,7 +2748,7 @@ export const AccountLockedLongerDurationResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e, useInterfaces) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2847,7 +2847,7 @@ export const AccountLockedDurationRequest = { }, toAmino(message: AccountLockedDurationRequest, useInterfaces: boolean = true): AccountLockedDurationRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; return obj; }, @@ -2938,7 +2938,7 @@ export const AccountLockedDurationResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e, useInterfaces) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3037,7 +3037,7 @@ export const AccountLockedLongerDurationNotUnlockingOnlyRequest = { }, toAmino(message: AccountLockedLongerDurationNotUnlockingOnlyRequest, useInterfaces: boolean = true): AccountLockedLongerDurationNotUnlockingOnlyRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; return obj; }, @@ -3128,7 +3128,7 @@ export const AccountLockedLongerDurationNotUnlockingOnlyResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e, useInterfaces) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3242,9 +3242,9 @@ export const AccountLockedLongerDurationDenomRequest = { }, toAmino(message: AccountLockedLongerDurationDenomRequest, useInterfaces: boolean = true): AccountLockedLongerDurationDenomRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: AccountLockedLongerDurationDenomRequestProtoMsg, useInterfaces: boolean = true): AccountLockedLongerDurationDenomRequest { @@ -3334,7 +3334,7 @@ export const AccountLockedLongerDurationDenomResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e, useInterfaces) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputv3/osmosis/lockup/tx.ts index 48826748ad..55daff321a 100644 --- a/__fixtures__/v-next/outputv3/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputv3/osmosis/lockup/tx.ts @@ -297,12 +297,12 @@ export const MsgLockTokens = { }, toAmino(message: MsgLockTokens, useInterfaces: boolean = true): MsgLockTokensAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -386,7 +386,7 @@ export const MsgLockTokensResponse = { }, toAmino(message: MsgLockTokensResponse, useInterfaces: boolean = true): MsgLockTokensResponseAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; return obj; }, fromProtoMsg(message: MsgLockTokensResponseProtoMsg, useInterfaces: boolean = true): MsgLockTokensResponse { @@ -467,7 +467,7 @@ export const MsgBeginUnlockingAll = { }, toAmino(message: MsgBeginUnlockingAll, useInterfaces: boolean = true): MsgBeginUnlockingAllAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromProtoMsg(message: MsgBeginUnlockingAllProtoMsg, useInterfaces: boolean = true): MsgBeginUnlockingAll { @@ -557,7 +557,7 @@ export const MsgBeginUnlockingAllResponse = { if (message.unlocks) { obj.unlocks = message.unlocks.map(e => e ? PeriodLock.toAmino(e, useInterfaces) : undefined); } else { - obj.unlocks = []; + obj.unlocks = message.unlocks; } return obj; }, @@ -677,12 +677,12 @@ export const MsgBeginUnlocking = { }, toAmino(message: MsgBeginUnlocking, useInterfaces: boolean = true): MsgBeginUnlockingAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -764,7 +764,7 @@ export const MsgBeginUnlockingResponse = { }, toAmino(message: MsgBeginUnlockingResponse, useInterfaces: boolean = true): MsgBeginUnlockingResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromProtoMsg(message: MsgBeginUnlockingResponseProtoMsg, useInterfaces: boolean = true): MsgBeginUnlockingResponse { @@ -879,8 +879,8 @@ export const MsgExtendLockup = { }, toAmino(message: MsgExtendLockup, useInterfaces: boolean = true): MsgExtendLockupAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; return obj; }, @@ -962,7 +962,7 @@ export const MsgExtendLockupResponse = { }, toAmino(message: MsgExtendLockupResponse, useInterfaces: boolean = true): MsgExtendLockupResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromProtoMsg(message: MsgExtendLockupResponseProtoMsg, useInterfaces: boolean = true): MsgExtendLockupResponse { @@ -1081,12 +1081,12 @@ export const MsgForceUnlock = { }, toAmino(message: MsgForceUnlock, useInterfaces: boolean = true): MsgForceUnlockAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1168,7 +1168,7 @@ export const MsgForceUnlockResponse = { }, toAmino(message: MsgForceUnlockResponse, useInterfaces: boolean = true): MsgForceUnlockResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromProtoMsg(message: MsgForceUnlockResponseProtoMsg, useInterfaces: boolean = true): MsgForceUnlockResponse { diff --git a/__fixtures__/v-next/outputv3/osmosis/mint/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/osmosis/mint/v1beta1/genesis.ts index fcd18f180b..588e154f03 100644 --- a/__fixtures__/v-next/outputv3/osmosis/mint/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/osmosis/mint/v1beta1/genesis.ts @@ -139,7 +139,7 @@ export const GenesisState = { const obj: any = {}; obj.minter = message.minter ? Minter.toAmino(message.minter, useInterfaces) : undefined; obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : undefined; - obj.reduction_started_epoch = message.reductionStartedEpoch ? message.reductionStartedEpoch.toString() : undefined; + obj.reduction_started_epoch = message.reductionStartedEpoch !== BigInt(0) ? message.reductionStartedEpoch.toString() : undefined; return obj; }, fromProtoMsg(message: GenesisStateProtoMsg, useInterfaces: boolean = true): GenesisState { diff --git a/__fixtures__/v-next/outputv3/osmosis/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputv3/osmosis/mint/v1beta1/mint.ts index 6bcf3465e0..2548e217c0 100644 --- a/__fixtures__/v-next/outputv3/osmosis/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputv3/osmosis/mint/v1beta1/mint.ts @@ -274,7 +274,7 @@ export const Minter = { }, toAmino(message: Minter, useInterfaces: boolean = true): MinterAmino { const obj: any = {}; - obj.epoch_provisions = message.epochProvisions; + obj.epoch_provisions = message.epochProvisions === "" ? undefined : message.epochProvisions; return obj; }, fromProtoMsg(message: MinterProtoMsg, useInterfaces: boolean = true): Minter { @@ -370,8 +370,8 @@ export const WeightedAddress = { }, toAmino(message: WeightedAddress, useInterfaces: boolean = true): WeightedAddressAmino { const obj: any = {}; - obj.address = message.address; - obj.weight = message.weight; + obj.address = message.address === "" ? undefined : message.address; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromProtoMsg(message: WeightedAddressProtoMsg, useInterfaces: boolean = true): WeightedAddress { @@ -497,10 +497,10 @@ export const DistributionProportions = { }, toAmino(message: DistributionProportions, useInterfaces: boolean = true): DistributionProportionsAmino { const obj: any = {}; - obj.staking = message.staking; - obj.pool_incentives = message.poolIncentives; - obj.developer_rewards = message.developerRewards; - obj.community_pool = message.communityPool; + obj.staking = message.staking === "" ? undefined : message.staking; + obj.pool_incentives = message.poolIncentives === "" ? undefined : message.poolIncentives; + obj.developer_rewards = message.developerRewards === "" ? undefined : message.developerRewards; + obj.community_pool = message.communityPool === "" ? undefined : message.communityPool; return obj; }, fromProtoMsg(message: DistributionProportionsProtoMsg, useInterfaces: boolean = true): DistributionProportions { @@ -698,18 +698,18 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): 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.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; + obj.genesis_epoch_provisions = message.genesisEpochProvisions === "" ? undefined : message.genesisEpochProvisions; + obj.epoch_identifier = message.epochIdentifier === "" ? undefined : message.epochIdentifier; + obj.reduction_period_in_epochs = message.reductionPeriodInEpochs !== BigInt(0) ? message.reductionPeriodInEpochs.toString() : undefined; + obj.reduction_factor = message.reductionFactor === "" ? undefined : message.reductionFactor; obj.distribution_proportions = message.distributionProportions ? DistributionProportions.toAmino(message.distributionProportions, useInterfaces) : undefined; if (message.weightedDeveloperRewardsReceivers) { obj.weighted_developer_rewards_receivers = message.weightedDeveloperRewardsReceivers.map(e => e ? WeightedAddress.toAmino(e, useInterfaces) : undefined); } else { - obj.weighted_developer_rewards_receivers = []; + obj.weighted_developer_rewards_receivers = message.weightedDeveloperRewardsReceivers; } - obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; + obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch !== BigInt(0) ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/genesis.ts index f7cbb7fa3c..7058db6b5d 100644 --- a/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/genesis.ts @@ -156,7 +156,7 @@ export const GenesisState = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e, useInterfaces) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } obj.distr_info = message.distrInfo ? DistrInfo.toAmino(message.distrInfo, useInterfaces) : undefined; obj.pool_to_gauges = message.poolToGauges ? PoolToGauges.toAmino(message.poolToGauges, useInterfaces) : undefined; diff --git a/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/gov.ts b/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/gov.ts index 78f61aad0d..3391d193bf 100644 --- a/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/gov.ts @@ -200,12 +200,12 @@ export const ReplacePoolIncentivesProposal = { }, toAmino(message: ReplacePoolIncentivesProposal, useInterfaces: boolean = true): ReplacePoolIncentivesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, @@ -324,12 +324,12 @@ export const UpdatePoolIncentivesProposal = { }, toAmino(message: UpdatePoolIncentivesProposal, useInterfaces: boolean = true): UpdatePoolIncentivesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/incentives.ts b/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/incentives.ts index c1a7940904..5383761b3c 100644 --- a/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/incentives.ts +++ b/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/incentives.ts @@ -169,7 +169,7 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.minted_denom = message.mintedDenom; + obj.minted_denom = message.mintedDenom === "" ? undefined : message.mintedDenom; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { @@ -259,7 +259,7 @@ export const LockableDurationsInfo = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e, useInterfaces) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, @@ -362,11 +362,11 @@ export const DistrInfo = { }, toAmino(message: DistrInfo, useInterfaces: boolean = true): DistrInfoAmino { const obj: any = {}; - obj.total_weight = message.totalWeight; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, @@ -465,8 +465,8 @@ export const DistrRecord = { }, toAmino(message: DistrRecord, useInterfaces: boolean = true): DistrRecordAmino { const obj: any = {}; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; - obj.weight = message.weight; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromProtoMsg(message: DistrRecordProtoMsg, useInterfaces: boolean = true): DistrRecord { @@ -583,8 +583,8 @@ export const PoolToGauge = { }, toAmino(message: PoolToGauge, useInterfaces: boolean = true): PoolToGaugeAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; return obj; }, @@ -675,7 +675,7 @@ export const PoolToGauges = { if (message.poolToGauge) { obj.pool_to_gauge = message.poolToGauge.map(e => e ? PoolToGauge.toAmino(e, useInterfaces) : undefined); } else { - obj.pool_to_gauge = []; + obj.pool_to_gauge = message.poolToGauge; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/query.ts b/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/query.ts index bc15be3a22..30950b1148 100644 --- a/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/query.ts @@ -235,7 +235,7 @@ export const QueryGaugeIdsRequest = { }, toAmino(message: QueryGaugeIdsRequest, useInterfaces: boolean = true): QueryGaugeIdsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromProtoMsg(message: QueryGaugeIdsRequestProtoMsg, useInterfaces: boolean = true): QueryGaugeIdsRequest { @@ -325,7 +325,7 @@ export const QueryGaugeIdsResponse = { if (message.gaugeIdsWithDuration) { obj.gauge_ids_with_duration = message.gaugeIdsWithDuration.map(e => e ? QueryGaugeIdsResponse_GaugeIdWithDuration.toAmino(e, useInterfaces) : undefined); } else { - obj.gauge_ids_with_duration = []; + obj.gauge_ids_with_duration = message.gaugeIdsWithDuration; } return obj; }, @@ -441,9 +441,9 @@ export const QueryGaugeIdsResponse_GaugeIdWithDuration = { }, toAmino(message: QueryGaugeIdsResponse_GaugeIdWithDuration, useInterfaces: boolean = true): QueryGaugeIdsResponse_GaugeIdWithDurationAmino { const obj: any = {}; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; - obj.gauge_incentive_percentage = message.gaugeIncentivePercentage; + obj.gauge_incentive_percentage = message.gaugeIncentivePercentage === "" ? undefined : message.gaugeIncentivePercentage; return obj; }, fromProtoMsg(message: QueryGaugeIdsResponse_GaugeIdWithDurationProtoMsg, useInterfaces: boolean = true): QueryGaugeIdsResponse_GaugeIdWithDuration { @@ -888,7 +888,7 @@ export const QueryLockableDurationsResponse = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e, useInterfaces) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, @@ -1069,9 +1069,9 @@ export const IncentivizedPool = { }, toAmino(message: IncentivizedPool, useInterfaces: boolean = true): IncentivizedPoolAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.lockable_duration = message.lockableDuration ? Duration.toAmino(message.lockableDuration, useInterfaces) : undefined; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; return obj; }, fromProtoMsg(message: IncentivizedPoolProtoMsg, useInterfaces: boolean = true): IncentivizedPool { @@ -1161,7 +1161,7 @@ export const QueryIncentivizedPoolsResponse = { if (message.incentivizedPools) { obj.incentivized_pools = message.incentivizedPools.map(e => e ? IncentivizedPool.toAmino(e, useInterfaces) : undefined); } else { - obj.incentivized_pools = []; + obj.incentivized_pools = message.incentivizedPools; } return obj; }, @@ -1315,7 +1315,7 @@ export const QueryExternalIncentiveGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e, useInterfaces) : undefined); } else { - obj.data = []; + obj.data = message.data; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/sumtree/v1beta1/tree.ts b/__fixtures__/v-next/outputv3/osmosis/sumtree/v1beta1/tree.ts index 587dfe694a..d0c935e56e 100644 --- a/__fixtures__/v-next/outputv3/osmosis/sumtree/v1beta1/tree.ts +++ b/__fixtures__/v-next/outputv3/osmosis/sumtree/v1beta1/tree.ts @@ -117,7 +117,7 @@ export const Node = { if (message.children) { obj.children = message.children.map(e => e ? Child.toAmino(e, useInterfaces) : undefined); } else { - obj.children = []; + obj.children = message.children; } return obj; }, @@ -215,7 +215,7 @@ export const Child = { toAmino(message: Child, useInterfaces: boolean = true): ChildAmino { const obj: any = {}; obj.index = message.index ? base64FromBytes(message.index) : undefined; - obj.accumulation = message.accumulation; + obj.accumulation = message.accumulation === "" ? undefined : message.accumulation; return obj; }, fromProtoMsg(message: ChildProtoMsg, useInterfaces: boolean = true): Child { diff --git a/__fixtures__/v-next/outputv3/osmosis/superfluid/genesis.ts b/__fixtures__/v-next/outputv3/osmosis/superfluid/genesis.ts index e85405b4d8..6e680ceb8c 100644 --- a/__fixtures__/v-next/outputv3/osmosis/superfluid/genesis.ts +++ b/__fixtures__/v-next/outputv3/osmosis/superfluid/genesis.ts @@ -210,22 +210,22 @@ export const GenesisState = { if (message.superfluidAssets) { obj.superfluid_assets = message.superfluidAssets.map(e => e ? SuperfluidAsset.toAmino(e, useInterfaces) : undefined); } else { - obj.superfluid_assets = []; + obj.superfluid_assets = message.superfluidAssets; } if (message.osmoEquivalentMultipliers) { obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers.map(e => e ? OsmoEquivalentMultiplierRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.osmo_equivalent_multipliers = []; + obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers; } if (message.intermediaryAccounts) { obj.intermediary_accounts = message.intermediaryAccounts.map(e => e ? SuperfluidIntermediaryAccount.toAmino(e, useInterfaces) : undefined); } else { - obj.intermediary_accounts = []; + obj.intermediary_accounts = message.intermediaryAccounts; } if (message.intemediaryAccountConnections) { obj.intemediary_account_connections = message.intemediaryAccountConnections.map(e => e ? LockIdIntermediaryAccountConnection.toAmino(e, useInterfaces) : undefined); } else { - obj.intemediary_account_connections = []; + obj.intemediary_account_connections = message.intemediaryAccountConnections; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/superfluid/params.ts b/__fixtures__/v-next/outputv3/osmosis/superfluid/params.ts index c77af66a17..c614706309 100644 --- a/__fixtures__/v-next/outputv3/osmosis/superfluid/params.ts +++ b/__fixtures__/v-next/outputv3/osmosis/superfluid/params.ts @@ -95,7 +95,7 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.minimum_risk_factor = message.minimumRiskFactor; + obj.minimum_risk_factor = message.minimumRiskFactor === "" ? undefined : message.minimumRiskFactor; return obj; }, fromProtoMsg(message: ParamsProtoMsg, useInterfaces: boolean = true): Params { diff --git a/__fixtures__/v-next/outputv3/osmosis/superfluid/query.ts b/__fixtures__/v-next/outputv3/osmosis/superfluid/query.ts index 8d24fd1651..fce454a655 100644 --- a/__fixtures__/v-next/outputv3/osmosis/superfluid/query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/superfluid/query.ts @@ -666,7 +666,7 @@ export const AssetTypeRequest = { }, toAmino(message: AssetTypeRequest, useInterfaces: boolean = true): AssetTypeRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: AssetTypeRequestProtoMsg, useInterfaces: boolean = true): AssetTypeRequest { @@ -741,13 +741,13 @@ export const AssetTypeResponse = { fromAmino(object: AssetTypeResponseAmino): AssetTypeResponse { const message = createBaseAssetTypeResponse(); if (object.asset_type !== undefined && object.asset_type !== null) { - message.assetType = superfluidAssetTypeFromJSON(object.asset_type); + message.assetType = object.asset_type; } return message; }, toAmino(message: AssetTypeResponse, useInterfaces: boolean = true): AssetTypeResponseAmino { const obj: any = {}; - obj.asset_type = message.assetType; + obj.asset_type = message.assetType === 0 ? undefined : message.assetType; return obj; }, fromProtoMsg(message: AssetTypeResponseProtoMsg, useInterfaces: boolean = true): AssetTypeResponse { @@ -900,7 +900,7 @@ export const AllAssetsResponse = { if (message.assets) { obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e, useInterfaces) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -982,7 +982,7 @@ export const AssetMultiplierRequest = { }, toAmino(message: AssetMultiplierRequest, useInterfaces: boolean = true): AssetMultiplierRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: AssetMultiplierRequestProtoMsg, useInterfaces: boolean = true): AssetMultiplierRequest { @@ -1193,10 +1193,10 @@ export const SuperfluidIntermediaryAccountInfo = { }, toAmino(message: SuperfluidIntermediaryAccountInfo, useInterfaces: boolean = true): 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; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromProtoMsg(message: SuperfluidIntermediaryAccountInfoProtoMsg, useInterfaces: boolean = true): SuperfluidIntermediaryAccountInfo { @@ -1386,7 +1386,7 @@ export const AllIntermediaryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? SuperfluidIntermediaryAccountInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination, useInterfaces) : undefined; return obj; @@ -1471,7 +1471,7 @@ export const ConnectedIntermediaryAccountRequest = { }, toAmino(message: ConnectedIntermediaryAccountRequest, useInterfaces: boolean = true): ConnectedIntermediaryAccountRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromProtoMsg(message: ConnectedIntermediaryAccountRequestProtoMsg, useInterfaces: boolean = true): ConnectedIntermediaryAccountRequest { @@ -1635,7 +1635,7 @@ export const QueryTotalDelegationByValidatorForDenomRequest = { }, toAmino(message: QueryTotalDelegationByValidatorForDenomRequest, useInterfaces: boolean = true): QueryTotalDelegationByValidatorForDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: QueryTotalDelegationByValidatorForDenomRequestProtoMsg, useInterfaces: boolean = true): QueryTotalDelegationByValidatorForDenomRequest { @@ -1725,7 +1725,7 @@ export const QueryTotalDelegationByValidatorForDenomResponse = { if (message.assets) { obj.assets = message.assets.map(e => e ? Delegations.toAmino(e, useInterfaces) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -1837,9 +1837,9 @@ export const Delegations = { }, toAmino(message: Delegations, useInterfaces: boolean = true): DelegationsAmino { const obj: any = {}; - obj.val_addr = message.valAddr; - obj.amount_sfsd = message.amountSfsd; - obj.osmo_equivalent = message.osmoEquivalent; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.amount_sfsd = message.amountSfsd === "" ? undefined : message.amountSfsd; + obj.osmo_equivalent = message.osmoEquivalent === "" ? undefined : message.osmoEquivalent; return obj; }, fromProtoMsg(message: DelegationsProtoMsg, useInterfaces: boolean = true): Delegations { @@ -1983,7 +1983,7 @@ export const TotalSuperfluidDelegationsResponse = { }, toAmino(message: TotalSuperfluidDelegationsResponse, useInterfaces: boolean = true): TotalSuperfluidDelegationsResponseAmino { const obj: any = {}; - obj.total_delegations = message.totalDelegations; + obj.total_delegations = message.totalDelegations === "" ? undefined : message.totalDelegations; return obj; }, fromProtoMsg(message: TotalSuperfluidDelegationsResponseProtoMsg, useInterfaces: boolean = true): TotalSuperfluidDelegationsResponse { @@ -2094,9 +2094,9 @@ export const SuperfluidDelegationAmountRequest = { }, toAmino(message: SuperfluidDelegationAmountRequest, useInterfaces: boolean = true): SuperfluidDelegationAmountRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: SuperfluidDelegationAmountRequestProtoMsg, useInterfaces: boolean = true): SuperfluidDelegationAmountRequest { @@ -2186,7 +2186,7 @@ export const SuperfluidDelegationAmountResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -2268,7 +2268,7 @@ export const SuperfluidDelegationsByDelegatorRequest = { }, toAmino(message: SuperfluidDelegationsByDelegatorRequest, useInterfaces: boolean = true): SuperfluidDelegationsByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromProtoMsg(message: SuperfluidDelegationsByDelegatorRequestProtoMsg, useInterfaces: boolean = true): SuperfluidDelegationsByDelegatorRequest { @@ -2396,12 +2396,12 @@ export const SuperfluidDelegationsByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount, useInterfaces) : undefined; return obj; @@ -2499,8 +2499,8 @@ export const SuperfluidUndelegationsByDelegatorRequest = { }, toAmino(message: SuperfluidUndelegationsByDelegatorRequest, useInterfaces: boolean = true): SuperfluidUndelegationsByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.denom = message.denom; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: SuperfluidUndelegationsByDelegatorRequestProtoMsg, useInterfaces: boolean = true): SuperfluidUndelegationsByDelegatorRequest { @@ -2632,17 +2632,17 @@ export const SuperfluidUndelegationsByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.totalUndelegatedCoins) { obj.total_undelegated_coins = message.totalUndelegatedCoins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.total_undelegated_coins = []; + obj.total_undelegated_coins = message.totalUndelegatedCoins; } if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e, useInterfaces) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, @@ -2739,8 +2739,8 @@ export const SuperfluidDelegationsByValidatorDenomRequest = { }, toAmino(message: SuperfluidDelegationsByValidatorDenomRequest, useInterfaces: boolean = true): SuperfluidDelegationsByValidatorDenomRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: SuperfluidDelegationsByValidatorDenomRequestProtoMsg, useInterfaces: boolean = true): SuperfluidDelegationsByValidatorDenomRequest { @@ -2830,7 +2830,7 @@ export const SuperfluidDelegationsByValidatorDenomResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } return obj; }, @@ -2927,8 +2927,8 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomRequest = { }, toAmino(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest, useInterfaces: boolean = true): EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequestProtoMsg, useInterfaces: boolean = true): EstimateSuperfluidDelegatedAmountByValidatorDenomRequest { @@ -3018,7 +3018,7 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomResponse = { if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } return obj; }, @@ -3100,7 +3100,7 @@ export const QueryTotalDelegationByDelegatorRequest = { }, toAmino(message: QueryTotalDelegationByDelegatorRequest, useInterfaces: boolean = true): QueryTotalDelegationByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromProtoMsg(message: QueryTotalDelegationByDelegatorRequestProtoMsg, useInterfaces: boolean = true): QueryTotalDelegationByDelegatorRequest { @@ -3249,17 +3249,17 @@ export const QueryTotalDelegationByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.delegationResponse) { obj.delegation_response = message.delegationResponse.map(e => e ? DelegationResponse.toAmino(e, useInterfaces) : undefined); } else { - obj.delegation_response = []; + obj.delegation_response = message.delegationResponse; } if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount, useInterfaces) : undefined; return obj; @@ -3423,7 +3423,7 @@ export const QueryUnpoolWhitelistResponse = { if (message.poolIds) { obj.pool_ids = message.poolIds.map(e => e.toString()); } else { - obj.pool_ids = []; + obj.pool_ids = message.poolIds; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/superfluid/superfluid.ts b/__fixtures__/v-next/outputv3/osmosis/superfluid/superfluid.ts index 30db4bb8d8..0ded7c5f8d 100644 --- a/__fixtures__/v-next/outputv3/osmosis/superfluid/superfluid.ts +++ b/__fixtures__/v-next/outputv3/osmosis/superfluid/superfluid.ts @@ -304,14 +304,14 @@ export const SuperfluidAsset = { message.denom = object.denom; } if (object.asset_type !== undefined && object.asset_type !== null) { - message.assetType = superfluidAssetTypeFromJSON(object.asset_type); + message.assetType = object.asset_type; } return message; }, toAmino(message: SuperfluidAsset, useInterfaces: boolean = true): SuperfluidAssetAmino { const obj: any = {}; - obj.denom = message.denom; - obj.asset_type = message.assetType; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.asset_type = message.assetType === 0 ? undefined : message.assetType; return obj; }, fromProtoMsg(message: SuperfluidAssetProtoMsg, useInterfaces: boolean = true): SuperfluidAsset { @@ -424,9 +424,9 @@ export const SuperfluidIntermediaryAccount = { }, toAmino(message: SuperfluidIntermediaryAccount, useInterfaces: boolean = true): SuperfluidIntermediaryAccountAmino { const obj: any = {}; - obj.denom = message.denom; - obj.val_addr = message.valAddr; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; return obj; }, fromProtoMsg(message: SuperfluidIntermediaryAccountProtoMsg, useInterfaces: boolean = true): SuperfluidIntermediaryAccount { @@ -539,9 +539,9 @@ export const OsmoEquivalentMultiplierRecord = { }, toAmino(message: OsmoEquivalentMultiplierRecord, useInterfaces: boolean = true): OsmoEquivalentMultiplierRecordAmino { const obj: any = {}; - obj.epoch_number = message.epochNumber ? message.epochNumber.toString() : undefined; - obj.denom = message.denom; - obj.multiplier = message.multiplier; + obj.epoch_number = message.epochNumber !== BigInt(0) ? message.epochNumber.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.multiplier = message.multiplier === "" ? undefined : message.multiplier; return obj; }, fromProtoMsg(message: OsmoEquivalentMultiplierRecordProtoMsg, useInterfaces: boolean = true): OsmoEquivalentMultiplierRecord { @@ -671,8 +671,8 @@ export const SuperfluidDelegationRecord = { }, toAmino(message: SuperfluidDelegationRecord, useInterfaces: boolean = true): SuperfluidDelegationRecordAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.delegation_amount = message.delegationAmount ? Coin.toAmino(message.delegationAmount, useInterfaces) : undefined; obj.equivalent_staked_amount = message.equivalentStakedAmount ? Coin.toAmino(message.equivalentStakedAmount, useInterfaces) : undefined; return obj; @@ -772,8 +772,8 @@ export const LockIdIntermediaryAccountConnection = { }, toAmino(message: LockIdIntermediaryAccountConnection, useInterfaces: boolean = true): LockIdIntermediaryAccountConnectionAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; - obj.intermediary_account = message.intermediaryAccount; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; + obj.intermediary_account = message.intermediaryAccount === "" ? undefined : message.intermediaryAccount; return obj; }, fromProtoMsg(message: LockIdIntermediaryAccountConnectionProtoMsg, useInterfaces: boolean = true): LockIdIntermediaryAccountConnection { @@ -872,7 +872,7 @@ export const UnpoolWhitelistedPools = { if (message.ids) { obj.ids = message.ids.map(e => e.toString()); } else { - obj.ids = []; + obj.ids = message.ids; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputv3/osmosis/superfluid/tx.ts index 3f34d3e621..b4d58a50f1 100644 --- a/__fixtures__/v-next/outputv3/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputv3/osmosis/superfluid/tx.ts @@ -277,9 +277,9 @@ export const MsgSuperfluidDelegate = { }, toAmino(message: MsgSuperfluidDelegate, useInterfaces: boolean = true): MsgSuperfluidDelegateAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; - obj.val_addr = message.valAddr; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; return obj; }, fromProtoMsg(message: MsgSuperfluidDelegateProtoMsg, useInterfaces: boolean = true): MsgSuperfluidDelegate { @@ -440,8 +440,8 @@ export const MsgSuperfluidUndelegate = { }, toAmino(message: MsgSuperfluidUndelegate, useInterfaces: boolean = true): MsgSuperfluidUndelegateAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromProtoMsg(message: MsgSuperfluidUndelegateProtoMsg, useInterfaces: boolean = true): MsgSuperfluidUndelegate { @@ -602,8 +602,8 @@ export const MsgSuperfluidUnbondLock = { }, toAmino(message: MsgSuperfluidUnbondLock, useInterfaces: boolean = true): MsgSuperfluidUnbondLockAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromProtoMsg(message: MsgSuperfluidUnbondLockProtoMsg, useInterfaces: boolean = true): MsgSuperfluidUnbondLock { @@ -783,13 +783,13 @@ export const MsgLockAndSuperfluidDelegate = { }, toAmino(message: MsgLockAndSuperfluidDelegate, useInterfaces: boolean = true): MsgLockAndSuperfluidDelegateAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } - obj.val_addr = message.valAddr; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; return obj; }, fromProtoMsg(message: MsgLockAndSuperfluidDelegateProtoMsg, useInterfaces: boolean = true): MsgLockAndSuperfluidDelegate { @@ -872,7 +872,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, toAmino(message: MsgLockAndSuperfluidDelegateResponse, useInterfaces: boolean = true): MsgLockAndSuperfluidDelegateResponseAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; return obj; }, fromProtoMsg(message: MsgLockAndSuperfluidDelegateResponseProtoMsg, useInterfaces: boolean = true): MsgLockAndSuperfluidDelegateResponse { @@ -970,8 +970,8 @@ export const MsgUnPoolWhitelistedPool = { }, toAmino(message: MsgUnPoolWhitelistedPool, useInterfaces: boolean = true): MsgUnPoolWhitelistedPoolAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromProtoMsg(message: MsgUnPoolWhitelistedPoolProtoMsg, useInterfaces: boolean = true): MsgUnPoolWhitelistedPool { @@ -1070,7 +1070,7 @@ export const MsgUnPoolWhitelistedPoolResponse = { if (message.exitedLockIds) { obj.exited_lock_ids = message.exitedLockIds.map(e => e.toString()); } else { - obj.exited_lock_ids = []; + obj.exited_lock_ids = message.exitedLockIds; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/superfluid/v1beta1/gov.ts b/__fixtures__/v-next/outputv3/osmosis/superfluid/v1beta1/gov.ts index 42a36ed7c3..5b8d9f82a4 100644 --- a/__fixtures__/v-next/outputv3/osmosis/superfluid/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv3/osmosis/superfluid/v1beta1/gov.ts @@ -206,12 +206,12 @@ export const SetSuperfluidAssetsProposal = { }, toAmino(message: SetSuperfluidAssetsProposal, useInterfaces: boolean = true): SetSuperfluidAssetsProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.assets) { obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e, useInterfaces) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -330,12 +330,12 @@ export const RemoveSuperfluidAssetsProposal = { }, toAmino(message: RemoveSuperfluidAssetsProposal, useInterfaces: boolean = true): RemoveSuperfluidAssetsProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.superfluidAssetDenoms) { obj.superfluid_asset_denoms = message.superfluidAssetDenoms.map(e => e); } else { - obj.superfluid_asset_denoms = []; + obj.superfluid_asset_denoms = message.superfluidAssetDenoms; } return obj; }, @@ -478,14 +478,14 @@ export const UpdateUnpoolWhiteListProposal = { }, toAmino(message: UpdateUnpoolWhiteListProposal, useInterfaces: boolean = true): UpdateUnpoolWhiteListProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.ids) { obj.ids = message.ids.map(e => e.toString()); } else { - obj.ids = []; + obj.ids = message.ids; } - obj.is_overwrite = message.isOverwrite; + obj.is_overwrite = message.isOverwrite === false ? undefined : message.isOverwrite; return obj; }, fromProtoMsg(message: UpdateUnpoolWhiteListProposalProtoMsg, useInterfaces: boolean = true): UpdateUnpoolWhiteListProposal { diff --git a/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/authorityMetadata.ts b/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/authorityMetadata.ts index 84a19ff154..c6e7ee0108 100644 --- a/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/authorityMetadata.ts +++ b/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/authorityMetadata.ts @@ -96,7 +96,7 @@ export const DenomAuthorityMetadata = { }, toAmino(message: DenomAuthorityMetadata, useInterfaces: boolean = true): DenomAuthorityMetadataAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; return obj; }, fromProtoMsg(message: DenomAuthorityMetadataProtoMsg, useInterfaces: boolean = true): DenomAuthorityMetadata { diff --git a/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/genesis.ts index a59085624d..8811eb4f33 100644 --- a/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/genesis.ts @@ -147,7 +147,7 @@ export const GenesisState = { if (message.factoryDenoms) { obj.factory_denoms = message.factoryDenoms.map(e => e ? GenesisDenom.toAmino(e, useInterfaces) : undefined); } else { - obj.factory_denoms = []; + obj.factory_denoms = message.factoryDenoms; } return obj; }, @@ -246,7 +246,7 @@ export const GenesisDenom = { }, toAmino(message: GenesisDenom, useInterfaces: boolean = true): GenesisDenomAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.authority_metadata = message.authorityMetadata ? DenomAuthorityMetadata.toAmino(message.authorityMetadata, useInterfaces) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/params.ts b/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/params.ts index 569765874a..9bcde4ddda 100644 --- a/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/params.ts @@ -92,7 +92,7 @@ export const Params = { if (message.denomCreationFee) { obj.denom_creation_fee = message.denomCreationFee.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { - obj.denom_creation_fee = []; + obj.denom_creation_fee = message.denomCreationFee; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/query.ts b/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/query.ts index a1d019a550..3db557bda0 100644 --- a/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/query.ts @@ -342,7 +342,7 @@ export const QueryDenomAuthorityMetadataRequest = { }, toAmino(message: QueryDenomAuthorityMetadataRequest, useInterfaces: boolean = true): QueryDenomAuthorityMetadataRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: QueryDenomAuthorityMetadataRequestProtoMsg, useInterfaces: boolean = true): QueryDenomAuthorityMetadataRequest { @@ -506,7 +506,7 @@ export const QueryDenomsFromCreatorRequest = { }, toAmino(message: QueryDenomsFromCreatorRequest, useInterfaces: boolean = true): QueryDenomsFromCreatorRequestAmino { const obj: any = {}; - obj.creator = message.creator; + obj.creator = message.creator === "" ? undefined : message.creator; return obj; }, fromProtoMsg(message: QueryDenomsFromCreatorRequestProtoMsg, useInterfaces: boolean = true): QueryDenomsFromCreatorRequest { @@ -596,7 +596,7 @@ export const QueryDenomsFromCreatorResponse = { if (message.denoms) { obj.denoms = message.denoms.map(e => e); } else { - obj.denoms = []; + obj.denoms = message.denoms; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/tx.ts index 8fc925902a..f5395a8c35 100644 --- a/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/tx.ts @@ -326,8 +326,8 @@ export const MsgCreateDenom = { }, toAmino(message: MsgCreateDenom, useInterfaces: boolean = true): MsgCreateDenomAmino { const obj: any = {}; - obj.sender = message.sender; - obj.subdenom = message.subdenom; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.subdenom = message.subdenom === "" ? undefined : message.subdenom; return obj; }, fromProtoMsg(message: MsgCreateDenomProtoMsg, useInterfaces: boolean = true): MsgCreateDenom { @@ -408,7 +408,7 @@ export const MsgCreateDenomResponse = { }, toAmino(message: MsgCreateDenomResponse, useInterfaces: boolean = true): MsgCreateDenomResponseAmino { const obj: any = {}; - obj.new_token_denom = message.newTokenDenom; + obj.new_token_denom = message.newTokenDenom === "" ? undefined : message.newTokenDenom; return obj; }, fromProtoMsg(message: MsgCreateDenomResponseProtoMsg, useInterfaces: boolean = true): MsgCreateDenomResponse { @@ -506,7 +506,7 @@ export const MsgMint = { }, toAmino(message: MsgMint, useInterfaces: boolean = true): MsgMintAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.amount = message.amount ? Coin.toAmino(message.amount, useInterfaces) : undefined; return obj; }, @@ -668,7 +668,7 @@ export const MsgBurn = { }, toAmino(message: MsgBurn, useInterfaces: boolean = true): MsgBurnAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.amount = message.amount ? Coin.toAmino(message.amount, useInterfaces) : undefined; return obj; }, @@ -843,9 +843,9 @@ export const MsgChangeAdmin = { }, toAmino(message: MsgChangeAdmin, useInterfaces: boolean = true): MsgChangeAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.denom = message.denom; - obj.new_admin = message.newAdmin; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromProtoMsg(message: MsgChangeAdminProtoMsg, useInterfaces: boolean = true): MsgChangeAdmin { @@ -1006,7 +1006,7 @@ export const MsgSetDenomMetadata = { }, toAmino(message: MsgSetDenomMetadata, useInterfaces: boolean = true): MsgSetDenomMetadataAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata, useInterfaces) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/genesis.ts index 99a5804f42..1294ac332a 100644 --- a/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/genesis.ts @@ -127,7 +127,7 @@ export const Params = { }, toAmino(message: Params, useInterfaces: boolean = true): ParamsAmino { const obj: any = {}; - obj.prune_epoch_identifier = message.pruneEpochIdentifier; + obj.prune_epoch_identifier = message.pruneEpochIdentifier === "" ? undefined : message.pruneEpochIdentifier; obj.record_history_keep_period = message.recordHistoryKeepPeriod ? Duration.toAmino(message.recordHistoryKeepPeriod, useInterfaces) : undefined; return obj; }, @@ -235,7 +235,7 @@ export const GenesisState = { if (message.twaps) { obj.twaps = message.twaps.map(e => e ? TwapRecord.toAmino(e, useInterfaces) : undefined); } else { - obj.twaps = []; + obj.twaps = message.twaps; } obj.params = message.params ? Params.toAmino(message.params, useInterfaces) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/query.ts b/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/query.ts index 5e3fcc87d8..86132cda4d 100644 --- a/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/query.ts @@ -224,9 +224,9 @@ export const ArithmeticTwapRequest = { }, toAmino(message: ArithmeticTwapRequest, useInterfaces: boolean = true): ArithmeticTwapRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.base_asset = message.baseAsset; - obj.quote_asset = message.quoteAsset; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset === "" ? undefined : message.baseAsset; + obj.quote_asset = message.quoteAsset === "" ? undefined : message.quoteAsset; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; return obj; @@ -309,7 +309,7 @@ export const ArithmeticTwapResponse = { }, toAmino(message: ArithmeticTwapResponse, useInterfaces: boolean = true): ArithmeticTwapResponseAmino { const obj: any = {}; - obj.arithmetic_twap = message.arithmeticTwap; + obj.arithmetic_twap = message.arithmeticTwap === "" ? undefined : message.arithmeticTwap; return obj; }, fromProtoMsg(message: ArithmeticTwapResponseProtoMsg, useInterfaces: boolean = true): ArithmeticTwapResponse { @@ -437,9 +437,9 @@ export const ArithmeticTwapToNowRequest = { }, toAmino(message: ArithmeticTwapToNowRequest, useInterfaces: boolean = true): ArithmeticTwapToNowRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.base_asset = message.baseAsset; - obj.quote_asset = message.quoteAsset; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset === "" ? undefined : message.baseAsset; + obj.quote_asset = message.quoteAsset === "" ? undefined : message.quoteAsset; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, @@ -521,7 +521,7 @@ export const ArithmeticTwapToNowResponse = { }, toAmino(message: ArithmeticTwapToNowResponse, useInterfaces: boolean = true): ArithmeticTwapToNowResponseAmino { const obj: any = {}; - obj.arithmetic_twap = message.arithmeticTwap; + obj.arithmetic_twap = message.arithmeticTwap === "" ? undefined : message.arithmeticTwap; return obj; }, fromProtoMsg(message: ArithmeticTwapToNowResponseProtoMsg, useInterfaces: boolean = true): ArithmeticTwapToNowResponse { diff --git a/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/twap_record.ts b/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/twap_record.ts index 5310bb9b1f..4117464239 100644 --- a/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/twap_record.ts +++ b/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/twap_record.ts @@ -60,7 +60,7 @@ export interface TwapRecordAmino { /** Lexicographically larger denom of the pair */ asset1_denom?: string; /** height this record corresponds to, for debugging purposes */ - height?: string; + height: string; /** * This field should only exist until we have a global registry in the state * machine, mapping prior block heights within {TIME RANGE} to times. @@ -306,15 +306,15 @@ export const TwapRecord = { }, toAmino(message: TwapRecord, useInterfaces: boolean = true): 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.asset0_denom = message.asset0Denom === "" ? undefined : message.asset0Denom; + obj.asset1_denom = message.asset1Denom === "" ? undefined : message.asset1Denom; + obj.height = message.height ? message.height.toString() : "0"; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - 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.p0_last_spot_price = message.p0LastSpotPrice === "" ? undefined : message.p0LastSpotPrice; + obj.p1_last_spot_price = message.p1LastSpotPrice === "" ? undefined : message.p1LastSpotPrice; + obj.p0_arithmetic_twap_accumulator = message.p0ArithmeticTwapAccumulator === "" ? undefined : message.p0ArithmeticTwapAccumulator; + obj.p1_arithmetic_twap_accumulator = message.p1ArithmeticTwapAccumulator === "" ? undefined : message.p1ArithmeticTwapAccumulator; obj.last_error_time = message.lastErrorTime ? Timestamp.toAmino(toTimestamp(message.lastErrorTime)) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/feetoken.ts b/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/feetoken.ts index 854a1e83d8..503d8f3b98 100644 --- a/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/feetoken.ts +++ b/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/feetoken.ts @@ -117,8 +117,8 @@ export const FeeToken = { }, toAmino(message: FeeToken, useInterfaces: boolean = true): FeeTokenAmino { const obj: any = {}; - obj.denom = message.denom; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; return obj; }, fromProtoMsg(message: FeeTokenProtoMsg, useInterfaces: boolean = true): FeeToken { diff --git a/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/genesis.ts index 98a8d5a854..1f47c1e86b 100644 --- a/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/genesis.ts @@ -107,11 +107,11 @@ export const GenesisState = { }, toAmino(message: GenesisState, useInterfaces: boolean = true): GenesisStateAmino { const obj: any = {}; - obj.basedenom = message.basedenom; + obj.basedenom = message.basedenom === "" ? undefined : message.basedenom; if (message.feetokens) { obj.feetokens = message.feetokens.map(e => e ? FeeToken.toAmino(e, useInterfaces) : undefined); } else { - obj.feetokens = []; + obj.feetokens = message.feetokens; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/gov.ts b/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/gov.ts index 24b2fd127a..0cbb20c791 100644 --- a/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/gov.ts @@ -142,8 +142,8 @@ export const UpdateFeeTokenProposal = { }, toAmino(message: UpdateFeeTokenProposal, useInterfaces: boolean = true): UpdateFeeTokenProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.feetoken = message.feetoken ? FeeToken.toAmino(message.feetoken, useInterfaces) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/query.ts b/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/query.ts index d518871abb..27b3e0db31 100644 --- a/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/query.ts @@ -259,7 +259,7 @@ export const QueryFeeTokensResponse = { if (message.feeTokens) { obj.fee_tokens = message.feeTokens.map(e => e ? FeeToken.toAmino(e, useInterfaces) : undefined); } else { - obj.fee_tokens = []; + obj.fee_tokens = message.feeTokens; } return obj; }, @@ -341,7 +341,7 @@ export const QueryDenomSpotPriceRequest = { }, toAmino(message: QueryDenomSpotPriceRequest, useInterfaces: boolean = true): QueryDenomSpotPriceRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: QueryDenomSpotPriceRequestProtoMsg, useInterfaces: boolean = true): QueryDenomSpotPriceRequest { @@ -439,8 +439,8 @@ export const QueryDenomSpotPriceResponse = { }, toAmino(message: QueryDenomSpotPriceResponse, useInterfaces: boolean = true): QueryDenomSpotPriceResponseAmino { const obj: any = {}; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; - obj.spot_price = message.spotPrice; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromProtoMsg(message: QueryDenomSpotPriceResponseProtoMsg, useInterfaces: boolean = true): QueryDenomSpotPriceResponse { @@ -521,7 +521,7 @@ export const QueryDenomPoolIdRequest = { }, toAmino(message: QueryDenomPoolIdRequest, useInterfaces: boolean = true): QueryDenomPoolIdRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromProtoMsg(message: QueryDenomPoolIdRequestProtoMsg, useInterfaces: boolean = true): QueryDenomPoolIdRequest { @@ -604,7 +604,7 @@ export const QueryDenomPoolIdResponse = { }, toAmino(message: QueryDenomPoolIdResponse, useInterfaces: boolean = true): QueryDenomPoolIdResponseAmino { const obj: any = {}; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; return obj; }, fromProtoMsg(message: QueryDenomPoolIdResponseProtoMsg, useInterfaces: boolean = true): QueryDenomPoolIdResponse { @@ -748,7 +748,7 @@ export const QueryBaseDenomResponse = { }, toAmino(message: QueryBaseDenomResponse, useInterfaces: boolean = true): QueryBaseDenomResponseAmino { const obj: any = {}; - obj.base_denom = message.baseDenom; + obj.base_denom = message.baseDenom === "" ? undefined : message.baseDenom; return obj; }, fromProtoMsg(message: QueryBaseDenomResponseProtoMsg, useInterfaces: boolean = true): QueryBaseDenomResponse { diff --git a/__fixtures__/v-next/outputv3/tendermint/abci/types.ts b/__fixtures__/v-next/outputv3/tendermint/abci/types.ts index 92301447c5..de96d8706a 100644 --- a/__fixtures__/v-next/outputv3/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputv3/tendermint/abci/types.ts @@ -1608,7 +1608,7 @@ export const RequestEcho = { }, toAmino(message: RequestEcho, useInterfaces: boolean = true): RequestEchoAmino { const obj: any = {}; - obj.message = message.message; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromProtoMsg(message: RequestEchoProtoMsg, useInterfaces: boolean = true): RequestEcho { @@ -1784,9 +1784,9 @@ export const RequestInfo = { }, toAmino(message: RequestInfo, useInterfaces: boolean = true): 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; + obj.version = message.version === "" ? undefined : message.version; + obj.block_version = message.blockVersion !== BigInt(0) ? message.blockVersion.toString() : undefined; + obj.p2p_version = message.p2pVersion !== BigInt(0) ? message.p2pVersion.toString() : undefined; return obj; }, fromProtoMsg(message: RequestInfoProtoMsg, useInterfaces: boolean = true): RequestInfo { @@ -1881,8 +1881,8 @@ export const RequestSetOption = { }, toAmino(message: RequestSetOption, useInterfaces: boolean = true): RequestSetOptionAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromProtoMsg(message: RequestSetOptionProtoMsg, useInterfaces: boolean = true): RequestSetOption { @@ -2048,15 +2048,15 @@ export const RequestInitChain = { toAmino(message: RequestInitChain, useInterfaces: boolean = true): RequestInitChainAmino { const obj: any = {}; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; obj.consensus_params = message.consensusParams ? ConsensusParams.toAmino(message.consensusParams, useInterfaces) : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? ValidatorUpdate.toAmino(e, useInterfaces) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.app_state_bytes = message.appStateBytes ? base64FromBytes(message.appStateBytes) : undefined; - obj.initial_height = message.initialHeight ? message.initialHeight.toString() : undefined; + obj.initial_height = message.initialHeight !== BigInt(0) ? message.initialHeight.toString() : undefined; return obj; }, fromProtoMsg(message: RequestInitChainProtoMsg, useInterfaces: boolean = true): RequestInitChain { @@ -2184,9 +2184,9 @@ export const RequestQuery = { toAmino(message: RequestQuery, useInterfaces: boolean = true): RequestQueryAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.path = message.path; - obj.height = message.height ? message.height.toString() : undefined; - obj.prove = message.prove; + obj.path = message.path === "" ? undefined : message.path; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.prove = message.prove === false ? undefined : message.prove; return obj; }, fromProtoMsg(message: RequestQueryProtoMsg, useInterfaces: boolean = true): RequestQuery { @@ -2327,7 +2327,7 @@ export const RequestBeginBlock = { if (message.byzantineValidators) { obj.byzantine_validators = message.byzantineValidators.map(e => e ? Evidence.toAmino(e, useInterfaces) : undefined); } else { - obj.byzantine_validators = []; + obj.byzantine_validators = message.byzantineValidators; } return obj; }, @@ -2417,14 +2417,14 @@ export const RequestCheckTx = { message.tx = bytesFromBase64(object.tx); } if (object.type !== undefined && object.type !== null) { - message.type = checkTxTypeFromJSON(object.type); + message.type = object.type; } return message; }, toAmino(message: RequestCheckTx, useInterfaces: boolean = true): RequestCheckTxAmino { const obj: any = {}; obj.tx = message.tx ? base64FromBytes(message.tx) : undefined; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; return obj; }, fromProtoMsg(message: RequestCheckTxProtoMsg, useInterfaces: boolean = true): RequestCheckTx { @@ -2586,7 +2586,7 @@ export const RequestEndBlock = { }, toAmino(message: RequestEndBlock, useInterfaces: boolean = true): RequestEndBlockAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromProtoMsg(message: RequestEndBlockProtoMsg, useInterfaces: boolean = true): RequestEndBlock { @@ -2920,9 +2920,9 @@ export const RequestLoadSnapshotChunk = { }, toAmino(message: RequestLoadSnapshotChunk, useInterfaces: boolean = true): RequestLoadSnapshotChunkAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunk = message.chunk; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunk = message.chunk === 0 ? undefined : message.chunk; return obj; }, fromProtoMsg(message: RequestLoadSnapshotChunkProtoMsg, useInterfaces: boolean = true): RequestLoadSnapshotChunk { @@ -3032,9 +3032,9 @@ export const RequestApplySnapshotChunk = { }, toAmino(message: RequestApplySnapshotChunk, useInterfaces: boolean = true): RequestApplySnapshotChunkAmino { const obj: any = {}; - obj.index = message.index; + obj.index = message.index === 0 ? undefined : message.index; obj.chunk = message.chunk ? base64FromBytes(message.chunk) : undefined; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromProtoMsg(message: RequestApplySnapshotChunkProtoMsg, useInterfaces: boolean = true): RequestApplySnapshotChunk { @@ -3466,7 +3466,7 @@ export const ResponseException = { }, toAmino(message: ResponseException, useInterfaces: boolean = true): ResponseExceptionAmino { const obj: any = {}; - obj.error = message.error; + obj.error = message.error === "" ? undefined : message.error; return obj; }, fromProtoMsg(message: ResponseExceptionProtoMsg, useInterfaces: boolean = true): ResponseException { @@ -3546,7 +3546,7 @@ export const ResponseEcho = { }, toAmino(message: ResponseEcho, useInterfaces: boolean = true): ResponseEchoAmino { const obj: any = {}; - obj.message = message.message; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromProtoMsg(message: ResponseEchoProtoMsg, useInterfaces: boolean = true): ResponseEcho { @@ -3752,10 +3752,10 @@ export const ResponseInfo = { }, toAmino(message: ResponseInfo, useInterfaces: boolean = true): 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.data = message.data === "" ? undefined : message.data; + obj.version = message.version === "" ? undefined : message.version; + obj.app_version = message.appVersion !== BigInt(0) ? message.appVersion.toString() : undefined; + obj.last_block_height = message.lastBlockHeight !== BigInt(0) ? message.lastBlockHeight.toString() : undefined; obj.last_block_app_hash = message.lastBlockAppHash ? base64FromBytes(message.lastBlockAppHash) : undefined; return obj; }, @@ -3866,9 +3866,9 @@ export const ResponseSetOption = { }, toAmino(message: ResponseSetOption, useInterfaces: boolean = true): ResponseSetOptionAmino { const obj: any = {}; - obj.code = message.code; - obj.log = message.log; - obj.info = message.info; + obj.code = message.code === 0 ? undefined : message.code; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; return obj; }, fromProtoMsg(message: ResponseSetOptionProtoMsg, useInterfaces: boolean = true): ResponseSetOption { @@ -3990,7 +3990,7 @@ export const ResponseInitChain = { if (message.validators) { obj.validators = message.validators.map(e => e ? ValidatorUpdate.toAmino(e, useInterfaces) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.app_hash = message.appHash ? base64FromBytes(message.appHash) : undefined; return obj; @@ -4198,15 +4198,15 @@ export const ResponseQuery = { }, toAmino(message: ResponseQuery, useInterfaces: boolean = true): 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.code = message.code === 0 ? undefined : message.code; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; obj.proof_ops = message.proofOps ? ProofOps.toAmino(message.proofOps, useInterfaces) : undefined; - obj.height = message.height ? message.height.toString() : undefined; - obj.codespace = message.codespace; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromProtoMsg(message: ResponseQueryProtoMsg, useInterfaces: boolean = true): ResponseQuery { @@ -4295,7 +4295,7 @@ export const ResponseBeginBlock = { if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e, useInterfaces) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -4491,18 +4491,18 @@ export const ResponseCheckTx = { }, toAmino(message: ResponseCheckTx, useInterfaces: boolean = true): ResponseCheckTxAmino { const obj: any = {}; - obj.code = message.code; + obj.code = message.code === 0 ? undefined : message.code; obj.data = message.data ? base64FromBytes(message.data) : undefined; - 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; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e, useInterfaces) : undefined); } else { - obj.events = []; + obj.events = message.events; } - obj.codespace = message.codespace; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromProtoMsg(message: ResponseCheckTxProtoMsg, useInterfaces: boolean = true): ResponseCheckTx { @@ -4697,18 +4697,18 @@ export const ResponseDeliverTx = { }, toAmino(message: ResponseDeliverTx, useInterfaces: boolean = true): ResponseDeliverTxAmino { const obj: any = {}; - obj.code = message.code; + obj.code = message.code === 0 ? undefined : message.code; obj.data = message.data ? base64FromBytes(message.data) : undefined; - 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; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e, useInterfaces) : undefined); } else { - obj.events = []; + obj.events = message.events; } - obj.codespace = message.codespace; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromProtoMsg(message: ResponseDeliverTxProtoMsg, useInterfaces: boolean = true): ResponseDeliverTx { @@ -4835,13 +4835,13 @@ export const ResponseEndBlock = { if (message.validatorUpdates) { obj.validator_updates = message.validatorUpdates.map(e => e ? ValidatorUpdate.toAmino(e, useInterfaces) : undefined); } else { - obj.validator_updates = []; + obj.validator_updates = message.validatorUpdates; } obj.consensus_param_updates = message.consensusParamUpdates ? ConsensusParams.toAmino(message.consensusParamUpdates, useInterfaces) : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e, useInterfaces) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -4940,7 +4940,7 @@ export const ResponseCommit = { toAmino(message: ResponseCommit, useInterfaces: boolean = true): ResponseCommitAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.retain_height = message.retainHeight ? message.retainHeight.toString() : undefined; + obj.retain_height = message.retainHeight !== BigInt(0) ? message.retainHeight.toString() : undefined; return obj; }, fromProtoMsg(message: ResponseCommitProtoMsg, useInterfaces: boolean = true): ResponseCommit { @@ -5029,7 +5029,7 @@ export const ResponseListSnapshots = { if (message.snapshots) { obj.snapshots = message.snapshots.map(e => e ? Snapshot.toAmino(e, useInterfaces) : undefined); } else { - obj.snapshots = []; + obj.snapshots = message.snapshots; } return obj; }, @@ -5104,13 +5104,13 @@ export const ResponseOfferSnapshot = { fromAmino(object: ResponseOfferSnapshotAmino): ResponseOfferSnapshot { const message = createBaseResponseOfferSnapshot(); if (object.result !== undefined && object.result !== null) { - message.result = responseOfferSnapshot_ResultFromJSON(object.result); + message.result = object.result; } return message; }, toAmino(message: ResponseOfferSnapshot, useInterfaces: boolean = true): ResponseOfferSnapshotAmino { const obj: any = {}; - obj.result = message.result; + obj.result = message.result === 0 ? undefined : message.result; return obj; }, fromProtoMsg(message: ResponseOfferSnapshotProtoMsg, useInterfaces: boolean = true): ResponseOfferSnapshot { @@ -5313,7 +5313,7 @@ export const ResponseApplySnapshotChunk = { fromAmino(object: ResponseApplySnapshotChunkAmino): ResponseApplySnapshotChunk { const message = createBaseResponseApplySnapshotChunk(); if (object.result !== undefined && object.result !== null) { - message.result = responseApplySnapshotChunk_ResultFromJSON(object.result); + message.result = object.result; } message.refetchChunks = object.refetch_chunks?.map(e => e) || []; message.rejectSenders = object.reject_senders?.map(e => e) || []; @@ -5321,16 +5321,16 @@ export const ResponseApplySnapshotChunk = { }, toAmino(message: ResponseApplySnapshotChunk, useInterfaces: boolean = true): ResponseApplySnapshotChunkAmino { const obj: any = {}; - obj.result = message.result; + obj.result = message.result === 0 ? undefined : message.result; if (message.refetchChunks) { obj.refetch_chunks = message.refetchChunks.map(e => e); } else { - obj.refetch_chunks = []; + obj.refetch_chunks = message.refetchChunks; } if (message.rejectSenders) { obj.reject_senders = message.rejectSenders.map(e => e); } else { - obj.reject_senders = []; + obj.reject_senders = message.rejectSenders; } return obj; }, @@ -5566,8 +5566,8 @@ export const BlockParams = { }, toAmino(message: BlockParams, useInterfaces: boolean = true): BlockParamsAmino { const obj: any = {}; - obj.max_bytes = message.maxBytes ? message.maxBytes.toString() : undefined; - obj.max_gas = message.maxGas ? message.maxGas.toString() : undefined; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas !== BigInt(0) ? message.maxGas.toString() : undefined; return obj; }, fromProtoMsg(message: BlockParamsProtoMsg, useInterfaces: boolean = true): BlockParams { @@ -5668,11 +5668,11 @@ export const LastCommitInfo = { }, toAmino(message: LastCommitInfo, useInterfaces: boolean = true): LastCommitInfoAmino { const obj: any = {}; - obj.round = message.round; + obj.round = message.round === 0 ? undefined : message.round; if (message.votes) { obj.votes = message.votes.map(e => e ? VoteInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } return obj; }, @@ -5774,11 +5774,11 @@ export const Event = { }, toAmino(message: Event, useInterfaces: boolean = true): EventAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? EventAttribute.toAmino(e, useInterfaces) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -5891,7 +5891,7 @@ export const EventAttribute = { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; - obj.index = message.index; + obj.index = message.index === false ? undefined : message.index; return obj; }, fromProtoMsg(message: EventAttributeProtoMsg, useInterfaces: boolean = true): EventAttribute { @@ -6020,8 +6020,8 @@ export const TxResult = { }, toAmino(message: TxResult, useInterfaces: boolean = true): TxResultAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.index = message.index; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.index = message.index === 0 ? undefined : message.index; obj.tx = message.tx ? base64FromBytes(message.tx) : undefined; obj.result = message.result ? ResponseDeliverTx.toAmino(message.result, useInterfaces) : undefined; return obj; @@ -6121,7 +6121,7 @@ export const Validator = { toAmino(message: Validator, useInterfaces: boolean = true): ValidatorAmino { const obj: any = {}; obj.address = message.address ? base64FromBytes(message.address) : undefined; - obj.power = message.power ? message.power.toString() : undefined; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromProtoMsg(message: ValidatorProtoMsg, useInterfaces: boolean = true): Validator { @@ -6221,7 +6221,7 @@ export const ValidatorUpdate = { toAmino(message: ValidatorUpdate, useInterfaces: boolean = true): ValidatorUpdateAmino { const obj: any = {}; obj.pub_key = message.pubKey ? PublicKey.toAmino(message.pubKey, useInterfaces) : undefined; - obj.power = message.power ? message.power.toString() : undefined; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromProtoMsg(message: ValidatorUpdateProtoMsg, useInterfaces: boolean = true): ValidatorUpdate { @@ -6319,7 +6319,7 @@ export const VoteInfo = { toAmino(message: VoteInfo, useInterfaces: boolean = true): VoteInfoAmino { const obj: any = {}; obj.validator = message.validator ? Validator.toAmino(message.validator, useInterfaces) : undefined; - obj.signed_last_block = message.signedLastBlock; + obj.signed_last_block = message.signedLastBlock === false ? undefined : message.signedLastBlock; return obj; }, fromProtoMsg(message: VoteInfoProtoMsg, useInterfaces: boolean = true): VoteInfo { @@ -6447,7 +6447,7 @@ export const Evidence = { fromAmino(object: EvidenceAmino): Evidence { const message = createBaseEvidence(); if (object.type !== undefined && object.type !== null) { - message.type = evidenceTypeFromJSON(object.type); + message.type = object.type; } if (object.validator !== undefined && object.validator !== null) { message.validator = Validator.fromAmino(object.validator); @@ -6465,11 +6465,11 @@ export const Evidence = { }, toAmino(message: Evidence, useInterfaces: boolean = true): EvidenceAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; obj.validator = message.validator ? Validator.toAmino(message.validator, useInterfaces) : undefined; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; return obj; }, fromProtoMsg(message: EvidenceProtoMsg, useInterfaces: boolean = true): Evidence { @@ -6611,9 +6611,9 @@ export const Snapshot = { }, toAmino(message: Snapshot, useInterfaces: boolean = true): SnapshotAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunks = message.chunks; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunks = message.chunks === 0 ? undefined : message.chunks; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; obj.metadata = message.metadata ? base64FromBytes(message.metadata) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv3/tendermint/crypto/proof.ts b/__fixtures__/v-next/outputv3/tendermint/crypto/proof.ts index b82ee9e401..734e6abda0 100644 --- a/__fixtures__/v-next/outputv3/tendermint/crypto/proof.ts +++ b/__fixtures__/v-next/outputv3/tendermint/crypto/proof.ts @@ -231,13 +231,13 @@ export const Proof = { }, toAmino(message: Proof, useInterfaces: boolean = true): ProofAmino { const obj: any = {}; - obj.total = message.total ? message.total.toString() : undefined; - obj.index = message.index ? message.index.toString() : undefined; + obj.total = message.total !== BigInt(0) ? message.total.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.leaf_hash = message.leafHash ? base64FromBytes(message.leafHash) : undefined; if (message.aunts) { obj.aunts = message.aunts.map(e => base64FromBytes(e)); } else { - obj.aunts = []; + obj.aunts = message.aunts; } return obj; }, @@ -446,9 +446,9 @@ export const DominoOp = { }, toAmino(message: DominoOp, useInterfaces: boolean = true): DominoOpAmino { const obj: any = {}; - obj.key = message.key; - obj.input = message.input; - obj.output = message.output; + obj.key = message.key === "" ? undefined : message.key; + obj.input = message.input === "" ? undefined : message.input; + obj.output = message.output === "" ? undefined : message.output; return obj; }, fromProtoMsg(message: DominoOpProtoMsg, useInterfaces: boolean = true): DominoOp { @@ -558,7 +558,7 @@ export const ProofOp = { }, toAmino(message: ProofOp, useInterfaces: boolean = true): ProofOpAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; @@ -649,7 +649,7 @@ export const ProofOps = { if (message.ops) { obj.ops = message.ops.map(e => e ? ProofOp.toAmino(e, useInterfaces) : undefined); } else { - obj.ops = []; + obj.ops = message.ops; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/tendermint/libs/bits/types.ts b/__fixtures__/v-next/outputv3/tendermint/libs/bits/types.ts index c12411d8f1..f4b3e6b1ba 100644 --- a/__fixtures__/v-next/outputv3/tendermint/libs/bits/types.ts +++ b/__fixtures__/v-next/outputv3/tendermint/libs/bits/types.ts @@ -113,11 +113,11 @@ export const BitArray = { }, toAmino(message: BitArray, useInterfaces: boolean = true): BitArrayAmino { const obj: any = {}; - obj.bits = message.bits ? message.bits.toString() : undefined; + obj.bits = message.bits !== BigInt(0) ? message.bits.toString() : undefined; if (message.elems) { obj.elems = message.elems.map(e => e.toString()); } else { - obj.elems = []; + obj.elems = message.elems; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/tendermint/p2p/types.ts b/__fixtures__/v-next/outputv3/tendermint/p2p/types.ts index 61d34f88cf..f28e55b20d 100644 --- a/__fixtures__/v-next/outputv3/tendermint/p2p/types.ts +++ b/__fixtures__/v-next/outputv3/tendermint/p2p/types.ts @@ -212,9 +212,9 @@ export const ProtocolVersion = { }, toAmino(message: ProtocolVersion, useInterfaces: boolean = true): 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; + obj.p2p = message.p2p !== BigInt(0) ? message.p2p.toString() : undefined; + obj.block = message.block !== BigInt(0) ? message.block.toString() : undefined; + obj.app = message.app !== BigInt(0) ? message.app.toString() : undefined; return obj; }, fromProtoMsg(message: ProtocolVersionProtoMsg, useInterfaces: boolean = true): ProtocolVersion { @@ -404,12 +404,12 @@ export const NodeInfo = { toAmino(message: NodeInfo, useInterfaces: boolean = true): NodeInfoAmino { const obj: any = {}; obj.protocol_version = message.protocolVersion ? ProtocolVersion.toAmino(message.protocolVersion, useInterfaces) : undefined; - obj.node_id = message.nodeId; - obj.listen_addr = message.listenAddr; - obj.network = message.network; - obj.version = message.version; + obj.node_id = message.nodeId === "" ? undefined : message.nodeId; + obj.listen_addr = message.listenAddr === "" ? undefined : message.listenAddr; + obj.network = message.network === "" ? undefined : message.network; + obj.version = message.version === "" ? undefined : message.version; obj.channels = message.channels ? base64FromBytes(message.channels) : undefined; - obj.moniker = message.moniker; + obj.moniker = message.moniker === "" ? undefined : message.moniker; obj.other = message.other ? NodeInfoOther.toAmino(message.other, useInterfaces) : undefined; return obj; }, @@ -505,8 +505,8 @@ export const NodeInfoOther = { }, toAmino(message: NodeInfoOther, useInterfaces: boolean = true): NodeInfoOtherAmino { const obj: any = {}; - obj.tx_index = message.txIndex; - obj.rpc_address = message.rpcAddress; + obj.tx_index = message.txIndex === "" ? undefined : message.txIndex; + obj.rpc_address = message.rpcAddress === "" ? undefined : message.rpcAddress; return obj; }, fromProtoMsg(message: NodeInfoOtherProtoMsg, useInterfaces: boolean = true): NodeInfoOther { @@ -622,11 +622,11 @@ export const PeerInfo = { }, toAmino(message: PeerInfo, useInterfaces: boolean = true): PeerInfoAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; if (message.addressInfo) { obj.address_info = message.addressInfo.map(e => e ? PeerAddressInfo.toAmino(e, useInterfaces) : undefined); } else { - obj.address_info = []; + obj.address_info = message.addressInfo; } obj.last_connected = message.lastConnected ? Timestamp.toAmino(toTimestamp(message.lastConnected)) : undefined; return obj; @@ -753,10 +753,10 @@ export const PeerAddressInfo = { }, toAmino(message: PeerAddressInfo, useInterfaces: boolean = true): PeerAddressInfoAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.last_dial_success = message.lastDialSuccess ? Timestamp.toAmino(toTimestamp(message.lastDialSuccess)) : undefined; obj.last_dial_failure = message.lastDialFailure ? Timestamp.toAmino(toTimestamp(message.lastDialFailure)) : undefined; - obj.dial_failures = message.dialFailures; + obj.dial_failures = message.dialFailures === 0 ? undefined : message.dialFailures; return obj; }, fromProtoMsg(message: PeerAddressInfoProtoMsg, useInterfaces: boolean = true): PeerAddressInfo { diff --git a/__fixtures__/v-next/outputv3/tendermint/types/evidence.ts b/__fixtures__/v-next/outputv3/tendermint/types/evidence.ts index 174d4cb0f4..5ae7131548 100644 --- a/__fixtures__/v-next/outputv3/tendermint/types/evidence.ts +++ b/__fixtures__/v-next/outputv3/tendermint/types/evidence.ts @@ -323,8 +323,8 @@ export const DuplicateVoteEvidence = { const obj: any = {}; obj.vote_a = message.voteA ? Vote.toAmino(message.voteA, useInterfaces) : undefined; obj.vote_b = message.voteB ? Vote.toAmino(message.voteB, useInterfaces) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; - obj.validator_power = message.validatorPower ? message.validatorPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; + obj.validator_power = message.validatorPower !== BigInt(0) ? message.validatorPower.toString() : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -478,13 +478,13 @@ export const LightClientAttackEvidence = { toAmino(message: LightClientAttackEvidence, useInterfaces: boolean = true): LightClientAttackEvidenceAmino { const obj: any = {}; obj.conflicting_block = message.conflictingBlock ? LightBlock.toAmino(message.conflictingBlock, useInterfaces) : undefined; - obj.common_height = message.commonHeight ? message.commonHeight.toString() : undefined; + obj.common_height = message.commonHeight !== BigInt(0) ? message.commonHeight.toString() : undefined; if (message.byzantineValidators) { obj.byzantine_validators = message.byzantineValidators.map(e => e ? Validator.toAmino(e, useInterfaces) : undefined); } else { - obj.byzantine_validators = []; + obj.byzantine_validators = message.byzantineValidators; } - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -574,7 +574,7 @@ export const EvidenceList = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Evidence.toAmino(e, useInterfaces) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } return obj; }, diff --git a/__fixtures__/v-next/outputv3/tendermint/types/params.ts b/__fixtures__/v-next/outputv3/tendermint/types/params.ts index 1905a54a07..2874a134d0 100644 --- a/__fixtures__/v-next/outputv3/tendermint/types/params.ts +++ b/__fixtures__/v-next/outputv3/tendermint/types/params.ts @@ -452,9 +452,9 @@ export const BlockParams = { }, toAmino(message: BlockParams, useInterfaces: boolean = true): 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; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas !== BigInt(0) ? message.maxGas.toString() : undefined; + obj.time_iota_ms = message.timeIotaMs !== BigInt(0) ? message.timeIotaMs.toString() : undefined; return obj; }, fromProtoMsg(message: BlockParamsProtoMsg, useInterfaces: boolean = true): BlockParams { @@ -570,9 +570,9 @@ export const EvidenceParams = { }, toAmino(message: EvidenceParams, useInterfaces: boolean = true): EvidenceParamsAmino { const obj: any = {}; - obj.max_age_num_blocks = message.maxAgeNumBlocks ? message.maxAgeNumBlocks.toString() : undefined; + obj.max_age_num_blocks = message.maxAgeNumBlocks !== BigInt(0) ? message.maxAgeNumBlocks.toString() : undefined; obj.max_age_duration = message.maxAgeDuration ? Duration.toAmino(message.maxAgeDuration, useInterfaces) : undefined; - obj.max_bytes = message.maxBytes ? message.maxBytes.toString() : undefined; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; return obj; }, fromProtoMsg(message: EvidenceParamsProtoMsg, useInterfaces: boolean = true): EvidenceParams { @@ -661,7 +661,7 @@ export const ValidatorParams = { if (message.pubKeyTypes) { obj.pub_key_types = message.pubKeyTypes.map(e => e); } else { - obj.pub_key_types = []; + obj.pub_key_types = message.pubKeyTypes; } return obj; }, @@ -744,7 +744,7 @@ export const VersionParams = { }, toAmino(message: VersionParams, useInterfaces: boolean = true): VersionParamsAmino { const obj: any = {}; - obj.app_version = message.appVersion ? message.appVersion.toString() : undefined; + obj.app_version = message.appVersion !== BigInt(0) ? message.appVersion.toString() : undefined; return obj; }, fromProtoMsg(message: VersionParamsProtoMsg, useInterfaces: boolean = true): VersionParams { @@ -843,8 +843,8 @@ export const HashedParams = { }, toAmino(message: HashedParams, useInterfaces: boolean = true): HashedParamsAmino { const obj: any = {}; - obj.block_max_bytes = message.blockMaxBytes ? message.blockMaxBytes.toString() : undefined; - obj.block_max_gas = message.blockMaxGas ? message.blockMaxGas.toString() : undefined; + obj.block_max_bytes = message.blockMaxBytes !== BigInt(0) ? message.blockMaxBytes.toString() : undefined; + obj.block_max_gas = message.blockMaxGas !== BigInt(0) ? message.blockMaxGas.toString() : undefined; return obj; }, fromProtoMsg(message: HashedParamsProtoMsg, useInterfaces: boolean = true): HashedParams { diff --git a/__fixtures__/v-next/outputv3/tendermint/types/types.ts b/__fixtures__/v-next/outputv3/tendermint/types/types.ts index e6ee90ac97..0ae6aceb8b 100644 --- a/__fixtures__/v-next/outputv3/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputv3/tendermint/types/types.ts @@ -537,7 +537,7 @@ export const PartSetHeader = { }, toAmino(message: PartSetHeader, useInterfaces: boolean = true): PartSetHeaderAmino { const obj: any = {}; - obj.total = message.total; + obj.total = message.total === 0 ? undefined : message.total; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; return obj; }, @@ -650,7 +650,7 @@ export const Part = { }, toAmino(message: Part, useInterfaces: boolean = true): PartAmino { const obj: any = {}; - obj.index = message.index; + obj.index = message.index === 0 ? undefined : message.index; obj.bytes = message.bytes ? base64FromBytes(message.bytes) : undefined; obj.proof = message.proof ? Proof.toAmino(message.proof, useInterfaces) : undefined; return obj; @@ -1032,8 +1032,8 @@ export const Header = { toAmino(message: Header, useInterfaces: boolean = true): HeaderAmino { const obj: any = {}; obj.version = message.version ? Consensus.toAmino(message.version, useInterfaces) : undefined; - obj.chain_id = message.chainId; - obj.height = message.height ? message.height.toString() : undefined; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; obj.last_block_id = message.lastBlockId ? BlockID.toAmino(message.lastBlockId, useInterfaces) : undefined; obj.last_commit_hash = message.lastCommitHash ? base64FromBytes(message.lastCommitHash) : undefined; @@ -1133,7 +1133,7 @@ export const Data = { if (message.txs) { obj.txs = message.txs.map(e => base64FromBytes(e)); } else { - obj.txs = []; + obj.txs = message.txs; } return obj; }, @@ -1296,7 +1296,7 @@ export const Vote = { fromAmino(object: VoteAmino): Vote { const message = createBaseVote(); if (object.type !== undefined && object.type !== null) { - message.type = signedMsgTypeFromJSON(object.type); + message.type = object.type; } if (object.height !== undefined && object.height !== null) { message.height = BigInt(object.height); @@ -1323,13 +1323,13 @@ export const Vote = { }, toAmino(message: Vote, useInterfaces: boolean = true): VoteAmino { const obj: any = {}; - obj.type = message.type; - obj.height = message.height ? message.height.toString() : undefined; - obj.round = message.round; + obj.type = message.type === 0 ? undefined : message.type; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId, useInterfaces) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.validator_address = message.validatorAddress ? base64FromBytes(message.validatorAddress) : undefined; - obj.validator_index = message.validatorIndex; + obj.validator_index = message.validatorIndex === 0 ? undefined : message.validatorIndex; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; return obj; }, @@ -1465,13 +1465,13 @@ export const Commit = { }, toAmino(message: Commit, useInterfaces: boolean = true): CommitAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.round = message.round; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId, useInterfaces) : undefined; if (message.signatures) { obj.signatures = message.signatures.map(e => e ? CommitSig.toAmino(e, useInterfaces) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -1582,7 +1582,7 @@ export const CommitSig = { fromAmino(object: CommitSigAmino): CommitSig { const message = createBaseCommitSig(); if (object.block_id_flag !== undefined && object.block_id_flag !== null) { - message.blockIdFlag = blockIDFlagFromJSON(object.block_id_flag); + message.blockIdFlag = object.block_id_flag; } if (object.validator_address !== undefined && object.validator_address !== null) { message.validatorAddress = bytesFromBase64(object.validator_address); @@ -1597,7 +1597,7 @@ export const CommitSig = { }, toAmino(message: CommitSig, useInterfaces: boolean = true): CommitSigAmino { const obj: any = {}; - obj.block_id_flag = message.blockIdFlag; + obj.block_id_flag = message.blockIdFlag === 0 ? undefined : message.blockIdFlag; obj.validator_address = message.validatorAddress ? base64FromBytes(message.validatorAddress) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; @@ -1750,7 +1750,7 @@ export const Proposal = { fromAmino(object: ProposalAmino): Proposal { const message = createBaseProposal(); if (object.type !== undefined && object.type !== null) { - message.type = signedMsgTypeFromJSON(object.type); + message.type = object.type; } if (object.height !== undefined && object.height !== null) { message.height = BigInt(object.height); @@ -1774,10 +1774,10 @@ export const Proposal = { }, toAmino(message: Proposal, useInterfaces: boolean = true): 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.type = message.type === 0 ? undefined : message.type; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; + obj.pol_round = message.polRound === 0 ? undefined : message.polRound; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId, useInterfaces) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; @@ -2114,9 +2114,9 @@ export const BlockMeta = { toAmino(message: BlockMeta, useInterfaces: boolean = true): BlockMetaAmino { const obj: any = {}; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId, useInterfaces) : undefined; - obj.block_size = message.blockSize ? message.blockSize.toString() : undefined; + obj.block_size = message.blockSize !== BigInt(0) ? message.blockSize.toString() : undefined; obj.header = message.header ? Header.toAmino(message.header, useInterfaces) : undefined; - obj.num_txs = message.numTxs ? message.numTxs.toString() : undefined; + obj.num_txs = message.numTxs !== BigInt(0) ? message.numTxs.toString() : undefined; return obj; }, fromProtoMsg(message: BlockMetaProtoMsg, useInterfaces: boolean = true): BlockMeta { diff --git a/__fixtures__/v-next/outputv3/tendermint/types/validator.ts b/__fixtures__/v-next/outputv3/tendermint/types/validator.ts index ae4c9d2751..8d37c26064 100644 --- a/__fixtures__/v-next/outputv3/tendermint/types/validator.ts +++ b/__fixtures__/v-next/outputv3/tendermint/types/validator.ts @@ -166,10 +166,10 @@ export const ValidatorSet = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e, useInterfaces) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.proposer = message.proposer ? Validator.toAmino(message.proposer, useInterfaces) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; return obj; }, fromProtoMsg(message: ValidatorSetProtoMsg, useInterfaces: boolean = true): ValidatorSet { @@ -302,8 +302,8 @@ export const Validator = { const obj: any = {}; obj.address = message.address ? base64FromBytes(message.address) : undefined; obj.pub_key = message.pubKey ? PublicKey.toAmino(message.pubKey, useInterfaces) : undefined; - obj.voting_power = message.votingPower ? message.votingPower.toString() : undefined; - obj.proposer_priority = message.proposerPriority ? message.proposerPriority.toString() : undefined; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority !== BigInt(0) ? message.proposerPriority.toString() : undefined; return obj; }, fromProtoMsg(message: ValidatorProtoMsg, useInterfaces: boolean = true): Validator { @@ -403,7 +403,7 @@ export const SimpleValidator = { toAmino(message: SimpleValidator, useInterfaces: boolean = true): SimpleValidatorAmino { const obj: any = {}; obj.pub_key = message.pubKey ? PublicKey.toAmino(message.pubKey, useInterfaces) : undefined; - obj.voting_power = message.votingPower ? message.votingPower.toString() : undefined; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; return obj; }, fromProtoMsg(message: SimpleValidatorProtoMsg, useInterfaces: boolean = true): SimpleValidator { diff --git a/__fixtures__/v-next/outputv3/tendermint/version/types.ts b/__fixtures__/v-next/outputv3/tendermint/version/types.ts index c3263ae9b5..06147fdf10 100644 --- a/__fixtures__/v-next/outputv3/tendermint/version/types.ts +++ b/__fixtures__/v-next/outputv3/tendermint/version/types.ts @@ -144,8 +144,8 @@ export const App = { }, toAmino(message: App, useInterfaces: boolean = true): AppAmino { const obj: any = {}; - obj.protocol = message.protocol ? message.protocol.toString() : undefined; - obj.software = message.software; + obj.protocol = message.protocol !== BigInt(0) ? message.protocol.toString() : undefined; + obj.software = message.software === "" ? undefined : message.software; return obj; }, fromProtoMsg(message: AppProtoMsg, useInterfaces: boolean = true): App { @@ -244,8 +244,8 @@ export const Consensus = { }, toAmino(message: Consensus, useInterfaces: boolean = true): ConsensusAmino { const obj: any = {}; - obj.block = message.block ? message.block.toString() : undefined; - obj.app = message.app ? message.app.toString() : undefined; + obj.block = message.block !== BigInt(0) ? message.block.toString() : undefined; + obj.app = message.app !== BigInt(0) ? message.app.toString() : undefined; return obj; }, fromProtoMsg(message: ConsensusProtoMsg, useInterfaces: boolean = true): Consensus { diff --git a/__fixtures__/v-next/outputv4/akash/audit/v1beta1/audit.ts b/__fixtures__/v-next/outputv4/akash/audit/v1beta1/audit.ts index 1c1512c55d..a78962bcef 100644 --- a/__fixtures__/v-next/outputv4/akash/audit/v1beta1/audit.ts +++ b/__fixtures__/v-next/outputv4/akash/audit/v1beta1/audit.ts @@ -215,12 +215,12 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -353,12 +353,12 @@ export const AuditedAttributes = { }, toAmino(message: AuditedAttributes): AuditedAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -462,7 +462,7 @@ export const AttributesResponse = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -588,12 +588,12 @@ export const AttributesFilters = { if (message.auditors) { obj.auditors = message.auditors.map(e => e); } else { - obj.auditors = []; + obj.auditors = message.auditors; } if (message.owners) { obj.owners = message.owners.map(e => e); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, @@ -726,12 +726,12 @@ export const MsgSignProviderAttributes = { }, toAmino(message: MsgSignProviderAttributes): MsgSignProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -938,12 +938,12 @@ export const MsgDeleteProviderAttributes = { }, toAmino(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/audit/v1beta2/audit.ts b/__fixtures__/v-next/outputv4/akash/audit/v1beta2/audit.ts index a1c4702b94..e37bc5f8cd 100644 --- a/__fixtures__/v-next/outputv4/akash/audit/v1beta2/audit.ts +++ b/__fixtures__/v-next/outputv4/akash/audit/v1beta2/audit.ts @@ -215,12 +215,12 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -353,12 +353,12 @@ export const AuditedAttributes = { }, toAmino(message: AuditedAttributes): AuditedAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -462,7 +462,7 @@ export const AttributesResponse = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -588,12 +588,12 @@ export const AttributesFilters = { if (message.auditors) { obj.auditors = message.auditors.map(e => e); } else { - obj.auditors = []; + obj.auditors = message.auditors; } if (message.owners) { obj.owners = message.owners.map(e => e); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, @@ -726,12 +726,12 @@ export const MsgSignProviderAttributes = { }, toAmino(message: MsgSignProviderAttributes): MsgSignProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + 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 = []; + obj.attributes = message.attributes; } return obj; }, @@ -938,12 +938,12 @@ export const MsgDeleteProviderAttributes = { }, toAmino(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAmino { const obj: any = {}; - obj.owner = message.owner; - obj.auditor = message.auditor; + obj.owner = message.owner ?? ""; + obj.auditor = message.auditor ?? ""; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/audit/v1beta2/genesis.ts b/__fixtures__/v-next/outputv4/akash/audit/v1beta2/genesis.ts index bac1aa7625..f377052406 100644 --- a/__fixtures__/v-next/outputv4/akash/audit/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv4/akash/audit/v1beta2/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/audit/v1beta2/query.ts b/__fixtures__/v-next/outputv4/akash/audit/v1beta2/query.ts index a463b96d2d..128754e4c6 100644 --- a/__fixtures__/v-next/outputv4/akash/audit/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv4/akash/audit/v1beta2/query.ts @@ -181,7 +181,7 @@ export const QueryProvidersResponse = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -293,8 +293,8 @@ export const QueryProviderRequest = { }, toAmino(message: QueryProviderRequest): QueryProviderRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; - obj.owner = message.owner; + obj.auditor = message.auditor === "" ? undefined : message.auditor; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest { @@ -502,7 +502,7 @@ export const QueryProviderAttributesRequest = { }, toAmino(message: QueryProviderAttributesRequest): QueryProviderAttributesRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -613,8 +613,8 @@ export const QueryProviderAuditorRequest = { }, toAmino(message: QueryProviderAuditorRequest): QueryProviderAuditorRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; - obj.owner = message.owner; + obj.auditor = message.auditor === "" ? undefined : message.auditor; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderAuditorRequestAminoMsg): QueryProviderAuditorRequest { @@ -726,7 +726,7 @@ export const QueryAuditorAttributesRequest = { }, toAmino(message: QueryAuditorAttributesRequest): QueryAuditorAttributesRequestAmino { const obj: any = {}; - obj.auditor = message.auditor; + obj.auditor = message.auditor === "" ? undefined : message.auditor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/base/v1beta1/attribute.ts b/__fixtures__/v-next/outputv4/akash/base/v1beta1/attribute.ts index deab917c14..c1e8cf5e25 100644 --- a/__fixtures__/v-next/outputv4/akash/base/v1beta1/attribute.ts +++ b/__fixtures__/v-next/outputv4/akash/base/v1beta1/attribute.ts @@ -142,8 +142,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -268,12 +268,12 @@ export const SignedBy = { if (message.allOf) { obj.all_of = message.allOf.map(e => e); } else { - obj.all_of = []; + obj.all_of = message.allOf; } if (message.anyOf) { obj.any_of = message.anyOf.map(e => e); } else { - obj.any_of = []; + obj.any_of = message.anyOf; } return obj; }, @@ -392,11 +392,11 @@ export const PlacementRequirements = { }, toAmino(message: PlacementRequirements): PlacementRequirementsAmino { const obj: any = {}; - obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : undefined; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : SignedBy.toAmino(SignedBy.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/base/v1beta1/endpoint.ts b/__fixtures__/v-next/outputv4/akash/base/v1beta1/endpoint.ts index 05431e4ef8..76b6f51da2 100644 --- a/__fixtures__/v-next/outputv4/akash/base/v1beta1/endpoint.ts +++ b/__fixtures__/v-next/outputv4/akash/base/v1beta1/endpoint.ts @@ -110,13 +110,13 @@ export const Endpoint = { fromAmino(object: EndpointAmino): Endpoint { const message = createBaseEndpoint(); if (object.kind !== undefined && object.kind !== null) { - message.kind = endpoint_KindFromJSON(object.kind); + message.kind = object.kind; } return message; }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.kind = message.kind; + obj.kind = message.kind === 0 ? undefined : message.kind; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputv4/akash/base/v1beta1/resource.ts b/__fixtures__/v-next/outputv4/akash/base/v1beta1/resource.ts index 555673d4b9..c640281aef 100644 --- a/__fixtures__/v-next/outputv4/akash/base/v1beta1/resource.ts +++ b/__fixtures__/v-next/outputv4/akash/base/v1beta1/resource.ts @@ -167,7 +167,7 @@ export const CPU = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -286,11 +286,11 @@ export const Memory = { }, toAmino(message: Memory): MemoryAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -409,11 +409,11 @@ export const Storage = { }, toAmino(message: Storage): StorageAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -574,7 +574,7 @@ export const ResourceUnits = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/base/v1beta2/attribute.ts b/__fixtures__/v-next/outputv4/akash/base/v1beta2/attribute.ts index 30e3551719..ecb63a9eb4 100644 --- a/__fixtures__/v-next/outputv4/akash/base/v1beta2/attribute.ts +++ b/__fixtures__/v-next/outputv4/akash/base/v1beta2/attribute.ts @@ -142,8 +142,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -268,12 +268,12 @@ export const SignedBy = { if (message.allOf) { obj.all_of = message.allOf.map(e => e); } else { - obj.all_of = []; + obj.all_of = message.allOf; } if (message.anyOf) { obj.any_of = message.anyOf.map(e => e); } else { - obj.any_of = []; + obj.any_of = message.anyOf; } return obj; }, @@ -392,11 +392,11 @@ export const PlacementRequirements = { }, toAmino(message: PlacementRequirements): PlacementRequirementsAmino { const obj: any = {}; - obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : undefined; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : SignedBy.toAmino(SignedBy.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/base/v1beta2/endpoint.ts b/__fixtures__/v-next/outputv4/akash/base/v1beta2/endpoint.ts index a0babecdf5..0df46f4e5b 100644 --- a/__fixtures__/v-next/outputv4/akash/base/v1beta2/endpoint.ts +++ b/__fixtures__/v-next/outputv4/akash/base/v1beta2/endpoint.ts @@ -132,7 +132,7 @@ export const Endpoint = { fromAmino(object: EndpointAmino): Endpoint { const message = createBaseEndpoint(); if (object.kind !== undefined && object.kind !== null) { - message.kind = endpoint_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.sequence_number !== undefined && object.sequence_number !== null) { message.sequenceNumber = object.sequence_number; @@ -141,8 +141,8 @@ export const Endpoint = { }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.kind = message.kind; - obj.sequence_number = message.sequenceNumber; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.sequence_number = message.sequenceNumber ?? 0; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputv4/akash/base/v1beta2/resource.ts b/__fixtures__/v-next/outputv4/akash/base/v1beta2/resource.ts index 09bed02fe5..89353bc2fd 100644 --- a/__fixtures__/v-next/outputv4/akash/base/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputv4/akash/base/v1beta2/resource.ts @@ -144,7 +144,7 @@ export const CPU = { if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -263,11 +263,11 @@ export const Memory = { }, toAmino(message: Memory): MemoryAmino { const obj: any = {}; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -402,12 +402,12 @@ export const Storage = { }, toAmino(message: Storage): StorageAmino { const obj: any = {}; - obj.name = message.name; - obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + obj.name = message.name ?? ""; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : ResourceValue.toAmino(ResourceValue.fromPartial({})); if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/base/v1beta2/resourceunits.ts b/__fixtures__/v-next/outputv4/akash/base/v1beta2/resourceunits.ts index e36ed32bd8..0eaa02e508 100644 --- a/__fixtures__/v-next/outputv4/akash/base/v1beta2/resourceunits.ts +++ b/__fixtures__/v-next/outputv4/akash/base/v1beta2/resourceunits.ts @@ -165,12 +165,12 @@ export const ResourceUnits = { if (message.storage) { obj.storage = message.storage.map(e => e ? Storage.toAmino(e) : undefined); } else { - obj.storage = []; + obj.storage = message.storage; } if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/cert/v1beta2/cert.ts b/__fixtures__/v-next/outputv4/akash/cert/v1beta2/cert.ts index f6a6ffdc7b..ef849758bf 100644 --- a/__fixtures__/v-next/outputv4/akash/cert/v1beta2/cert.ts +++ b/__fixtures__/v-next/outputv4/akash/cert/v1beta2/cert.ts @@ -217,8 +217,8 @@ export const CertificateID = { }, toAmino(message: CertificateID): CertificateIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.serial = message.serial; + obj.owner = message.owner ?? ""; + obj.serial = message.serial ?? ""; return obj; }, fromAminoMsg(object: CertificateIDAminoMsg): CertificateID { @@ -332,7 +332,7 @@ export const Certificate = { fromAmino(object: CertificateAmino): Certificate { const message = createBaseCertificate(); if (object.state !== undefined && object.state !== null) { - message.state = certificate_StateFromJSON(object.state); + message.state = object.state; } if (object.cert !== undefined && object.cert !== null) { message.cert = bytesFromBase64(object.cert); @@ -344,9 +344,9 @@ export const Certificate = { }, toAmino(message: Certificate): CertificateAmino { const obj: any = {}; - obj.state = message.state; - obj.cert = message.cert ? base64FromBytes(message.cert) : undefined; - obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : undefined; + obj.state = message.state ?? 0; + obj.cert = message.cert ? base64FromBytes(message.cert) : ""; + obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : ""; return obj; }, fromAminoMsg(object: CertificateAminoMsg): Certificate { @@ -472,9 +472,9 @@ export const CertificateFilter = { }, toAmino(message: CertificateFilter): CertificateFilterAmino { const obj: any = {}; - obj.owner = message.owner; - obj.serial = message.serial; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.serial = message.serial ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: CertificateFilterAminoMsg): CertificateFilter { @@ -600,9 +600,9 @@ export const MsgCreateCertificate = { }, toAmino(message: MsgCreateCertificate): MsgCreateCertificateAmino { const obj: any = {}; - obj.owner = message.owner; - obj.cert = message.cert ? base64FromBytes(message.cert) : undefined; - obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : undefined; + obj.owner = message.owner ?? ""; + obj.cert = message.cert ? base64FromBytes(message.cert) : ""; + obj.pubkey = message.pubkey ? base64FromBytes(message.pubkey) : ""; return obj; }, fromAminoMsg(object: MsgCreateCertificateAminoMsg): MsgCreateCertificate { @@ -772,7 +772,7 @@ export const MsgRevokeCertificate = { }, toAmino(message: MsgRevokeCertificate): MsgRevokeCertificateAmino { const obj: any = {}; - obj.id = message.id ? CertificateID.toAmino(message.id) : undefined; + obj.id = message.id ? CertificateID.toAmino(message.id) : CertificateID.toAmino(CertificateID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgRevokeCertificateAminoMsg): MsgRevokeCertificate { diff --git a/__fixtures__/v-next/outputv4/akash/cert/v1beta2/genesis.ts b/__fixtures__/v-next/outputv4/akash/cert/v1beta2/genesis.ts index 32eb7b74a9..5d914a929b 100644 --- a/__fixtures__/v-next/outputv4/akash/cert/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv4/akash/cert/v1beta2/genesis.ts @@ -115,8 +115,8 @@ export const GenesisCertificate = { }, toAmino(message: GenesisCertificate): GenesisCertificateAmino { const obj: any = {}; - obj.owner = message.owner; - obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined; + obj.owner = message.owner ?? ""; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : Certificate.toAmino(Certificate.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisCertificateAminoMsg): GenesisCertificate { @@ -219,7 +219,7 @@ export const GenesisState = { if (message.certificates) { obj.certificates = message.certificates.map(e => e ? GenesisCertificate.toAmino(e) : undefined); } else { - obj.certificates = []; + obj.certificates = message.certificates; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/cert/v1beta2/query.ts b/__fixtures__/v-next/outputv4/akash/cert/v1beta2/query.ts index 675f8ba362..17d1f5c3b1 100644 --- a/__fixtures__/v-next/outputv4/akash/cert/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv4/akash/cert/v1beta2/query.ts @@ -132,8 +132,8 @@ export const CertificateResponse = { }, toAmino(message: CertificateResponse): CertificateResponseAmino { const obj: any = {}; - obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined; - obj.serial = message.serial; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : Certificate.toAmino(Certificate.fromPartial({})); + obj.serial = message.serial ?? ""; return obj; }, fromAminoMsg(object: CertificateResponseAminoMsg): CertificateResponse { @@ -369,7 +369,7 @@ export const QueryCertificatesResponse = { if (message.certificates) { obj.certificates = message.certificates.map(e => e ? CertificateResponse.toAmino(e) : undefined); } else { - obj.certificates = []; + obj.certificates = message.certificates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/authz.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/authz.ts index d33d12c97e..7c7934f29f 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/authz.ts @@ -95,7 +95,7 @@ export const DepositDeploymentAuthorization = { }, toAmino(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAmino { const obj: any = {}; - obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/deployment.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/deployment.ts index 18a8327c7b..bdea42b9bd 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/deployment.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/deployment.ts @@ -313,14 +313,14 @@ export const MsgCreateDeployment = { }, toAmino(message: MsgCreateDeployment): MsgCreateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment { @@ -508,8 +508,8 @@ export const MsgDepositDeployment = { }, 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.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.amount = message.amount ? Coin.toAmino(message.amount) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment { @@ -717,13 +717,13 @@ export const MsgUpdateDeployment = { }, toAmino(message: MsgUpdateDeployment): MsgUpdateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; + obj.version = message.version ? base64FromBytes(message.version) : ""; return obj; }, fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment { @@ -893,7 +893,7 @@ export const MsgCloseDeployment = { }, toAmino(message: MsgCloseDeployment): MsgCloseDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment { @@ -1079,8 +1079,8 @@ export const DeploymentID = { }, toAmino(message: DeploymentID): DeploymentIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; return obj; }, fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID { @@ -1214,7 +1214,7 @@ export const Deployment = { message.deploymentId = DeploymentID.fromAmino(object.deployment_id); } if (object.state !== undefined && object.state !== null) { - message.state = deployment_StateFromJSON(object.state); + message.state = object.state; } if (object.version !== undefined && object.version !== null) { message.version = bytesFromBase64(object.version); @@ -1226,10 +1226,10 @@ export const Deployment = { }, 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 ? base64FromBytes(message.version) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.state = message.state ?? 0; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: DeploymentAminoMsg): Deployment { @@ -1357,9 +1357,9 @@ export const DeploymentFilters = { }, toAmino(message: DeploymentFilters): DeploymentFiltersAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/genesis.ts index c56045ac36..e4342465b7 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/genesis.ts @@ -125,11 +125,11 @@ export const GenesisDeployment = { }, toAmino(message: GenesisDeployment): GenesisDeploymentAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } return obj; }, @@ -251,9 +251,9 @@ export const GenesisState = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/group.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/group.ts index 4718762517..77bd5bab7d 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/group.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/group.ts @@ -256,7 +256,7 @@ export const MsgCloseGroup = { }, toAmino(message: MsgCloseGroup): MsgCloseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup { @@ -426,7 +426,7 @@ export const MsgPauseGroup = { }, toAmino(message: MsgPauseGroup): MsgPauseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup { @@ -596,7 +596,7 @@ export const MsgStartGroup = { }, toAmino(message: MsgStartGroup): MsgStartGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup { @@ -798,9 +798,9 @@ export const GroupID = { }, toAmino(message: GroupID): GroupIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.gseq = message.gseq; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; return obj; }, fromAminoMsg(object: GroupIDAminoMsg): GroupID { @@ -934,12 +934,12 @@ export const GroupSpec = { }, toAmino(message: GroupSpec): GroupSpecAmino { const obj: any = {}; - obj.name = message.name; - obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : undefined; + obj.name = message.name ?? ""; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : PlacementRequirements.toAmino(PlacementRequirements.fromPartial({})); if (message.resources) { obj.resources = message.resources.map(e => e ? Resource.toAmino(e) : undefined); } else { - obj.resources = []; + obj.resources = message.resources; } return obj; }, @@ -1076,7 +1076,7 @@ export const Group = { message.groupId = GroupID.fromAmino(object.group_id); } if (object.state !== undefined && object.state !== null) { - message.state = group_StateFromJSON(object.state); + message.state = object.state; } if (object.group_spec !== undefined && object.group_spec !== null) { message.groupSpec = GroupSpec.fromAmino(object.group_spec); @@ -1088,10 +1088,10 @@ export const Group = { }, 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; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId) : GroupID.toAmino(GroupID.fromPartial({})); + obj.state = message.state ?? 0; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: GroupAminoMsg): Group { @@ -1221,9 +1221,9 @@ export const Resource = { }, 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; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources) : ResourceUnits.toAmino(ResourceUnits.fromPartial({})); + obj.count = message.count ?? 0; + obj.price = message.price ? Coin.toAmino(message.price) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ResourceAminoMsg): Resource { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/params.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/params.ts index 6d736b7daf..ce3bc32ff9 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/params.ts @@ -85,7 +85,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/query.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/query.ts index e052dbe06b..75097f5359 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta1/query.ts @@ -297,7 +297,7 @@ export const QueryDeploymentsResponse = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -531,11 +531,11 @@ export const QueryDeploymentResponse = { }, toAmino(message: QueryDeploymentResponse): QueryDeploymentResponseAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/authz.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/authz.ts index 480cd225a2..2fa97819d2 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/authz.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/authz.ts @@ -95,7 +95,7 @@ export const DepositDeploymentAuthorization = { }, toAmino(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAmino { const obj: any = {}; - obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/deployment.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/deployment.ts index 136570db2a..2a9ba1f985 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/deployment.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/deployment.ts @@ -177,8 +177,8 @@ export const DeploymentID = { }, toAmino(message: DeploymentID): DeploymentIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; return obj; }, fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID { @@ -312,7 +312,7 @@ export const Deployment = { message.deploymentId = DeploymentID.fromAmino(object.deployment_id); } if (object.state !== undefined && object.state !== null) { - message.state = deployment_StateFromJSON(object.state); + message.state = object.state; } if (object.version !== undefined && object.version !== null) { message.version = bytesFromBase64(object.version); @@ -324,10 +324,10 @@ export const Deployment = { }, 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 ? base64FromBytes(message.version) : undefined; - obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.state = message.state ?? 0; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: DeploymentAminoMsg): Deployment { @@ -455,9 +455,9 @@ export const DeploymentFilters = { }, toAmino(message: DeploymentFilters): DeploymentFiltersAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.state = message.state; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/deploymentmsg.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/deploymentmsg.ts index ebde71e394..c166c25279 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/deploymentmsg.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/deploymentmsg.ts @@ -243,15 +243,15 @@ export const MsgCreateDeployment = { }, toAmino(message: MsgCreateDeployment): MsgCreateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } - obj.version = message.version ? base64FromBytes(message.version) : undefined; - obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined; - obj.depositor = message.depositor; + obj.version = message.version ? base64FromBytes(message.version) : ""; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); + obj.depositor = message.depositor ?? ""; return obj; }, fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment { @@ -455,9 +455,9 @@ export const MsgDepositDeployment = { }, 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; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.amount = message.amount ? Coin.toAmino(message.amount) : Coin.toAmino(Coin.fromPartial({})); + obj.depositor = message.depositor ?? ""; return obj; }, fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment { @@ -643,8 +643,8 @@ export const MsgUpdateDeployment = { }, toAmino(message: MsgUpdateDeployment): MsgUpdateDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; - obj.version = message.version ? base64FromBytes(message.version) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); + obj.version = message.version ? base64FromBytes(message.version) : ""; return obj; }, fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment { @@ -814,7 +814,7 @@ export const MsgCloseDeployment = { }, toAmino(message: MsgCloseDeployment): MsgCloseDeploymentAmino { const obj: any = {}; - obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.id = message.id ? DeploymentID.toAmino(message.id) : DeploymentID.toAmino(DeploymentID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/genesis.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/genesis.ts index 21be410cc5..5e8fb1bcff 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/genesis.ts @@ -125,11 +125,11 @@ export const GenesisDeployment = { }, toAmino(message: GenesisDeployment): GenesisDeploymentAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } return obj; }, @@ -251,9 +251,9 @@ export const GenesisState = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/group.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/group.ts index 206fbc7b39..062e1029ca 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/group.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/group.ts @@ -187,7 +187,7 @@ export const Group = { message.groupId = GroupID.fromAmino(object.group_id); } if (object.state !== undefined && object.state !== null) { - message.state = group_StateFromJSON(object.state); + message.state = object.state; } if (object.group_spec !== undefined && object.group_spec !== null) { message.groupSpec = GroupSpec.fromAmino(object.group_spec); @@ -199,10 +199,10 @@ export const Group = { }, 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; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId) : GroupID.toAmino(GroupID.fromPartial({})); + obj.state = message.state ?? 0; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: GroupAminoMsg): Group { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/groupid.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/groupid.ts index 2526a0f69d..56c8fe5f40 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/groupid.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/groupid.ts @@ -120,9 +120,9 @@ export const GroupID = { }, toAmino(message: GroupID): GroupIDAmino { const obj: any = {}; - obj.owner = message.owner; - obj.dseq = message.dseq ? message.dseq.toString() : undefined; - obj.gseq = message.gseq; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; return obj; }, fromAminoMsg(object: GroupIDAminoMsg): GroupID { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/groupmsg.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/groupmsg.ts index 7678473a12..cdc733348e 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/groupmsg.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/groupmsg.ts @@ -133,7 +133,7 @@ export const MsgCloseGroup = { }, toAmino(message: MsgCloseGroup): MsgCloseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup { @@ -303,7 +303,7 @@ export const MsgPauseGroup = { }, toAmino(message: MsgPauseGroup): MsgPauseGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup { @@ -473,7 +473,7 @@ export const MsgStartGroup = { }, toAmino(message: MsgStartGroup): MsgStartGroupAmino { const obj: any = {}; - obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + obj.id = message.id ? GroupID.toAmino(message.id) : GroupID.toAmino(GroupID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/groupspec.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/groupspec.ts index a01a9cf5c4..2fa61a4718 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/groupspec.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/groupspec.ts @@ -128,12 +128,12 @@ export const GroupSpec = { }, toAmino(message: GroupSpec): GroupSpecAmino { const obj: any = {}; - obj.name = message.name; - obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : undefined; + obj.name = message.name ?? ""; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : PlacementRequirements.toAmino(PlacementRequirements.fromPartial({})); if (message.resources) { obj.resources = message.resources.map(e => e ? Resource.toAmino(e) : undefined); } else { - obj.resources = []; + obj.resources = message.resources; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/params.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/params.ts index 272b065f4a..e8dc65f255 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/params.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/params.ts @@ -85,7 +85,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/query.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/query.ts index fa4b778be8..685288ea85 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/query.ts @@ -297,7 +297,7 @@ export const QueryDeploymentsResponse = { if (message.deployments) { obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e) : undefined); } else { - obj.deployments = []; + obj.deployments = message.deployments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -531,11 +531,11 @@ export const QueryDeploymentResponse = { }, toAmino(message: QueryDeploymentResponse): QueryDeploymentResponseAmino { const obj: any = {}; - obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : Deployment.toAmino(Deployment.fromPartial({})); if (message.groups) { obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/resource.ts b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/resource.ts index e56479dc78..a274baf4d2 100644 --- a/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputv4/akash/deployment/v1beta2/resource.ts @@ -124,9 +124,9 @@ export const Resource = { }, 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; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources) : ResourceUnits.toAmino(ResourceUnits.fromPartial({})); + obj.count = message.count ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); return obj; }, fromAminoMsg(object: ResourceAminoMsg): Resource { diff --git a/__fixtures__/v-next/outputv4/akash/escrow/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/akash/escrow/v1beta1/genesis.ts index 27ded574e3..12210d6d28 100644 --- a/__fixtures__/v-next/outputv4/akash/escrow/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/akash/escrow/v1beta1/genesis.ts @@ -116,12 +116,12 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } if (message.payments) { obj.payments = message.payments.map(e => e ? Payment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/escrow/v1beta1/query.ts b/__fixtures__/v-next/outputv4/akash/escrow/v1beta1/query.ts index ff58e714ed..e6672a7903 100644 --- a/__fixtures__/v-next/outputv4/akash/escrow/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/akash/escrow/v1beta1/query.ts @@ -208,10 +208,10 @@ export const QueryAccountsRequest = { }, toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; - obj.owner = message.owner; - obj.state = message.state; + obj.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -333,7 +333,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -511,11 +511,11 @@ export const QueryPaymentsRequest = { }, 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.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -637,7 +637,7 @@ export const QueryPaymentsResponse = { if (message.payments) { obj.payments = message.payments.map(e => e ? Payment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/akash/escrow/v1beta1/types.ts b/__fixtures__/v-next/outputv4/akash/escrow/v1beta1/types.ts index f4c38d72eb..9a8c14a44f 100644 --- a/__fixtures__/v-next/outputv4/akash/escrow/v1beta1/types.ts +++ b/__fixtures__/v-next/outputv4/akash/escrow/v1beta1/types.ts @@ -249,8 +249,8 @@ export const AccountID = { }, toAmino(message: AccountID): AccountIDAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; + obj.scope = message.scope ?? ""; + obj.xid = message.xid ?? ""; return obj; }, fromAminoMsg(object: AccountIDAminoMsg): AccountID { @@ -417,7 +417,7 @@ export const Account = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = account_StateFromJSON(object.state); + message.state = object.state; } if (object.balance !== undefined && object.balance !== null) { message.balance = Coin.fromAmino(object.balance); @@ -432,12 +432,12 @@ export const Account = { }, 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; + obj.id = message.id ? AccountID.toAmino(message.id) : AccountID.toAmino(AccountID.fromPartial({})); + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.balance = message.balance ? Coin.toAmino(message.balance) : Coin.toAmino(Coin.fromPartial({})); + obj.transferred = message.transferred ? Coin.toAmino(message.transferred) : Coin.toAmino(Coin.fromPartial({})); + obj.settled_at = message.settledAt ? message.settledAt.toString() : "0"; return obj; }, fromAminoMsg(object: AccountAminoMsg): Account { @@ -620,7 +620,7 @@ export const Payment = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = payment_StateFromJSON(object.state); + message.state = object.state; } if (object.rate !== undefined && object.rate !== null) { message.rate = Coin.fromAmino(object.rate); @@ -635,13 +635,13 @@ export const Payment = { }, 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; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId) : AccountID.toAmino(AccountID.fromPartial({})); + obj.payment_id = message.paymentId ?? ""; + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.rate = message.rate ? Coin.toAmino(message.rate) : Coin.toAmino(Coin.fromPartial({})); + obj.balance = message.balance ? Coin.toAmino(message.balance) : Coin.toAmino(Coin.fromPartial({})); + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: PaymentAminoMsg): Payment { diff --git a/__fixtures__/v-next/outputv4/akash/escrow/v1beta2/genesis.ts b/__fixtures__/v-next/outputv4/akash/escrow/v1beta2/genesis.ts index 868fa25cc5..04bb97ec14 100644 --- a/__fixtures__/v-next/outputv4/akash/escrow/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv4/akash/escrow/v1beta2/genesis.ts @@ -116,12 +116,12 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } if (message.payments) { obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/escrow/v1beta2/query.ts b/__fixtures__/v-next/outputv4/akash/escrow/v1beta2/query.ts index 8df954b7c3..f70db8abc6 100644 --- a/__fixtures__/v-next/outputv4/akash/escrow/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv4/akash/escrow/v1beta2/query.ts @@ -208,10 +208,10 @@ export const QueryAccountsRequest = { }, toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; - obj.owner = message.owner; - obj.state = message.state; + obj.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -333,7 +333,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -511,11 +511,11 @@ export const QueryPaymentsRequest = { }, 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.scope = message.scope === "" ? undefined : message.scope; + obj.xid = message.xid === "" ? undefined : message.xid; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.state = message.state === "" ? undefined : message.state; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -637,7 +637,7 @@ export const QueryPaymentsResponse = { if (message.payments) { obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e) : undefined); } else { - obj.payments = []; + obj.payments = message.payments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/akash/escrow/v1beta2/types.ts b/__fixtures__/v-next/outputv4/akash/escrow/v1beta2/types.ts index 02693e067d..060c1be323 100644 --- a/__fixtures__/v-next/outputv4/akash/escrow/v1beta2/types.ts +++ b/__fixtures__/v-next/outputv4/akash/escrow/v1beta2/types.ts @@ -262,8 +262,8 @@ export const AccountID = { }, toAmino(message: AccountID): AccountIDAmino { const obj: any = {}; - obj.scope = message.scope; - obj.xid = message.xid; + obj.scope = message.scope ?? ""; + obj.xid = message.xid ?? ""; return obj; }, fromAminoMsg(object: AccountIDAminoMsg): AccountID { @@ -458,7 +458,7 @@ export const Account = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = account_StateFromJSON(object.state); + message.state = object.state; } if (object.balance !== undefined && object.balance !== null) { message.balance = DecCoin.fromAmino(object.balance); @@ -479,14 +479,14 @@ export const Account = { }, 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; + obj.id = message.id ? AccountID.toAmino(message.id) : AccountID.toAmino(AccountID.fromPartial({})); + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.balance = message.balance ? DecCoin.toAmino(message.balance) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.transferred = message.transferred ? DecCoin.toAmino(message.transferred) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.settled_at = message.settledAt ? message.settledAt.toString() : "0"; + obj.depositor = message.depositor ?? ""; + obj.funds = message.funds ? DecCoin.toAmino(message.funds) : DecCoin.toAmino(DecCoin.fromPartial({})); return obj; }, fromAminoMsg(object: AccountAminoMsg): Account { @@ -669,7 +669,7 @@ export const FractionalPayment = { message.owner = object.owner; } if (object.state !== undefined && object.state !== null) { - message.state = fractionalPayment_StateFromJSON(object.state); + message.state = object.state; } if (object.rate !== undefined && object.rate !== null) { message.rate = DecCoin.fromAmino(object.rate); @@ -684,13 +684,13 @@ export const FractionalPayment = { }, 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; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId) : AccountID.toAmino(AccountID.fromPartial({})); + obj.payment_id = message.paymentId ?? ""; + obj.owner = message.owner ?? ""; + obj.state = message.state ?? 0; + obj.rate = message.rate ? DecCoin.toAmino(message.rate) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.balance = message.balance ? DecCoin.toAmino(message.balance) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: FractionalPaymentAminoMsg): FractionalPayment { diff --git a/__fixtures__/v-next/outputv4/akash/inflation/v1beta2/genesis.ts b/__fixtures__/v-next/outputv4/akash/inflation/v1beta2/genesis.ts index 29b268e4f4..b91bdb499a 100644 --- a/__fixtures__/v-next/outputv4/akash/inflation/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv4/akash/inflation/v1beta2/genesis.ts @@ -85,7 +85,7 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputv4/akash/inflation/v1beta2/params.ts b/__fixtures__/v-next/outputv4/akash/inflation/v1beta2/params.ts index 7ef62c405d..55c8752afe 100644 --- a/__fixtures__/v-next/outputv4/akash/inflation/v1beta2/params.ts +++ b/__fixtures__/v-next/outputv4/akash/inflation/v1beta2/params.ts @@ -128,9 +128,9 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.inflation_decay_factor = message.inflationDecayFactor; - obj.initial_inflation = message.initialInflation; - obj.variance = message.variance; + obj.inflation_decay_factor = message.inflationDecayFactor ?? ""; + obj.initial_inflation = message.initialInflation ?? ""; + obj.variance = message.variance ?? ""; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/akash/market/v1beta2/bid.ts b/__fixtures__/v-next/outputv4/akash/market/v1beta2/bid.ts index db95d0f48a..167485e3e3 100644 --- a/__fixtures__/v-next/outputv4/akash/market/v1beta2/bid.ts +++ b/__fixtures__/v-next/outputv4/akash/market/v1beta2/bid.ts @@ -293,10 +293,10 @@ export const MsgCreateBid = { }, 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; + obj.order = message.order ? OrderID.toAmino(message.order) : OrderID.toAmino(OrderID.fromPartial({})); + obj.provider = message.provider ?? ""; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : Coin.toAmino(Coin.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateBidAminoMsg): MsgCreateBid { @@ -466,7 +466,7 @@ export const MsgCloseBid = { }, toAmino(message: MsgCloseBid): MsgCloseBidAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseBidAminoMsg): MsgCloseBid { @@ -700,11 +700,11 @@ export const BidID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; return obj; }, fromAminoMsg(object: BidIDAminoMsg): BidID { @@ -840,7 +840,7 @@ export const Bid = { message.bidId = BidID.fromAmino(object.bid_id); } if (object.state !== undefined && object.state !== null) { - message.state = bid_StateFromJSON(object.state); + message.state = object.state; } if (object.price !== undefined && object.price !== null) { message.price = DecCoin.fromAmino(object.price); @@ -852,10 +852,10 @@ export const Bid = { }, 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; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); + obj.state = message.state ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: BidAminoMsg): Bid { @@ -1031,12 +1031,12 @@ export const BidFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: BidFiltersAminoMsg): BidFilters { diff --git a/__fixtures__/v-next/outputv4/akash/market/v1beta2/genesis.ts b/__fixtures__/v-next/outputv4/akash/market/v1beta2/genesis.ts index 5279f1243f..8e9edf33e0 100644 --- a/__fixtures__/v-next/outputv4/akash/market/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv4/akash/market/v1beta2/genesis.ts @@ -138,14 +138,14 @@ export const GenesisState = { if (message.orders) { obj.orders = message.orders.map(e => e ? Order.toAmino(e) : undefined); } else { - obj.orders = []; + obj.orders = message.orders; } if (message.leases) { obj.leases = message.leases.map(e => e ? Lease.toAmino(e) : undefined); } else { - obj.leases = []; + obj.leases = message.leases; } - obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : Params.toAmino(Params.fromPartial({})); return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputv4/akash/market/v1beta2/lease.ts b/__fixtures__/v-next/outputv4/akash/market/v1beta2/lease.ts index 883350ff6a..88f34d516b 100644 --- a/__fixtures__/v-next/outputv4/akash/market/v1beta2/lease.ts +++ b/__fixtures__/v-next/outputv4/akash/market/v1beta2/lease.ts @@ -308,11 +308,11 @@ export const LeaseID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; return obj; }, fromAminoMsg(object: LeaseIDAminoMsg): LeaseID { @@ -463,7 +463,7 @@ export const Lease = { message.leaseId = LeaseID.fromAmino(object.lease_id); } if (object.state !== undefined && object.state !== null) { - message.state = lease_StateFromJSON(object.state); + message.state = object.state; } if (object.price !== undefined && object.price !== null) { message.price = DecCoin.fromAmino(object.price); @@ -478,11 +478,11 @@ export const Lease = { }, 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; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : LeaseID.toAmino(LeaseID.fromPartial({})); + obj.state = message.state ?? 0; + obj.price = message.price ? DecCoin.toAmino(message.price) : DecCoin.toAmino(DecCoin.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; + obj.closed_on = message.closedOn !== BigInt(0) ? message.closedOn.toString() : undefined; return obj; }, fromAminoMsg(object: LeaseAminoMsg): Lease { @@ -658,12 +658,12 @@ export const LeaseFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.provider = message.provider ?? ""; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: LeaseFiltersAminoMsg): LeaseFilters { @@ -759,7 +759,7 @@ export const MsgCreateLease = { }, toAmino(message: MsgCreateLease): MsgCreateLeaseAmino { const obj: any = {}; - obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : BidID.toAmino(BidID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateLeaseAminoMsg): MsgCreateLease { @@ -929,7 +929,7 @@ export const MsgWithdrawLease = { }, toAmino(message: MsgWithdrawLease): MsgWithdrawLeaseAmino { const obj: any = {}; - obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId) : undefined; + obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId) : LeaseID.toAmino(LeaseID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgWithdrawLeaseAminoMsg): MsgWithdrawLease { @@ -1099,7 +1099,7 @@ export const MsgCloseLease = { }, toAmino(message: MsgCloseLease): MsgCloseLeaseAmino { const obj: any = {}; - obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : undefined; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : LeaseID.toAmino(LeaseID.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCloseLeaseAminoMsg): MsgCloseLease { diff --git a/__fixtures__/v-next/outputv4/akash/market/v1beta2/order.ts b/__fixtures__/v-next/outputv4/akash/market/v1beta2/order.ts index 180643e7c2..7ed65f9cde 100644 --- a/__fixtures__/v-next/outputv4/akash/market/v1beta2/order.ts +++ b/__fixtures__/v-next/outputv4/akash/market/v1beta2/order.ts @@ -225,10 +225,10 @@ export const OrderID = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; return obj; }, fromAminoMsg(object: OrderIDAminoMsg): OrderID { @@ -364,7 +364,7 @@ export const Order = { message.orderId = OrderID.fromAmino(object.order_id); } if (object.state !== undefined && object.state !== null) { - message.state = order_StateFromJSON(object.state); + message.state = object.state; } if (object.spec !== undefined && object.spec !== null) { message.spec = GroupSpec.fromAmino(object.spec); @@ -376,10 +376,10 @@ export const Order = { }, 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; + obj.order_id = message.orderId ? OrderID.toAmino(message.orderId) : OrderID.toAmino(OrderID.fromPartial({})); + obj.state = message.state ?? 0; + obj.spec = message.spec ? GroupSpec.toAmino(message.spec) : GroupSpec.toAmino(GroupSpec.fromPartial({})); + obj.created_at = message.createdAt !== BigInt(0) ? message.createdAt.toString() : undefined; return obj; }, fromAminoMsg(object: OrderAminoMsg): Order { @@ -539,11 +539,11 @@ export const OrderFilters = { }, 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; + obj.owner = message.owner ?? ""; + obj.dseq = message.dseq ? message.dseq.toString() : "0"; + obj.gseq = message.gseq ?? 0; + obj.oseq = message.oseq ?? 0; + obj.state = message.state ?? ""; return obj; }, fromAminoMsg(object: OrderFiltersAminoMsg): OrderFilters { diff --git a/__fixtures__/v-next/outputv4/akash/market/v1beta2/params.ts b/__fixtures__/v-next/outputv4/akash/market/v1beta2/params.ts index 99d881bfee..283be606bd 100644 --- a/__fixtures__/v-next/outputv4/akash/market/v1beta2/params.ts +++ b/__fixtures__/v-next/outputv4/akash/market/v1beta2/params.ts @@ -103,8 +103,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit) : undefined; - obj.order_max_bids = message.orderMaxBids; + obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit) : Coin.toAmino(Coin.fromPartial({})); + obj.order_max_bids = message.orderMaxBids ?? 0; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/akash/market/v1beta2/query.ts b/__fixtures__/v-next/outputv4/akash/market/v1beta2/query.ts index 7d81ae5eb0..22ec60f703 100644 --- a/__fixtures__/v-next/outputv4/akash/market/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv4/akash/market/v1beta2/query.ts @@ -377,7 +377,7 @@ export const QueryOrdersResponse = { if (message.orders) { obj.orders = message.orders.map(e => e ? Order.toAmino(e) : undefined); } else { - obj.orders = []; + obj.orders = message.orders; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -807,7 +807,7 @@ export const QueryBidsResponse = { if (message.bids) { obj.bids = message.bids.map(e => e ? QueryBidResponse.toAmino(e) : undefined); } else { - obj.bids = []; + obj.bids = message.bids; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1256,7 +1256,7 @@ export const QueryLeasesResponse = { if (message.leases) { obj.leases = message.leases.map(e => e ? QueryLeaseResponse.toAmino(e) : undefined); } else { - obj.leases = []; + obj.leases = message.leases; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/akash/provider/v1beta1/provider.ts b/__fixtures__/v-next/outputv4/akash/provider/v1beta1/provider.ts index 2f08ae04ab..ee65d646fa 100644 --- a/__fixtures__/v-next/outputv4/akash/provider/v1beta1/provider.ts +++ b/__fixtures__/v-next/outputv4/akash/provider/v1beta1/provider.ts @@ -191,8 +191,8 @@ export const ProviderInfo = { }, toAmino(message: ProviderInfo): ProviderInfoAmino { const obj: any = {}; - obj.email = message.email; - obj.website = message.website; + obj.email = message.email ?? ""; + obj.website = message.website ?? ""; return obj; }, fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo { @@ -342,14 +342,14 @@ export const MsgCreateProvider = { }, toAmino(message: MsgCreateProvider): MsgCreateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider { @@ -573,14 +573,14 @@ export const MsgUpdateProvider = { }, toAmino(message: MsgUpdateProvider): MsgUpdateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider { @@ -748,7 +748,7 @@ export const MsgDeleteProvider = { }, toAmino(message: MsgDeleteProvider): MsgDeleteProviderAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner ?? ""; return obj; }, fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider { @@ -972,14 +972,14 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: ProviderAminoMsg): Provider { diff --git a/__fixtures__/v-next/outputv4/akash/provider/v1beta2/genesis.ts b/__fixtures__/v-next/outputv4/akash/provider/v1beta2/genesis.ts index e106ac8e50..62e3969d1f 100644 --- a/__fixtures__/v-next/outputv4/akash/provider/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv4/akash/provider/v1beta2/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/akash/provider/v1beta2/provider.ts b/__fixtures__/v-next/outputv4/akash/provider/v1beta2/provider.ts index 509e5db2b8..4ecc7b636f 100644 --- a/__fixtures__/v-next/outputv4/akash/provider/v1beta2/provider.ts +++ b/__fixtures__/v-next/outputv4/akash/provider/v1beta2/provider.ts @@ -191,8 +191,8 @@ export const ProviderInfo = { }, toAmino(message: ProviderInfo): ProviderInfoAmino { const obj: any = {}; - obj.email = message.email; - obj.website = message.website; + obj.email = message.email ?? ""; + obj.website = message.website ?? ""; return obj; }, fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo { @@ -342,14 +342,14 @@ export const MsgCreateProvider = { }, toAmino(message: MsgCreateProvider): MsgCreateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider { @@ -573,14 +573,14 @@ export const MsgUpdateProvider = { }, toAmino(message: MsgUpdateProvider): MsgUpdateProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider { @@ -748,7 +748,7 @@ export const MsgDeleteProvider = { }, toAmino(message: MsgDeleteProvider): MsgDeleteProviderAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner ?? ""; return obj; }, fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider { @@ -972,14 +972,14 @@ export const Provider = { }, toAmino(message: Provider): ProviderAmino { const obj: any = {}; - obj.owner = message.owner; - obj.host_uri = message.hostUri; + 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.attributes = message.attributes; } - obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + obj.info = message.info ? ProviderInfo.toAmino(message.info) : ProviderInfo.toAmino(ProviderInfo.fromPartial({})); return obj; }, fromAminoMsg(object: ProviderAminoMsg): Provider { diff --git a/__fixtures__/v-next/outputv4/akash/provider/v1beta2/query.ts b/__fixtures__/v-next/outputv4/akash/provider/v1beta2/query.ts index feb3db5ee9..a53f2eb074 100644 --- a/__fixtures__/v-next/outputv4/akash/provider/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv4/akash/provider/v1beta2/query.ts @@ -245,7 +245,7 @@ export const QueryProvidersResponse = { if (message.providers) { obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -341,7 +341,7 @@ export const QueryProviderRequest = { }, toAmino(message: QueryProviderRequest): QueryProviderRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest { diff --git a/__fixtures__/v-next/outputv4/confio/proofs.ts b/__fixtures__/v-next/outputv4/confio/proofs.ts index 7a32e5c8c6..4536cfdf0c 100644 --- a/__fixtures__/v-next/outputv4/confio/proofs.ts +++ b/__fixtures__/v-next/outputv4/confio/proofs.ts @@ -657,7 +657,7 @@ export const ExistenceProof = { if (message.path) { obj.path = message.path.map(e => e ? InnerOp.toAmino(e) : undefined); } else { - obj.path = []; + obj.path = message.path; } return obj; }, @@ -1065,16 +1065,16 @@ export const LeafOp = { fromAmino(object: LeafOpAmino): LeafOp { const message = createBaseLeafOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prehash_key !== undefined && object.prehash_key !== null) { - message.prehashKey = hashOpFromJSON(object.prehash_key); + message.prehashKey = object.prehash_key; } if (object.prehash_value !== undefined && object.prehash_value !== null) { - message.prehashValue = hashOpFromJSON(object.prehash_value); + message.prehashValue = object.prehash_value; } if (object.length !== undefined && object.length !== null) { - message.length = lengthOpFromJSON(object.length); + message.length = object.length; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1083,10 +1083,10 @@ export const LeafOp = { }, 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.hash = message.hash === 0 ? undefined : message.hash; + obj.prehash_key = message.prehashKey === 0 ? undefined : message.prehashKey; + obj.prehash_value = message.prehashValue === 0 ? undefined : message.prehashValue; + obj.length = message.length === 0 ? undefined : message.length; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; }, @@ -1195,7 +1195,7 @@ export const InnerOp = { fromAmino(object: InnerOpAmino): InnerOp { const message = createBaseInnerOp(); if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } if (object.prefix !== undefined && object.prefix !== null) { message.prefix = bytesFromBase64(object.prefix); @@ -1207,7 +1207,7 @@ export const InnerOp = { }, toAmino(message: InnerOp): InnerOpAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; obj.suffix = message.suffix ? base64FromBytes(message.suffix) : undefined; return obj; @@ -1351,8 +1351,8 @@ export const ProofSpec = { 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; + obj.max_depth = message.maxDepth === 0 ? undefined : message.maxDepth; + obj.min_depth = message.minDepth === 0 ? undefined : message.minDepth; return obj; }, fromAminoMsg(object: ProofSpecAminoMsg): ProofSpec { @@ -1529,7 +1529,7 @@ export const InnerSpec = { message.emptyChild = bytesFromBase64(object.empty_child); } if (object.hash !== undefined && object.hash !== null) { - message.hash = hashOpFromJSON(object.hash); + message.hash = object.hash; } return message; }, @@ -1538,13 +1538,13 @@ export const InnerSpec = { if (message.childOrder) { obj.child_order = message.childOrder.map(e => e); } else { - obj.child_order = []; + obj.child_order = message.childOrder; } - obj.child_size = message.childSize; - obj.min_prefix_length = message.minPrefixLength; - obj.max_prefix_length = message.maxPrefixLength; + obj.child_size = message.childSize === 0 ? undefined : message.childSize; + obj.min_prefix_length = message.minPrefixLength === 0 ? undefined : message.minPrefixLength; + obj.max_prefix_length = message.maxPrefixLength === 0 ? undefined : message.maxPrefixLength; obj.empty_child = message.emptyChild ? base64FromBytes(message.emptyChild) : undefined; - obj.hash = message.hash; + obj.hash = message.hash === 0 ? undefined : message.hash; return obj; }, fromAminoMsg(object: InnerSpecAminoMsg): InnerSpec { @@ -1641,7 +1641,7 @@ export const BatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? BatchEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1870,12 +1870,12 @@ export const CompressedBatchProof = { if (message.entries) { obj.entries = message.entries.map(e => e ? CompressedBatchEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.lookupInners) { obj.lookup_inners = message.lookupInners.map(e => e ? InnerOp.toAmino(e) : undefined); } else { - obj.lookup_inners = []; + obj.lookup_inners = message.lookupInners; } return obj; }, @@ -2144,7 +2144,7 @@ export const CompressedExistenceProof = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/app/v1alpha1/config.ts b/__fixtures__/v-next/outputv4/cosmos/app/v1alpha1/config.ts index 52767eede2..4abd348190 100644 --- a/__fixtures__/v-next/outputv4/cosmos/app/v1alpha1/config.ts +++ b/__fixtures__/v-next/outputv4/cosmos/app/v1alpha1/config.ts @@ -139,7 +139,7 @@ export const Config = { if (message.modules) { obj.modules = message.modules.map(e => e ? ModuleConfig.toAmino(e) : undefined); } else { - obj.modules = []; + obj.modules = message.modules; } return obj; }, @@ -252,7 +252,7 @@ export const ModuleConfig = { }, toAmino(message: ModuleConfig): ModuleConfigAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.config = message.config ? Any.toAmino(message.config) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/app/v1alpha1/module.ts b/__fixtures__/v-next/outputv4/cosmos/app/v1alpha1/module.ts index 6a3fbea4b5..58090c2f19 100644 --- a/__fixtures__/v-next/outputv4/cosmos/app/v1alpha1/module.ts +++ b/__fixtures__/v-next/outputv4/cosmos/app/v1alpha1/module.ts @@ -226,16 +226,16 @@ export const ModuleDescriptor = { }, toAmino(message: ModuleDescriptor): ModuleDescriptorAmino { const obj: any = {}; - obj.go_import = message.goImport; + obj.go_import = message.goImport === "" ? undefined : message.goImport; if (message.usePackage) { obj.use_package = message.usePackage.map(e => e ? PackageReference.toAmino(e) : undefined); } else { - obj.use_package = []; + obj.use_package = message.usePackage; } if (message.canMigrateFrom) { obj.can_migrate_from = message.canMigrateFrom.map(e => e ? MigrateFromInfo.toAmino(e) : undefined); } else { - obj.can_migrate_from = []; + obj.can_migrate_from = message.canMigrateFrom; } return obj; }, @@ -346,8 +346,8 @@ export const PackageReference = { }, toAmino(message: PackageReference): PackageReferenceAmino { const obj: any = {}; - obj.name = message.name; - obj.revision = message.revision; + obj.name = message.name === "" ? undefined : message.name; + obj.revision = message.revision === 0 ? undefined : message.revision; return obj; }, fromAminoMsg(object: PackageReferenceAminoMsg): PackageReference { @@ -441,7 +441,7 @@ export const MigrateFromInfo = { }, toAmino(message: MigrateFromInfo): MigrateFromInfoAmino { const obj: any = {}; - obj.module = message.module; + obj.module = message.module === "" ? undefined : message.module; return obj; }, fromAminoMsg(object: MigrateFromInfoAminoMsg): MigrateFromInfo { diff --git a/__fixtures__/v-next/outputv4/cosmos/auth/v1beta1/auth.ts b/__fixtures__/v-next/outputv4/cosmos/auth/v1beta1/auth.ts index 60d2939ffd..0c6cdcd43d 100644 --- a/__fixtures__/v-next/outputv4/cosmos/auth/v1beta1/auth.ts +++ b/__fixtures__/v-next/outputv4/cosmos/auth/v1beta1/auth.ts @@ -187,10 +187,10 @@ export const BaseAccount = { }, toAmino(message: BaseAccount): BaseAccountAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : 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; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: BaseAccountAminoMsg): BaseAccount { @@ -325,11 +325,11 @@ export const ModuleAccount = { toAmino(message: ModuleAccount): ModuleAccountAmino { const obj: any = {}; obj.base_account = message.baseAccount ? BaseAccount.toAmino(message.baseAccount) : undefined; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.permissions) { obj.permissions = message.permissions.map(e => e); } else { - obj.permissions = []; + obj.permissions = message.permissions; } return obj; }, @@ -498,11 +498,11 @@ export const Params = { }, 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; + obj.max_memo_characters = message.maxMemoCharacters !== BigInt(0) ? message.maxMemoCharacters.toString() : undefined; + obj.tx_sig_limit = message.txSigLimit !== BigInt(0) ? message.txSigLimit.toString() : undefined; + obj.tx_size_cost_per_byte = message.txSizeCostPerByte !== BigInt(0) ? message.txSizeCostPerByte.toString() : undefined; + obj.sig_verify_cost_ed25519 = message.sigVerifyCostEd25519 !== BigInt(0) ? message.sigVerifyCostEd25519.toString() : undefined; + obj.sig_verify_cost_secp256k1 = message.sigVerifyCostSecp256k1 !== BigInt(0) ? message.sigVerifyCostSecp256k1.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/cosmos/auth/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/auth/v1beta1/genesis.ts index 17b02061a7..0df5f48e20 100644 --- a/__fixtures__/v-next/outputv4/cosmos/auth/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/auth/v1beta1/genesis.ts @@ -116,7 +116,7 @@ export const GenesisState = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/auth/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/auth/v1beta1/query.ts index 82cc5fe4f0..043f287cf7 100644 --- a/__fixtures__/v-next/outputv4/cosmos/auth/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/auth/v1beta1/query.ts @@ -376,7 +376,7 @@ export const QueryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -472,7 +472,7 @@ export const QueryAccountRequest = { }, toAmino(message: QueryAccountRequest): QueryAccountRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryAccountRequestAminoMsg): QueryAccountRequest { @@ -915,7 +915,7 @@ export const QueryModuleAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } return obj; }, @@ -1084,7 +1084,7 @@ export const Bech32PrefixResponse = { }, toAmino(message: Bech32PrefixResponse): Bech32PrefixResponseAmino { const obj: any = {}; - obj.bech32_prefix = message.bech32Prefix; + obj.bech32_prefix = message.bech32Prefix === "" ? undefined : message.bech32Prefix; return obj; }, fromAminoMsg(object: Bech32PrefixResponseAminoMsg): Bech32PrefixResponse { @@ -1272,7 +1272,7 @@ export const AddressBytesToStringResponse = { }, toAmino(message: AddressBytesToStringResponse): AddressBytesToStringResponseAmino { const obj: any = {}; - obj.address_string = message.addressString; + obj.address_string = message.addressString === "" ? undefined : message.addressString; return obj; }, fromAminoMsg(object: AddressBytesToStringResponseAminoMsg): AddressBytesToStringResponse { @@ -1366,7 +1366,7 @@ export const AddressStringToBytesRequest = { }, toAmino(message: AddressStringToBytesRequest): AddressStringToBytesRequestAmino { const obj: any = {}; - obj.address_string = message.addressString; + obj.address_string = message.addressString === "" ? undefined : message.addressString; return obj; }, fromAminoMsg(object: AddressStringToBytesRequestAminoMsg): AddressStringToBytesRequest { diff --git a/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/authz.ts b/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/authz.ts index 1b7078d9c8..6a77a18d87 100644 --- a/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/authz.ts @@ -153,7 +153,7 @@ export const GenericAuthorization = { }, toAmino(message: GenericAuthorization): GenericAuthorizationAmino { const obj: any = {}; - obj.msg = message.msg; + obj.msg = message.msg === "" ? undefined : message.msg; return obj; }, fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { @@ -410,8 +410,8 @@ export const GrantAuthorization = { }, toAmino(message: GrantAuthorization): GrantAuthorizationAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.authorization = message.authorization ? Any.toAmino(message.authorization) : undefined; obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -516,7 +516,7 @@ export const GrantQueueItem = { if (message.msgTypeUrls) { obj.msg_type_urls = message.msgTypeUrls.map(e => e); } else { - obj.msg_type_urls = []; + obj.msg_type_urls = message.msgTypeUrls; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/genesis.ts index e77fd05933..b54632ef7d 100644 --- a/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.authorization) { obj.authorization = message.authorization.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.authorization = []; + obj.authorization = message.authorization; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/query.ts index dfdf4f6386..a270d32b76 100644 --- a/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/query.ts @@ -220,9 +220,9 @@ export const QueryGrantsRequest = { }, toAmino(message: QueryGrantsRequest): QueryGrantsRequestAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -344,7 +344,7 @@ export const QueryGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -458,7 +458,7 @@ export const QueryGranterGrantsRequest = { }, toAmino(message: QueryGranterGrantsRequest): QueryGranterGrantsRequestAmino { const obj: any = {}; - obj.granter = message.granter; + obj.granter = message.granter === "" ? undefined : message.granter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -580,7 +580,7 @@ export const QueryGranterGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -694,7 +694,7 @@ export const QueryGranteeGrantsRequest = { }, toAmino(message: QueryGranteeGrantsRequest): QueryGranteeGrantsRequestAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -816,7 +816,7 @@ export const QueryGranteeGrantsResponse = { if (message.grants) { obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e) : undefined); } else { - obj.grants = []; + obj.grants = message.grants; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/tx.ts index 4a4d43b34c..563831e79c 100644 --- a/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/authz/v1beta1/tx.ts @@ -205,8 +205,8 @@ export const MsgGrant = { }, toAmino(message: MsgGrant): MsgGrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.grant = message.grant ? Grant.toAmino(message.grant) : undefined; return obj; }, @@ -310,7 +310,7 @@ export const MsgExecResponse = { if (message.results) { obj.results = message.results.map(e => base64FromBytes(e)); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -427,11 +427,11 @@ export const MsgExec = { }, toAmino(message: MsgExec): MsgExecAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -632,9 +632,9 @@ export const MsgRevoke = { }, toAmino(message: MsgRevoke): MsgRevokeAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; - obj.msg_type_url = message.msgTypeUrl; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromAminoMsg(object: MsgRevokeAminoMsg): MsgRevoke { diff --git a/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/authz.ts b/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/authz.ts index 1c0c2865db..e8630c19dc 100644 --- a/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/authz.ts @@ -102,7 +102,7 @@ export const SendAuthorization = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/bank.ts b/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/bank.ts index 0d4f5b9963..f20a349c30 100644 --- a/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/bank.ts +++ b/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/bank.ts @@ -271,9 +271,9 @@ export const Params = { if (message.sendEnabled) { obj.send_enabled = message.sendEnabled.map(e => e ? SendEnabled.toAmino(e) : undefined); } else { - obj.send_enabled = []; + obj.send_enabled = message.sendEnabled; } - obj.default_send_enabled = message.defaultSendEnabled; + obj.default_send_enabled = message.defaultSendEnabled === false ? undefined : message.defaultSendEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -383,8 +383,8 @@ export const SendEnabled = { }, toAmino(message: SendEnabled): SendEnabledAmino { const obj: any = {}; - obj.denom = message.denom; - obj.enabled = message.enabled; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.enabled = message.enabled === false ? undefined : message.enabled; return obj; }, fromAminoMsg(object: SendEnabledAminoMsg): SendEnabled { @@ -500,11 +500,11 @@ export const Input = { }, toAmino(message: Input): InputAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -621,11 +621,11 @@ export const Output = { }, toAmino(message: Output): OutputAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -729,7 +729,7 @@ export const Supply = { if (message.total) { obj.total = message.total.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total = []; + obj.total = message.total; } return obj; }, @@ -862,12 +862,12 @@ export const DenomUnit = { }, toAmino(message: DenomUnit): DenomUnitAmino { const obj: any = {}; - obj.denom = message.denom; - obj.exponent = message.exponent; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.exponent = message.exponent === 0 ? undefined : message.exponent; if (message.aliases) { obj.aliases = message.aliases.map(e => e); } else { - obj.aliases = []; + obj.aliases = message.aliases; } return obj; }, @@ -1080,18 +1080,18 @@ export const Metadata = { }, toAmino(message: Metadata): MetadataAmino { const obj: any = {}; - obj.description = message.description; + obj.description = message.description === "" ? undefined : message.description; if (message.denomUnits) { obj.denom_units = message.denomUnits.map(e => e ? DenomUnit.toAmino(e) : undefined); } else { - obj.denom_units = []; + obj.denom_units = message.denomUnits; } - 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; + obj.base = message.base === "" ? undefined : message.base; + obj.display = message.display === "" ? undefined : message.display; + obj.name = message.name === "" ? undefined : message.name; + obj.symbol = message.symbol === "" ? undefined : message.symbol; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; return obj; }, fromAminoMsg(object: MetadataAminoMsg): Metadata { diff --git a/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/genesis.ts index 87161084ad..cf1165ab68 100644 --- a/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/genesis.ts @@ -191,17 +191,17 @@ export const GenesisState = { if (message.balances) { obj.balances = message.balances.map(e => e ? Balance.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } if (message.supply) { obj.supply = message.supply.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.supply = []; + obj.supply = message.supply; } if (message.denomMetadata) { obj.denom_metadata = message.denomMetadata.map(e => e ? Metadata.toAmino(e) : undefined); } else { - obj.denom_metadata = []; + obj.denom_metadata = message.denomMetadata; } return obj; }, @@ -318,11 +318,11 @@ export const Balance = { }, toAmino(message: Balance): BalanceAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/query.ts index bed9cc5a18..e81e9b0747 100644 --- a/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/query.ts @@ -425,8 +425,8 @@ export const QueryBalanceRequest = { }, toAmino(message: QueryBalanceRequest): QueryBalanceRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.denom = message.denom; + obj.address = message.address === "" ? undefined : message.address; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest { @@ -634,7 +634,7 @@ export const QueryAllBalancesRequest = { }, toAmino(message: QueryAllBalancesRequest): QueryAllBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -756,7 +756,7 @@ export const QueryAllBalancesResponse = { if (message.balances) { obj.balances = message.balances.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -870,7 +870,7 @@ export const QuerySpendableBalancesRequest = { }, toAmino(message: QuerySpendableBalancesRequest): QuerySpendableBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -992,7 +992,7 @@ export const QuerySpendableBalancesResponse = { if (message.balances) { obj.balances = message.balances.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.balances = []; + obj.balances = message.balances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1211,7 +1211,7 @@ export const QueryTotalSupplyResponse = { if (message.supply) { obj.supply = message.supply.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.supply = []; + obj.supply = message.supply; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1307,7 +1307,7 @@ export const QuerySupplyOfRequest = { }, toAmino(message: QuerySupplyOfRequest): QuerySupplyOfRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QuerySupplyOfRequestAminoMsg): QuerySupplyOfRequest { @@ -1790,7 +1790,7 @@ export const QueryDenomsMetadataResponse = { if (message.metadatas) { obj.metadatas = message.metadatas.map(e => e ? Metadata.toAmino(e) : undefined); } else { - obj.metadatas = []; + obj.metadatas = message.metadatas; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1886,7 +1886,7 @@ export const QueryDenomMetadataRequest = { }, toAmino(message: QueryDenomMetadataRequest): QueryDenomMetadataRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomMetadataRequestAminoMsg): QueryDenomMetadataRequest { @@ -2094,7 +2094,7 @@ export const QueryDenomOwnersRequest = { }, toAmino(message: QueryDenomOwnersRequest): QueryDenomOwnersRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2207,7 +2207,7 @@ export const DenomOwner = { }, toAmino(message: DenomOwner): DenomOwnerAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined; return obj; }, @@ -2329,7 +2329,7 @@ export const QueryDenomOwnersResponse = { if (message.denomOwners) { obj.denom_owners = message.denomOwners.map(e => e ? DenomOwner.toAmino(e) : undefined); } else { - obj.denom_owners = []; + obj.denom_owners = message.denomOwners; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/tx.ts index c50d24abbb..72455f3624 100644 --- a/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/bank/v1beta1/tx.ts @@ -156,12 +156,12 @@ export const MsgSend = { }, toAmino(message: MsgSend): MsgSendAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -361,12 +361,12 @@ export const MsgMultiSend = { if (message.inputs) { obj.inputs = message.inputs.map(e => e ? Input.toAmino(e) : undefined); } else { - obj.inputs = []; + obj.inputs = message.inputs; } if (message.outputs) { obj.outputs = message.outputs.map(e => e ? Output.toAmino(e) : undefined); } else { - obj.outputs = []; + obj.outputs = message.outputs; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/base/abci/v1beta1/abci.ts b/__fixtures__/v-next/outputv4/cosmos/base/abci/v1beta1/abci.ts index 34e78a549e..c56f04653d 100644 --- a/__fixtures__/v-next/outputv4/cosmos/base/abci/v1beta1/abci.ts +++ b/__fixtures__/v-next/outputv4/cosmos/base/abci/v1beta1/abci.ts @@ -563,26 +563,26 @@ export const TxResponse = { }, 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; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.txhash = message.txhash === "" ? undefined : message.txhash; + obj.codespace = message.codespace === "" ? undefined : message.codespace; + obj.code = message.code === 0 ? undefined : message.code; + obj.data = message.data === "" ? undefined : message.data; + obj.raw_log = message.rawLog === "" ? undefined : message.rawLog; if (message.logs) { obj.logs = message.logs.map(e => e ? ABCIMessageLog.toAmino(e) : undefined); } else { - obj.logs = []; + obj.logs = message.logs; } - obj.info = message.info; - obj.gas_wanted = message.gasWanted ? message.gasWanted.toString() : undefined; - obj.gas_used = message.gasUsed ? message.gasUsed.toString() : undefined; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; obj.tx = message.tx ? Any.toAmino(message.tx) : undefined; - obj.timestamp = message.timestamp; + obj.timestamp = message.timestamp === "" ? undefined : message.timestamp; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -715,12 +715,12 @@ export const ABCIMessageLog = { }, toAmino(message: ABCIMessageLog): ABCIMessageLogAmino { const obj: any = {}; - obj.msg_index = message.msgIndex; - obj.log = message.log; + obj.msg_index = message.msgIndex ?? 0; + obj.log = message.log === "" ? undefined : message.log; if (message.events) { obj.events = message.events.map(e => e ? StringEvent.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -837,11 +837,11 @@ export const StringEvent = { }, toAmino(message: StringEvent): StringEventAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -952,8 +952,8 @@ export const Attribute = { }, toAmino(message: Attribute): AttributeAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeAminoMsg): Attribute { @@ -1067,8 +1067,8 @@ export const GasInfo = { }, 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; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; return obj; }, fromAminoMsg(object: GasInfoAminoMsg): GasInfo { @@ -1223,16 +1223,16 @@ export const Result = { toAmino(message: Result): ResultAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.log = message.log; + obj.log = message.log === "" ? undefined : message.log; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } if (message.msgResponses) { obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msg_responses = []; + obj.msg_responses = message.msgResponses; } return obj; }, @@ -1458,7 +1458,7 @@ export const MsgData = { }, toAmino(message: MsgData): MsgDataAmino { const obj: any = {}; - obj.msg_type = message.msgType; + obj.msg_type = message.msgType === "" ? undefined : message.msgType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1584,12 +1584,12 @@ export const TxMsgData = { if (message.data) { obj.data = message.data.map(e => e ? MsgData.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } if (message.msgResponses) { obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.msg_responses = []; + obj.msg_responses = message.msgResponses; } return obj; }, @@ -1780,15 +1780,15 @@ export const SearchTxsResult = { }, 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; + obj.total_count = message.totalCount !== BigInt(0) ? message.totalCount.toString() : undefined; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.page_number = message.pageNumber !== BigInt(0) ? message.pageNumber.toString() : undefined; + obj.page_total = message.pageTotal !== BigInt(0) ? message.pageTotal.toString() : undefined; + obj.limit = message.limit !== BigInt(0) ? message.limit.toString() : undefined; if (message.txs) { obj.txs = message.txs.map(e => e ? TxResponse.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/base/kv/v1beta1/kv.ts b/__fixtures__/v-next/outputv4/cosmos/base/kv/v1beta1/kv.ts index 466ecd439a..e591fb3961 100644 --- a/__fixtures__/v-next/outputv4/cosmos/base/kv/v1beta1/kv.ts +++ b/__fixtures__/v-next/outputv4/cosmos/base/kv/v1beta1/kv.ts @@ -105,7 +105,7 @@ export const Pairs = { if (message.pairs) { obj.pairs = message.pairs.map(e => e ? Pair.toAmino(e) : undefined); } else { - obj.pairs = []; + obj.pairs = message.pairs; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/base/query/v1beta1/pagination.ts b/__fixtures__/v-next/outputv4/cosmos/base/query/v1beta1/pagination.ts index 8aa1c12d87..c8852c94c9 100644 --- a/__fixtures__/v-next/outputv4/cosmos/base/query/v1beta1/pagination.ts +++ b/__fixtures__/v-next/outputv4/cosmos/base/query/v1beta1/pagination.ts @@ -239,10 +239,10 @@ export const PageRequest = { toAmino(message: PageRequest): PageRequestAmino { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; - 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; + obj.offset = message.offset !== BigInt(0) ? message.offset.toString() : undefined; + obj.limit = message.limit !== BigInt(0) ? message.limit.toString() : undefined; + obj.count_total = message.countTotal === false ? undefined : message.countTotal; + obj.reverse = message.reverse === false ? undefined : message.reverse; return obj; }, fromAminoMsg(object: PageRequestAminoMsg): PageRequest { @@ -355,7 +355,7 @@ export const PageResponse = { toAmino(message: PageResponse): PageResponseAmino { const obj: any = {}; obj.next_key = message.nextKey ? base64FromBytes(message.nextKey) : undefined; - obj.total = message.total ? message.total.toString() : undefined; + obj.total = message.total !== BigInt(0) ? message.total.toString() : undefined; return obj; }, fromAminoMsg(object: PageResponseAminoMsg): PageResponse { diff --git a/__fixtures__/v-next/outputv4/cosmos/base/reflection/v1beta1/reflection.ts b/__fixtures__/v-next/outputv4/cosmos/base/reflection/v1beta1/reflection.ts index de50b0a90b..baa1eb275a 100644 --- a/__fixtures__/v-next/outputv4/cosmos/base/reflection/v1beta1/reflection.ts +++ b/__fixtures__/v-next/outputv4/cosmos/base/reflection/v1beta1/reflection.ts @@ -211,7 +211,7 @@ export const ListAllInterfacesResponse = { if (message.interfaceNames) { obj.interface_names = message.interfaceNames.map(e => e); } else { - obj.interface_names = []; + obj.interface_names = message.interfaceNames; } return obj; }, @@ -306,7 +306,7 @@ export const ListImplementationsRequest = { }, toAmino(message: ListImplementationsRequest): ListImplementationsRequestAmino { const obj: any = {}; - obj.interface_name = message.interfaceName; + obj.interface_name = message.interfaceName === "" ? undefined : message.interfaceName; return obj; }, fromAminoMsg(object: ListImplementationsRequestAminoMsg): ListImplementationsRequest { @@ -409,7 +409,7 @@ export const ListImplementationsResponse = { if (message.implementationMessageNames) { obj.implementation_message_names = message.implementationMessageNames.map(e => e); } else { - obj.implementation_message_names = []; + obj.implementation_message_names = message.implementationMessageNames; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/base/reflection/v2alpha1/reflection.ts b/__fixtures__/v-next/outputv4/cosmos/base/reflection/v2alpha1/reflection.ts index d417225690..997c34dde8 100644 --- a/__fixtures__/v-next/outputv4/cosmos/base/reflection/v2alpha1/reflection.ts +++ b/__fixtures__/v-next/outputv4/cosmos/base/reflection/v2alpha1/reflection.ts @@ -694,11 +694,11 @@ export const TxDescriptor = { }, toAmino(message: TxDescriptor): TxDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.msgs) { obj.msgs = message.msgs.map(e => e ? MsgDescriptor.toAmino(e) : undefined); } else { - obj.msgs = []; + obj.msgs = message.msgs; } return obj; }, @@ -802,7 +802,7 @@ export const AuthnDescriptor = { if (message.signModes) { obj.sign_modes = message.signModes.map(e => e ? SigningModeDescriptor.toAmino(e) : undefined); } else { - obj.sign_modes = []; + obj.sign_modes = message.signModes; } return obj; }, @@ -929,9 +929,9 @@ export const SigningModeDescriptor = { }, toAmino(message: SigningModeDescriptor): SigningModeDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; - obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname === "" ? undefined : message.authnInfoProviderMethodFullname; return obj; }, fromAminoMsg(object: SigningModeDescriptorAminoMsg): SigningModeDescriptor { @@ -1025,7 +1025,7 @@ export const ChainDescriptor = { }, toAmino(message: ChainDescriptor): ChainDescriptorAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: ChainDescriptorAminoMsg): ChainDescriptor { @@ -1128,7 +1128,7 @@ export const CodecDescriptor = { if (message.interfaces) { obj.interfaces = message.interfaces.map(e => e ? InterfaceDescriptor.toAmino(e) : undefined); } else { - obj.interfaces = []; + obj.interfaces = message.interfaces; } return obj; }, @@ -1267,16 +1267,16 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.interfaceAcceptingMessages) { obj.interface_accepting_messages = message.interfaceAcceptingMessages.map(e => e ? InterfaceAcceptingMessageDescriptor.toAmino(e) : undefined); } else { - obj.interface_accepting_messages = []; + obj.interface_accepting_messages = message.interfaceAcceptingMessages; } if (message.interfaceImplementers) { obj.interface_implementers = message.interfaceImplementers.map(e => e ? InterfaceImplementerDescriptor.toAmino(e) : undefined); } else { - obj.interface_implementers = []; + obj.interface_implementers = message.interfaceImplementers; } return obj; }, @@ -1387,8 +1387,8 @@ export const InterfaceImplementerDescriptor = { }, toAmino(message: InterfaceImplementerDescriptor): InterfaceImplementerDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; - obj.type_url = message.typeUrl; + obj.fullname = message.fullname === "" ? undefined : message.fullname; + obj.type_url = message.typeUrl === "" ? undefined : message.typeUrl; return obj; }, fromAminoMsg(object: InterfaceImplementerDescriptorAminoMsg): InterfaceImplementerDescriptor { @@ -1504,11 +1504,11 @@ export const InterfaceAcceptingMessageDescriptor = { }, toAmino(message: InterfaceAcceptingMessageDescriptor): InterfaceAcceptingMessageDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; + obj.fullname = message.fullname === "" ? undefined : message.fullname; if (message.fieldDescriptorNames) { obj.field_descriptor_names = message.fieldDescriptorNames.map(e => e); } else { - obj.field_descriptor_names = []; + obj.field_descriptor_names = message.fieldDescriptorNames; } return obj; }, @@ -1603,7 +1603,7 @@ export const ConfigurationDescriptor = { }, toAmino(message: ConfigurationDescriptor): ConfigurationDescriptorAmino { const obj: any = {}; - obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix; + obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix === "" ? undefined : message.bech32AccountAddressPrefix; return obj; }, fromAminoMsg(object: ConfigurationDescriptorAminoMsg): ConfigurationDescriptor { @@ -1697,7 +1697,7 @@ export const MsgDescriptor = { }, toAmino(message: MsgDescriptor): MsgDescriptorAmino { const obj: any = {}; - obj.msg_type_url = message.msgTypeUrl; + obj.msg_type_url = message.msgTypeUrl === "" ? undefined : message.msgTypeUrl; return obj; }, fromAminoMsg(object: MsgDescriptorAminoMsg): MsgDescriptor { @@ -2820,7 +2820,7 @@ export const QueryServicesDescriptor = { if (message.queryServices) { obj.query_services = message.queryServices.map(e => e ? QueryServiceDescriptor.toAmino(e) : undefined); } else { - obj.query_services = []; + obj.query_services = message.queryServices; } return obj; }, @@ -2953,12 +2953,12 @@ export const QueryServiceDescriptor = { }, toAmino(message: QueryServiceDescriptor): QueryServiceDescriptorAmino { const obj: any = {}; - obj.fullname = message.fullname; - obj.is_module = message.isModule; + obj.fullname = message.fullname === "" ? undefined : message.fullname; + obj.is_module = message.isModule === false ? undefined : message.isModule; if (message.methods) { obj.methods = message.methods.map(e => e ? QueryMethodDescriptor.toAmino(e) : undefined); } else { - obj.methods = []; + obj.methods = message.methods; } return obj; }, @@ -3069,8 +3069,8 @@ export const QueryMethodDescriptor = { }, toAmino(message: QueryMethodDescriptor): QueryMethodDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.full_query_path = message.fullQueryPath; + obj.name = message.name === "" ? undefined : message.name; + obj.full_query_path = message.fullQueryPath === "" ? undefined : message.fullQueryPath; return obj; }, fromAminoMsg(object: QueryMethodDescriptorAminoMsg): QueryMethodDescriptor { diff --git a/__fixtures__/v-next/outputv4/cosmos/base/snapshots/v1beta1/snapshot.ts b/__fixtures__/v-next/outputv4/cosmos/base/snapshots/v1beta1/snapshot.ts index fa28d3445a..cf4ec701d6 100644 --- a/__fixtures__/v-next/outputv4/cosmos/base/snapshots/v1beta1/snapshot.ts +++ b/__fixtures__/v-next/outputv4/cosmos/base/snapshots/v1beta1/snapshot.ts @@ -277,9 +277,9 @@ export const Snapshot = { }, toAmino(message: Snapshot): SnapshotAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunks = message.chunks; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunks = message.chunks === 0 ? undefined : message.chunks; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; @@ -384,7 +384,7 @@ export const Metadata = { if (message.chunkHashes) { obj.chunk_hashes = message.chunkHashes.map(e => base64FromBytes(e)); } else { - obj.chunk_hashes = []; + obj.chunk_hashes = message.chunkHashes; } return obj; }, @@ -670,7 +670,7 @@ export const SnapshotStoreItem = { }, toAmino(message: SnapshotStoreItem): SnapshotStoreItemAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: SnapshotStoreItemAminoMsg): SnapshotStoreItem { @@ -816,8 +816,8 @@ export const SnapshotIAVLItem = { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; - obj.version = message.version ? message.version.toString() : undefined; - obj.height = message.height; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; + obj.height = message.height === 0 ? undefined : message.height; return obj; }, fromAminoMsg(object: SnapshotIAVLItemAminoMsg): SnapshotIAVLItem { @@ -927,8 +927,8 @@ export const SnapshotExtensionMeta = { }, toAmino(message: SnapshotExtensionMeta): SnapshotExtensionMetaAmino { const obj: any = {}; - obj.name = message.name; - obj.format = message.format; + obj.name = message.name === "" ? undefined : message.name; + obj.format = message.format === 0 ? undefined : message.format; return obj; }, fromAminoMsg(object: SnapshotExtensionMetaAminoMsg): SnapshotExtensionMeta { @@ -1236,7 +1236,7 @@ export const SnapshotSchema = { if (message.keys) { obj.keys = message.keys.map(e => base64FromBytes(e)); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/base/store/v1beta1/commit_info.ts b/__fixtures__/v-next/outputv4/cosmos/base/store/v1beta1/commit_info.ts index deff71edfe..41b0949aaa 100644 --- a/__fixtures__/v-next/outputv4/cosmos/base/store/v1beta1/commit_info.ts +++ b/__fixtures__/v-next/outputv4/cosmos/base/store/v1beta1/commit_info.ts @@ -154,11 +154,11 @@ export const CommitInfo = { }, toAmino(message: CommitInfo): CommitInfoAmino { const obj: any = {}; - obj.version = message.version ? message.version.toString() : undefined; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; if (message.storeInfos) { obj.store_infos = message.storeInfos.map(e => e ? StoreInfo.toAmino(e) : undefined); } else { - obj.store_infos = []; + obj.store_infos = message.storeInfos; } return obj; }, @@ -271,7 +271,7 @@ export const StoreInfo = { }, toAmino(message: StoreInfo): StoreInfoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.commit_id = message.commitId ? CommitID.toAmino(message.commitId) : undefined; return obj; }, @@ -384,7 +384,7 @@ export const CommitID = { }, toAmino(message: CommitID): CommitIDAmino { const obj: any = {}; - obj.version = message.version ? message.version.toString() : undefined; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/base/store/v1beta1/listening.ts b/__fixtures__/v-next/outputv4/cosmos/base/store/v1beta1/listening.ts index b656b5422b..23924bf152 100644 --- a/__fixtures__/v-next/outputv4/cosmos/base/store/v1beta1/listening.ts +++ b/__fixtures__/v-next/outputv4/cosmos/base/store/v1beta1/listening.ts @@ -150,8 +150,8 @@ export const StoreKVPair = { }, toAmino(message: StoreKVPair): StoreKVPairAmino { const obj: any = {}; - obj.store_key = message.storeKey; - obj.delete = message.delete; + obj.store_key = message.storeKey === "" ? undefined : message.storeKey; + obj.delete = message.delete === false ? undefined : message.delete; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/cosmos/base/tendermint/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/base/tendermint/v1beta1/query.ts index f3630c25cf..e27447c1b3 100644 --- a/__fixtures__/v-next/outputv4/cosmos/base/tendermint/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/base/tendermint/v1beta1/query.ts @@ -311,7 +311,7 @@ export const GetValidatorSetByHeightRequest = { }, toAmino(message: GetValidatorSetByHeightRequest): GetValidatorSetByHeightRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -448,11 +448,11 @@ export const GetValidatorSetByHeightResponse = { }, toAmino(message: GetValidatorSetByHeightResponse): GetValidatorSetByHeightResponseAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -686,11 +686,11 @@ export const GetLatestValidatorSetResponse = { }, toAmino(message: GetLatestValidatorSetResponse): GetLatestValidatorSetResponseAmino { const obj: any = {}; - obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -840,10 +840,10 @@ export const Validator = { }, toAmino(message: Validator): ValidatorAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority !== BigInt(0) ? message.proposerPriority.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -939,7 +939,7 @@ export const GetBlockByHeightRequest = { }, toAmino(message: GetBlockByHeightRequest): GetBlockByHeightRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: GetBlockByHeightRequestAminoMsg): GetBlockByHeightRequest { @@ -1411,7 +1411,7 @@ export const GetSyncingResponse = { }, toAmino(message: GetSyncingResponse): GetSyncingResponseAmino { const obj: any = {}; - obj.syncing = message.syncing; + obj.syncing = message.syncing === false ? undefined : message.syncing; return obj; }, fromAminoMsg(object: GetSyncingResponseAminoMsg): GetSyncingResponse { @@ -1812,18 +1812,18 @@ export const VersionInfo = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.app_name = message.appName === "" ? undefined : message.appName; + obj.version = message.version === "" ? undefined : message.version; + obj.git_commit = message.gitCommit === "" ? undefined : message.gitCommit; + obj.build_tags = message.buildTags === "" ? undefined : message.buildTags; + obj.go_version = message.goVersion === "" ? undefined : message.goVersion; if (message.buildDeps) { obj.build_deps = message.buildDeps.map(e => e ? Module.toAmino(e) : undefined); } else { - obj.build_deps = []; + obj.build_deps = message.buildDeps; } - obj.cosmos_sdk_version = message.cosmosSdkVersion; + obj.cosmos_sdk_version = message.cosmosSdkVersion === "" ? undefined : message.cosmosSdkVersion; return obj; }, fromAminoMsg(object: VersionInfoAminoMsg): VersionInfo { @@ -1949,9 +1949,9 @@ export const Module = { }, toAmino(message: Module): ModuleAmino { const obj: any = {}; - obj.path = message.path; - obj.version = message.version; - obj.sum = message.sum; + obj.path = message.path === "" ? undefined : message.path; + obj.version = message.version === "" ? undefined : message.version; + obj.sum = message.sum === "" ? undefined : message.sum; return obj; }, fromAminoMsg(object: ModuleAminoMsg): Module { diff --git a/__fixtures__/v-next/outputv4/cosmos/base/v1beta1/coin.ts b/__fixtures__/v-next/outputv4/cosmos/base/v1beta1/coin.ts index 9f3ca4c968..4ff5ee250a 100644 --- a/__fixtures__/v-next/outputv4/cosmos/base/v1beta1/coin.ts +++ b/__fixtures__/v-next/outputv4/cosmos/base/v1beta1/coin.ts @@ -158,8 +158,8 @@ export const Coin = { }, toAmino(message: Coin): CoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: CoinAminoMsg): Coin { @@ -269,8 +269,8 @@ export const DecCoin = { }, toAmino(message: DecCoin): DecCoinAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: DecCoinAminoMsg): DecCoin { @@ -364,7 +364,7 @@ export const IntProto = { }, toAmino(message: IntProto): IntProtoAmino { const obj: any = {}; - obj.int = message.int; + obj.int = message.int === "" ? undefined : message.int; return obj; }, fromAminoMsg(object: IntProtoAminoMsg): IntProto { @@ -458,7 +458,7 @@ export const DecProto = { }, toAmino(message: DecProto): DecProtoAmino { const obj: any = {}; - obj.dec = message.dec; + obj.dec = message.dec === "" ? undefined : message.dec; return obj; }, fromAminoMsg(object: DecProtoAminoMsg): DecProto { diff --git a/__fixtures__/v-next/outputv4/cosmos/capability/v1beta1/capability.ts b/__fixtures__/v-next/outputv4/cosmos/capability/v1beta1/capability.ts index 2e46e5e4a5..6b7d06d10b 100644 --- a/__fixtures__/v-next/outputv4/cosmos/capability/v1beta1/capability.ts +++ b/__fixtures__/v-next/outputv4/cosmos/capability/v1beta1/capability.ts @@ -128,7 +128,7 @@ export const Capability = { }, toAmino(message: Capability): CapabilityAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; return obj; }, fromAminoMsg(object: CapabilityAminoMsg): Capability { @@ -238,8 +238,8 @@ export const Owner = { }, toAmino(message: Owner): OwnerAmino { const obj: any = {}; - obj.module = message.module; - obj.name = message.name; + obj.module = message.module === "" ? undefined : message.module; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: OwnerAminoMsg): Owner { @@ -342,7 +342,7 @@ export const CapabilityOwners = { if (message.owners) { obj.owners = message.owners.map(e => e ? Owner.toAmino(e) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/capability/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/capability/v1beta1/genesis.ts index 0d27dc8b08..9d53937e94 100644 --- a/__fixtures__/v-next/outputv4/cosmos/capability/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/capability/v1beta1/genesis.ts @@ -126,7 +126,7 @@ export const GenesisOwners = { }, toAmino(message: GenesisOwners): GenesisOwnersAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.index_owners = message.indexOwners ? CapabilityOwners.toAmino(message.indexOwners) : undefined; return obj; }, @@ -245,11 +245,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; if (message.owners) { obj.owners = message.owners.map(e => e ? GenesisOwners.toAmino(e) : undefined); } else { - obj.owners = []; + obj.owners = message.owners; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/crisis/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/crisis/v1beta1/tx.ts index 24773ba8c6..d7d8a0d9f6 100644 --- a/__fixtures__/v-next/outputv4/cosmos/crisis/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/crisis/v1beta1/tx.ts @@ -126,9 +126,9 @@ export const MsgVerifyInvariant = { }, toAmino(message: MsgVerifyInvariant): MsgVerifyInvariantAmino { const obj: any = {}; - obj.sender = message.sender; - obj.invariant_module_name = message.invariantModuleName; - obj.invariant_route = message.invariantRoute; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.invariant_module_name = message.invariantModuleName === "" ? undefined : message.invariantModuleName; + obj.invariant_route = message.invariantRoute === "" ? undefined : message.invariantRoute; return obj; }, fromAminoMsg(object: MsgVerifyInvariantAminoMsg): MsgVerifyInvariant { diff --git a/__fixtures__/v-next/outputv4/cosmos/crypto/hd/v1/hd.ts b/__fixtures__/v-next/outputv4/cosmos/crypto/hd/v1/hd.ts index cacd6c2bf9..e6b9131273 100644 --- a/__fixtures__/v-next/outputv4/cosmos/crypto/hd/v1/hd.ts +++ b/__fixtures__/v-next/outputv4/cosmos/crypto/hd/v1/hd.ts @@ -162,11 +162,11 @@ export const BIP44Params = { }, 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; + obj.purpose = message.purpose === 0 ? undefined : message.purpose; + obj.coin_type = message.coinType === 0 ? undefined : message.coinType; + obj.account = message.account === 0 ? undefined : message.account; + obj.change = message.change === false ? undefined : message.change; + obj.address_index = message.addressIndex === 0 ? undefined : message.addressIndex; return obj; }, fromAminoMsg(object: BIP44ParamsAminoMsg): BIP44Params { diff --git a/__fixtures__/v-next/outputv4/cosmos/crypto/keyring/v1/record.ts b/__fixtures__/v-next/outputv4/cosmos/crypto/keyring/v1/record.ts index fbe16f825d..0afcc743c5 100644 --- a/__fixtures__/v-next/outputv4/cosmos/crypto/keyring/v1/record.ts +++ b/__fixtures__/v-next/outputv4/cosmos/crypto/keyring/v1/record.ts @@ -238,7 +238,7 @@ export const Record = { }, toAmino(message: Record): RecordAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : 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; @@ -356,7 +356,7 @@ export const Record_Local = { 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; + obj.priv_key_type = message.privKeyType === "" ? undefined : message.privKeyType; return obj; }, fromAminoMsg(object: Record_LocalAminoMsg): Record_Local { diff --git a/__fixtures__/v-next/outputv4/cosmos/crypto/multisig/keys.ts b/__fixtures__/v-next/outputv4/cosmos/crypto/multisig/keys.ts index c44dff19a6..aabd5a7261 100644 --- a/__fixtures__/v-next/outputv4/cosmos/crypto/multisig/keys.ts +++ b/__fixtures__/v-next/outputv4/cosmos/crypto/multisig/keys.ts @@ -115,11 +115,11 @@ export const LegacyAminoPubKey = { }, toAmino(message: LegacyAminoPubKey): LegacyAminoPubKeyAmino { const obj: any = {}; - obj.threshold = message.threshold; + obj.threshold = message.threshold === 0 ? undefined : message.threshold; if (message.publicKeys) { obj.public_keys = message.publicKeys.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.public_keys = []; + obj.public_keys = message.publicKeys; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/crypto/multisig/v1beta1/multisig.ts b/__fixtures__/v-next/outputv4/cosmos/crypto/multisig/v1beta1/multisig.ts index f14d457ff2..2066e7f759 100644 --- a/__fixtures__/v-next/outputv4/cosmos/crypto/multisig/v1beta1/multisig.ts +++ b/__fixtures__/v-next/outputv4/cosmos/crypto/multisig/v1beta1/multisig.ts @@ -123,7 +123,7 @@ export const MultiSignature = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -234,7 +234,7 @@ export const CompactBitArray = { }, toAmino(message: CompactBitArray): CompactBitArrayAmino { const obj: any = {}; - obj.extra_bits_stored = message.extraBitsStored; + obj.extra_bits_stored = message.extraBitsStored === 0 ? undefined : message.extraBitsStored; obj.elems = message.elems ? base64FromBytes(message.elems) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/distribution.ts b/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/distribution.ts index bacce079b9..5313c8c869 100644 --- a/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/distribution.ts +++ b/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/distribution.ts @@ -386,10 +386,10 @@ export const Params = { }, 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; + obj.community_tax = message.communityTax === "" ? undefined : message.communityTax; + obj.base_proposer_reward = message.baseProposerReward === "" ? undefined : message.baseProposerReward; + obj.bonus_proposer_reward = message.bonusProposerReward === "" ? undefined : message.bonusProposerReward; + obj.withdraw_addr_enabled = message.withdrawAddrEnabled === false ? undefined : message.withdrawAddrEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -508,9 +508,9 @@ export const ValidatorHistoricalRewards = { if (message.cumulativeRewardRatio) { obj.cumulative_reward_ratio = message.cumulativeRewardRatio.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.cumulative_reward_ratio = []; + obj.cumulative_reward_ratio = message.cumulativeRewardRatio; } - obj.reference_count = message.referenceCount; + obj.reference_count = message.referenceCount === 0 ? undefined : message.referenceCount; return obj; }, fromAminoMsg(object: ValidatorHistoricalRewardsAminoMsg): ValidatorHistoricalRewards { @@ -631,9 +631,9 @@ export const ValidatorCurrentRewards = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } - obj.period = message.period ? message.period.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorCurrentRewardsAminoMsg): ValidatorCurrentRewards { @@ -736,7 +736,7 @@ export const ValidatorAccumulatedCommission = { if (message.commission) { obj.commission = message.commission.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.commission = []; + obj.commission = message.commission; } return obj; }, @@ -840,7 +840,7 @@ export const ValidatorOutstandingRewards = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, @@ -953,8 +953,8 @@ export const ValidatorSlashEvent = { }, toAmino(message: ValidatorSlashEvent): ValidatorSlashEventAmino { const obj: any = {}; - obj.validator_period = message.validatorPeriod ? message.validatorPeriod.toString() : undefined; - obj.fraction = message.fraction; + obj.validator_period = message.validatorPeriod !== BigInt(0) ? message.validatorPeriod.toString() : undefined; + obj.fraction = message.fraction === "" ? undefined : message.fraction; return obj; }, fromAminoMsg(object: ValidatorSlashEventAminoMsg): ValidatorSlashEvent { @@ -1057,7 +1057,7 @@ export const ValidatorSlashEvents = { if (message.validatorSlashEvents) { obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEvent.toAmino(e) : undefined); } else { - obj.validator_slash_events = []; + obj.validator_slash_events = message.validatorSlashEvents; } return obj; }, @@ -1161,7 +1161,7 @@ export const FeePool = { if (message.communityPool) { obj.community_pool = message.communityPool.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.community_pool = []; + obj.community_pool = message.communityPool; } return obj; }, @@ -1310,13 +1310,13 @@ export const CommunityPoolSpendProposal = { }, toAmino(message: CommunityPoolSpendProposal): CommunityPoolSpendProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.recipient = message.recipient; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.recipient = message.recipient === "" ? undefined : message.recipient; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -1447,9 +1447,9 @@ export const DelegatorStartingInfo = { }, 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; + obj.previous_period = message.previousPeriod !== BigInt(0) ? message.previousPeriod.toString() : undefined; + obj.stake = message.stake === "" ? undefined : message.stake; + obj.height = message.height ? message.height.toString() : "0"; return obj; }, fromAminoMsg(object: DelegatorStartingInfoAminoMsg): DelegatorStartingInfo { @@ -1565,11 +1565,11 @@ export const DelegationDelegatorReward = { }, toAmino(message: DelegationDelegatorReward): DelegationDelegatorRewardAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.reward) { obj.reward = message.reward.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.reward = []; + obj.reward = message.reward; } return obj; }, @@ -1728,11 +1728,11 @@ export const CommunityPoolSpendProposalWithDeposit = { }, 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; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.recipient = message.recipient === "" ? undefined : message.recipient; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.deposit = message.deposit === "" ? undefined : message.deposit; return obj; }, fromAminoMsg(object: CommunityPoolSpendProposalWithDepositAminoMsg): CommunityPoolSpendProposalWithDeposit { diff --git a/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/genesis.ts index 889c9cd594..eccbb020af 100644 --- a/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/genesis.ts @@ -272,8 +272,8 @@ export const DelegatorWithdrawInfo = { }, toAmino(message: DelegatorWithdrawInfo): DelegatorWithdrawInfoAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.withdraw_address = message.withdrawAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: DelegatorWithdrawInfoAminoMsg): DelegatorWithdrawInfo { @@ -389,11 +389,11 @@ export const ValidatorOutstandingRewardsRecord = { }, toAmino(message: ValidatorOutstandingRewardsRecord): ValidatorOutstandingRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.outstandingRewards) { obj.outstanding_rewards = message.outstandingRewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.outstanding_rewards = []; + obj.outstanding_rewards = message.outstandingRewards; } return obj; }, @@ -506,7 +506,7 @@ export const ValidatorAccumulatedCommissionRecord = { }, toAmino(message: ValidatorAccumulatedCommissionRecord): ValidatorAccumulatedCommissionRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.accumulated = message.accumulated ? ValidatorAccumulatedCommission.toAmino(message.accumulated) : undefined; return obj; }, @@ -637,8 +637,8 @@ export const ValidatorHistoricalRewardsRecord = { }, toAmino(message: ValidatorHistoricalRewardsRecord): ValidatorHistoricalRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.period = message.period ? message.period.toString() : undefined; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; obj.rewards = message.rewards ? ValidatorHistoricalRewards.toAmino(message.rewards) : undefined; return obj; }, @@ -751,7 +751,7 @@ export const ValidatorCurrentRewardsRecord = { }, toAmino(message: ValidatorCurrentRewardsRecord): ValidatorCurrentRewardsRecordAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.rewards = message.rewards ? ValidatorCurrentRewards.toAmino(message.rewards) : undefined; return obj; }, @@ -880,8 +880,8 @@ export const DelegatorStartingInfoRecord = { }, toAmino(message: DelegatorStartingInfoRecord): DelegatorStartingInfoRecordAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.starting_info = message.startingInfo ? DelegatorStartingInfo.toAmino(message.startingInfo) : undefined; return obj; }, @@ -1030,9 +1030,9 @@ export const ValidatorSlashEventRecord = { }, 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_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; obj.validator_slash_event = message.validatorSlashEvent ? ValidatorSlashEvent.toAmino(message.validatorSlashEvent) : undefined; return obj; }, @@ -1322,38 +1322,38 @@ export const GenesisState = { if (message.delegatorWithdrawInfos) { obj.delegator_withdraw_infos = message.delegatorWithdrawInfos.map(e => e ? DelegatorWithdrawInfo.toAmino(e) : undefined); } else { - obj.delegator_withdraw_infos = []; + obj.delegator_withdraw_infos = message.delegatorWithdrawInfos; } - obj.previous_proposer = message.previousProposer; + obj.previous_proposer = message.previousProposer === "" ? undefined : message.previousProposer; if (message.outstandingRewards) { obj.outstanding_rewards = message.outstandingRewards.map(e => e ? ValidatorOutstandingRewardsRecord.toAmino(e) : undefined); } else { - obj.outstanding_rewards = []; + obj.outstanding_rewards = message.outstandingRewards; } if (message.validatorAccumulatedCommissions) { obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions.map(e => e ? ValidatorAccumulatedCommissionRecord.toAmino(e) : undefined); } else { - obj.validator_accumulated_commissions = []; + obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions; } if (message.validatorHistoricalRewards) { obj.validator_historical_rewards = message.validatorHistoricalRewards.map(e => e ? ValidatorHistoricalRewardsRecord.toAmino(e) : undefined); } else { - obj.validator_historical_rewards = []; + obj.validator_historical_rewards = message.validatorHistoricalRewards; } if (message.validatorCurrentRewards) { obj.validator_current_rewards = message.validatorCurrentRewards.map(e => e ? ValidatorCurrentRewardsRecord.toAmino(e) : undefined); } else { - obj.validator_current_rewards = []; + obj.validator_current_rewards = message.validatorCurrentRewards; } if (message.delegatorStartingInfos) { obj.delegator_starting_infos = message.delegatorStartingInfos.map(e => e ? DelegatorStartingInfoRecord.toAmino(e) : undefined); } else { - obj.delegator_starting_infos = []; + obj.delegator_starting_infos = message.delegatorStartingInfos; } if (message.validatorSlashEvents) { obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEventRecord.toAmino(e) : undefined); } else { - obj.validator_slash_events = []; + obj.validator_slash_events = message.validatorSlashEvents; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/query.ts index 8730a7d871..b86c0725a9 100644 --- a/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/query.ts @@ -580,7 +580,7 @@ export const QueryValidatorOutstandingRewardsRequest = { }, toAmino(message: QueryValidatorOutstandingRewardsRequest): QueryValidatorOutstandingRewardsRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryValidatorOutstandingRewardsRequestAminoMsg): QueryValidatorOutstandingRewardsRequest { @@ -770,7 +770,7 @@ export const QueryValidatorCommissionRequest = { }, toAmino(message: QueryValidatorCommissionRequest): QueryValidatorCommissionRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryValidatorCommissionRequestAminoMsg): QueryValidatorCommissionRequest { @@ -1014,9 +1014,9 @@ export const QueryValidatorSlashesRequest = { }, 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.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.starting_height = message.startingHeight !== BigInt(0) ? message.startingHeight.toString() : undefined; + obj.ending_height = message.endingHeight !== BigInt(0) ? message.endingHeight.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1138,7 +1138,7 @@ export const QueryValidatorSlashesResponse = { if (message.slashes) { obj.slashes = message.slashes.map(e => e ? ValidatorSlashEvent.toAmino(e) : undefined); } else { - obj.slashes = []; + obj.slashes = message.slashes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1250,8 +1250,8 @@ export const QueryDelegationRewardsRequest = { }, toAmino(message: QueryDelegationRewardsRequest): QueryDelegationRewardsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: QueryDelegationRewardsRequestAminoMsg): QueryDelegationRewardsRequest { @@ -1354,7 +1354,7 @@ export const QueryDelegationRewardsResponse = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, @@ -1449,7 +1449,7 @@ export const QueryDelegationTotalRewardsRequest = { }, toAmino(message: QueryDelegationTotalRewardsRequest): QueryDelegationTotalRewardsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegationTotalRewardsRequestAminoMsg): QueryDelegationTotalRewardsRequest { @@ -1574,12 +1574,12 @@ export const QueryDelegationTotalRewardsResponse = { if (message.rewards) { obj.rewards = message.rewards.map(e => e ? DelegationDelegatorReward.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } if (message.total) { obj.total = message.total.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.total = []; + obj.total = message.total; } return obj; }, @@ -1674,7 +1674,7 @@ export const QueryDelegatorValidatorsRequest = { }, toAmino(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegatorValidatorsRequestAminoMsg): QueryDelegatorValidatorsRequest { @@ -1777,7 +1777,7 @@ export const QueryDelegatorValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e); } else { - obj.validators = []; + obj.validators = message.validators; } return obj; }, @@ -1872,7 +1872,7 @@ export const QueryDelegatorWithdrawAddressRequest = { }, toAmino(message: QueryDelegatorWithdrawAddressRequest): QueryDelegatorWithdrawAddressRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryDelegatorWithdrawAddressRequestAminoMsg): QueryDelegatorWithdrawAddressRequest { @@ -1966,7 +1966,7 @@ export const QueryDelegatorWithdrawAddressResponse = { }, toAmino(message: QueryDelegatorWithdrawAddressResponse): QueryDelegatorWithdrawAddressResponseAmino { const obj: any = {}; - obj.withdraw_address = message.withdrawAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: QueryDelegatorWithdrawAddressResponseAminoMsg): QueryDelegatorWithdrawAddressResponse { @@ -2143,7 +2143,7 @@ export const QueryCommunityPoolResponse = { if (message.pool) { obj.pool = message.pool.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.pool = []; + obj.pool = message.pool; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/tx.ts index e65e001e9c..4c4e7aab5e 100644 --- a/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/distribution/v1beta1/tx.ts @@ -205,8 +205,8 @@ export const MsgSetWithdrawAddress = { }, toAmino(message: MsgSetWithdrawAddress): MsgSetWithdrawAddressAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.withdraw_address = message.withdrawAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: MsgSetWithdrawAddressAminoMsg): MsgSetWithdrawAddress { @@ -390,8 +390,8 @@ export const MsgWithdrawDelegatorReward = { }, toAmino(message: MsgWithdrawDelegatorReward): MsgWithdrawDelegatorRewardAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: MsgWithdrawDelegatorRewardAminoMsg): MsgWithdrawDelegatorReward { @@ -494,7 +494,7 @@ export const MsgWithdrawDelegatorRewardResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -589,7 +589,7 @@ export const MsgWithdrawValidatorCommission = { }, toAmino(message: MsgWithdrawValidatorCommission): MsgWithdrawValidatorCommissionAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: MsgWithdrawValidatorCommissionAminoMsg): MsgWithdrawValidatorCommission { @@ -692,7 +692,7 @@ export const MsgWithdrawValidatorCommissionResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -812,9 +812,9 @@ export const MsgFundCommunityPool = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.depositor = message.depositor; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: MsgFundCommunityPoolAminoMsg): MsgFundCommunityPool { diff --git a/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/evidence.ts b/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/evidence.ts index 52251debe1..fd98bae28c 100644 --- a/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/evidence.ts +++ b/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/evidence.ts @@ -147,10 +147,10 @@ export const Equivocation = { }, toAmino(message: Equivocation): EquivocationAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.power = message.power ? message.power.toString() : undefined; - obj.consensus_address = message.consensusAddress; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; + obj.consensus_address = message.consensusAddress === "" ? undefined : message.consensusAddress; return obj; }, fromAminoMsg(object: EquivocationAminoMsg): Equivocation { diff --git a/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/genesis.ts index 36f4ac6267..0f9af10194 100644 --- a/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/genesis.ts @@ -93,7 +93,7 @@ export const GenesisState = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/query.ts index 10fdce2c79..ff8e98afc0 100644 --- a/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/query.ts @@ -452,7 +452,7 @@ export const QueryAllEvidenceResponse = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/tx.ts index 69828a460d..dad536bebf 100644 --- a/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/evidence/v1beta1/tx.ts @@ -122,7 +122,7 @@ export const MsgSubmitEvidence = { }, toAmino(message: MsgSubmitEvidence): MsgSubmitEvidenceAmino { const obj: any = {}; - obj.submitter = message.submitter; + obj.submitter = message.submitter === "" ? undefined : message.submitter; obj.evidence = message.evidence ? Any.toAmino(message.evidence) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/feegrant.ts index 19615801a1..a6646039c5 100644 --- a/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/feegrant.ts +++ b/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/feegrant.ts @@ -201,7 +201,7 @@ export const BasicAllowance = { if (message.spendLimit) { obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.spend_limit = []; + obj.spend_limit = message.spendLimit; } obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined; return obj; @@ -382,12 +382,12 @@ export const PeriodicAllowance = { if (message.periodSpendLimit) { obj.period_spend_limit = message.periodSpendLimit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.period_spend_limit = []; + obj.period_spend_limit = message.periodSpendLimit; } if (message.periodCanSpend) { obj.period_can_spend = message.periodCanSpend.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.period_can_spend = []; + obj.period_can_spend = message.periodCanSpend; } obj.period_reset = message.periodReset ? Timestamp.toAmino(toTimestamp(message.periodReset)) : undefined; return obj; @@ -511,7 +511,7 @@ export const AllowedMsgAllowance = { if (message.allowedMessages) { obj.allowed_messages = message.allowedMessages.map(e => e); } else { - obj.allowed_messages = []; + obj.allowed_messages = message.allowedMessages; } return obj; }, @@ -640,8 +640,8 @@ export const Grant = { }, toAmino(message: Grant): GrantAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.allowance = message.allowance ? Any.toAmino(message.allowance) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/genesis.ts index 824ca6b8c0..fcf07fd608 100644 --- a/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/query.ts index 5358ca37bc..98978433d2 100644 --- a/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/query.ts @@ -179,8 +179,8 @@ export const QueryAllowanceRequest = { }, toAmino(message: QueryAllowanceRequest): QueryAllowanceRequestAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; return obj; }, fromAminoMsg(object: QueryAllowanceRequestAminoMsg): QueryAllowanceRequest { @@ -388,7 +388,7 @@ export const QueryAllowancesRequest = { }, toAmino(message: QueryAllowancesRequest): QueryAllowancesRequestAmino { const obj: any = {}; - obj.grantee = message.grantee; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -510,7 +510,7 @@ export const QueryAllowancesResponse = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -624,7 +624,7 @@ export const QueryAllowancesByGranterRequest = { }, toAmino(message: QueryAllowancesByGranterRequest): QueryAllowancesByGranterRequestAmino { const obj: any = {}; - obj.granter = message.granter; + obj.granter = message.granter === "" ? undefined : message.granter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -746,7 +746,7 @@ export const QueryAllowancesByGranterResponse = { if (message.allowances) { obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); } else { - obj.allowances = []; + obj.allowances = message.allowances; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/tx.ts index 591229f21b..0dcc83f50e 100644 --- a/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/feegrant/v1beta1/tx.ts @@ -162,8 +162,8 @@ export const MsgGrantAllowance = { }, toAmino(message: MsgGrantAllowance): MsgGrantAllowanceAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; obj.allowance = message.allowance ? Any.toAmino(message.allowance) : undefined; return obj; }, @@ -348,8 +348,8 @@ export const MsgRevokeAllowance = { }, toAmino(message: MsgRevokeAllowance): MsgRevokeAllowanceAmino { const obj: any = {}; - obj.granter = message.granter; - obj.grantee = message.grantee; + obj.granter = message.granter === "" ? undefined : message.granter; + obj.grantee = message.grantee === "" ? undefined : message.grantee; return obj; }, fromAminoMsg(object: MsgRevokeAllowanceAminoMsg): MsgRevokeAllowance { diff --git a/__fixtures__/v-next/outputv4/cosmos/genutil/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/genutil/v1beta1/genesis.ts index 338baea52b..5bedc0a94f 100644 --- a/__fixtures__/v-next/outputv4/cosmos/genutil/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/genutil/v1beta1/genesis.ts @@ -92,7 +92,7 @@ export const GenesisState = { if (message.genTxs) { obj.gen_txs = message.genTxs.map(e => base64FromBytes(e)); } else { - obj.gen_txs = []; + obj.gen_txs = message.genTxs; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/gov/v1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/gov/v1/genesis.ts index e47bb162c4..0d917dde42 100644 --- a/__fixtures__/v-next/outputv4/cosmos/gov/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/gov/v1/genesis.ts @@ -224,21 +224,21 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + obj.starting_proposal_id = message.startingProposalId !== BigInt(0) ? message.startingProposalId.toString() : undefined; if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; diff --git a/__fixtures__/v-next/outputv4/cosmos/gov/v1/gov.ts b/__fixtures__/v-next/outputv4/cosmos/gov/v1/gov.ts index 43e111b1b0..b308c32d54 100644 --- a/__fixtures__/v-next/outputv4/cosmos/gov/v1/gov.ts +++ b/__fixtures__/v-next/outputv4/cosmos/gov/v1/gov.ts @@ -385,7 +385,7 @@ export const WeightedVoteOption = { fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { const message = createBaseWeightedVoteOption(); if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.weight !== undefined && object.weight !== null) { message.weight = object.weight; @@ -394,8 +394,8 @@ export const WeightedVoteOption = { }, toAmino(message: WeightedVoteOption): WeightedVoteOptionAmino { const obj: any = {}; - obj.option = message.option; - obj.weight = message.weight; + obj.option = message.option === 0 ? undefined : message.option; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption { @@ -529,12 +529,12 @@ export const Deposit = { }, toAmino(message: Deposit): DepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -764,7 +764,7 @@ export const Proposal = { } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -789,24 +789,24 @@ export const Proposal = { }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.status = message.status; + obj.status = message.status === 0 ? undefined : message.status; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined; if (message.totalDeposit) { obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_deposit = []; + obj.total_deposit = message.totalDeposit; } obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined; obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined; - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: ProposalAminoMsg): Proposal { @@ -948,10 +948,10 @@ export const TallyResult = { }, 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; + obj.yes_count = message.yesCount === "" ? undefined : message.yesCount; + obj.abstain_count = message.abstainCount === "" ? undefined : message.abstainCount; + obj.no_count = message.noCount === "" ? undefined : message.noCount; + obj.no_with_veto_count = message.noWithVetoCount === "" ? undefined : message.noWithVetoCount; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -1101,14 +1101,14 @@ export const Vote = { }, toAmino(message: Vote): VoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: VoteAminoMsg): Vote { @@ -1229,7 +1229,7 @@ export const DepositParams = { if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; return obj; @@ -1453,9 +1453,9 @@ export const TallyParams = { }, toAmino(message: TallyParams): TallyParamsAmino { const obj: any = {}; - obj.quorum = message.quorum; - obj.threshold = message.threshold; - obj.veto_threshold = message.vetoThreshold; + obj.quorum = message.quorum === "" ? undefined : message.quorum; + obj.threshold = message.threshold === "" ? undefined : message.threshold; + obj.veto_threshold = message.vetoThreshold === "" ? undefined : message.vetoThreshold; return obj; }, fromAminoMsg(object: TallyParamsAminoMsg): TallyParams { diff --git a/__fixtures__/v-next/outputv4/cosmos/gov/v1/query.ts b/__fixtures__/v-next/outputv4/cosmos/gov/v1/query.ts index a27d904205..ff094623c0 100644 --- a/__fixtures__/v-next/outputv4/cosmos/gov/v1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/gov/v1/query.ts @@ -324,7 +324,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -549,7 +549,7 @@ export const QueryProposalsRequest = { fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { const message = createBaseQueryProposalsRequest(); if (object.proposal_status !== undefined && object.proposal_status !== null) { - message.proposalStatus = proposalStatusFromJSON(object.proposal_status); + message.proposalStatus = object.proposal_status; } if (object.voter !== undefined && object.voter !== null) { message.voter = object.voter; @@ -564,9 +564,9 @@ export const QueryProposalsRequest = { }, toAmino(message: QueryProposalsRequest): QueryProposalsRequestAmino { const obj: any = {}; - obj.proposal_status = message.proposalStatus; - obj.voter = message.voter; - obj.depositor = message.depositor; + obj.proposal_status = message.proposalStatus === 0 ? undefined : message.proposalStatus; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.depositor = message.depositor === "" ? undefined : message.depositor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -688,7 +688,7 @@ export const QueryProposalsResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -802,8 +802,8 @@ export const QueryVoteRequest = { }, toAmino(message: QueryVoteRequest): QueryVoteRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest { @@ -1013,7 +1013,7 @@ export const QueryVotesRequest = { }, toAmino(message: QueryVotesRequest): QueryVotesRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1135,7 +1135,7 @@ export const QueryVotesResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1231,7 +1231,7 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.params_type = message.paramsType; + obj.params_type = message.paramsType === "" ? undefined : message.paramsType; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -1477,8 +1477,8 @@ export const QueryDepositRequest = { }, toAmino(message: QueryDepositRequest): QueryDepositRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest { @@ -1688,7 +1688,7 @@ export const QueryDepositsRequest = { }, toAmino(message: QueryDepositsRequest): QueryDepositsRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1810,7 +1810,7 @@ export const QueryDepositsResponse = { if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1908,7 +1908,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputv4/cosmos/gov/v1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/gov/v1/tx.ts index 5f27415353..ce4992c22c 100644 --- a/__fixtures__/v-next/outputv4/cosmos/gov/v1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/gov/v1/tx.ts @@ -279,15 +279,15 @@ export const MsgSubmitProposal = { if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; - obj.metadata = message.metadata; + obj.proposer = message.proposer === "" ? undefined : message.proposer; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -383,7 +383,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -496,7 +496,7 @@ export const MsgExecLegacyContent = { toAmino(message: MsgExecLegacyContent): MsgExecLegacyContentAmino { const obj: any = {}; obj.content = message.content ? Any.toAmino(message.content) : undefined; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; return obj; }, fromAminoMsg(object: MsgExecLegacyContentAminoMsg): MsgExecLegacyContent { @@ -705,7 +705,7 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; @@ -714,10 +714,10 @@ export const MsgVote = { }, 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.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -941,14 +941,14 @@ export const MsgVoteWeighted = { }, toAmino(message: MsgVoteWeighted): MsgVoteWeightedAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgVoteWeightedAminoMsg): MsgVoteWeighted { @@ -1156,12 +1156,12 @@ export const MsgDeposit = { }, toAmino(message: MsgDeposit): MsgDepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/genesis.ts index 64a7502011..b3be36ca4f 100644 --- a/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/genesis.ts @@ -224,21 +224,21 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + obj.starting_proposal_id = message.startingProposalId !== BigInt(0) ? message.startingProposalId.toString() : undefined; if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; diff --git a/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/gov.ts b/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/gov.ts index 5238555073..8f979c59c0 100644 --- a/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/gov.ts @@ -418,7 +418,7 @@ export const WeightedVoteOption = { fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { const message = createBaseWeightedVoteOption(); if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.weight !== undefined && object.weight !== null) { message.weight = object.weight; @@ -427,8 +427,8 @@ export const WeightedVoteOption = { }, toAmino(message: WeightedVoteOption): WeightedVoteOptionAmino { const obj: any = {}; - obj.option = message.option; - obj.weight = message.weight; + obj.option = message.option === 0 ? undefined : message.option; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption { @@ -538,8 +538,8 @@ export const TextProposal = { }, toAmino(message: TextProposal): TextProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: TextProposalAminoMsg): TextProposal { @@ -673,12 +673,12 @@ export const Deposit = { }, toAmino(message: Deposit): DepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -891,7 +891,7 @@ export const Proposal = { message.content = Any.fromAmino(object.content); } if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -913,16 +913,16 @@ export const Proposal = { }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.content = message.content ? Any.toAmino(message.content) : undefined; - obj.status = message.status; + obj.status = message.status === 0 ? undefined : message.status; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined; if (message.totalDeposit) { obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_deposit = []; + obj.total_deposit = message.totalDeposit; } obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined; obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined; @@ -1067,10 +1067,10 @@ export const TallyResult = { }, 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; + obj.yes = message.yes === "" ? undefined : message.yes; + obj.abstain = message.abstain === "" ? undefined : message.abstain; + obj.no = message.no === "" ? undefined : message.no; + obj.no_with_veto = message.noWithVeto === "" ? undefined : message.noWithVeto; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -1213,20 +1213,20 @@ export const Vote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } message.options = object.options?.map(e => WeightedVoteOption.fromAmino(e)) || []; return message; }, 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.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -1348,7 +1348,7 @@ export const DepositParams = { if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/query.ts index 88b0f28598..6d6b571cb7 100644 --- a/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/query.ts @@ -324,7 +324,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -549,7 +549,7 @@ export const QueryProposalsRequest = { fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { const message = createBaseQueryProposalsRequest(); if (object.proposal_status !== undefined && object.proposal_status !== null) { - message.proposalStatus = proposalStatusFromJSON(object.proposal_status); + message.proposalStatus = object.proposal_status; } if (object.voter !== undefined && object.voter !== null) { message.voter = object.voter; @@ -564,9 +564,9 @@ export const QueryProposalsRequest = { }, toAmino(message: QueryProposalsRequest): QueryProposalsRequestAmino { const obj: any = {}; - obj.proposal_status = message.proposalStatus; - obj.voter = message.voter; - obj.depositor = message.depositor; + obj.proposal_status = message.proposalStatus === 0 ? undefined : message.proposalStatus; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.depositor = message.depositor === "" ? undefined : message.depositor; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -688,7 +688,7 @@ export const QueryProposalsResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -802,8 +802,8 @@ export const QueryVoteRequest = { }, toAmino(message: QueryVoteRequest): QueryVoteRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest { @@ -1013,7 +1013,7 @@ export const QueryVotesRequest = { }, toAmino(message: QueryVotesRequest): QueryVotesRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1135,7 +1135,7 @@ export const QueryVotesResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1231,7 +1231,7 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.params_type = message.paramsType; + obj.params_type = message.paramsType === "" ? undefined : message.paramsType; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -1477,8 +1477,8 @@ export const QueryDepositRequest = { }, toAmino(message: QueryDepositRequest): QueryDepositRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor === "" ? undefined : message.depositor; return obj; }, fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest { @@ -1688,7 +1688,7 @@ export const QueryDepositsRequest = { }, toAmino(message: QueryDepositsRequest): QueryDepositsRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1810,7 +1810,7 @@ export const QueryDepositsResponse = { if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); } else { - obj.deposits = []; + obj.deposits = message.deposits; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1908,7 +1908,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/tx.ts index 88bf677da2..9e2119fe97 100644 --- a/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/gov/v1beta1/tx.ts @@ -239,9 +239,9 @@ export const MsgSubmitProposal = { if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; + obj.proposer = message.proposer === "" ? undefined : message.proposer; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -337,7 +337,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -459,15 +459,15 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } return message; }, 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.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -675,12 +675,12 @@ export const MsgVoteWeighted = { }, toAmino(message: MsgVoteWeighted): MsgVoteWeightedAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.voter = message.voter === "" ? undefined : message.voter; if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -889,12 +889,12 @@ export const MsgDeposit = { }, toAmino(message: MsgDeposit): MsgDepositAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.depositor = message.depositor; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : "0"; + obj.depositor = message.depositor === "" ? undefined : message.depositor; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/group/v1/events.ts b/__fixtures__/v-next/outputv4/cosmos/group/v1/events.ts index 7909d56397..ebcd8c38bd 100644 --- a/__fixtures__/v-next/outputv4/cosmos/group/v1/events.ts +++ b/__fixtures__/v-next/outputv4/cosmos/group/v1/events.ts @@ -196,7 +196,7 @@ export const EventCreateGroup = { }, toAmino(message: EventCreateGroup): EventCreateGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: EventCreateGroupAminoMsg): EventCreateGroup { @@ -292,7 +292,7 @@ export const EventUpdateGroup = { }, toAmino(message: EventUpdateGroup): EventUpdateGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: EventUpdateGroupAminoMsg): EventUpdateGroup { @@ -386,7 +386,7 @@ export const EventCreateGroupPolicy = { }, toAmino(message: EventCreateGroupPolicy): EventCreateGroupPolicyAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventCreateGroupPolicyAminoMsg): EventCreateGroupPolicy { @@ -480,7 +480,7 @@ export const EventUpdateGroupPolicy = { }, toAmino(message: EventUpdateGroupPolicy): EventUpdateGroupPolicyAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventUpdateGroupPolicyAminoMsg): EventUpdateGroupPolicy { @@ -576,7 +576,7 @@ export const EventSubmitProposal = { }, toAmino(message: EventSubmitProposal): EventSubmitProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventSubmitProposalAminoMsg): EventSubmitProposal { @@ -672,7 +672,7 @@ export const EventWithdrawProposal = { }, toAmino(message: EventWithdrawProposal): EventWithdrawProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventWithdrawProposalAminoMsg): EventWithdrawProposal { @@ -768,7 +768,7 @@ export const EventVote = { }, toAmino(message: EventVote): EventVoteAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: EventVoteAminoMsg): EventVote { @@ -874,14 +874,14 @@ export const EventExec = { message.proposalId = BigInt(object.proposal_id); } if (object.result !== undefined && object.result !== null) { - message.result = proposalExecutorResultFromJSON(object.result); + message.result = object.result; } return message; }, toAmino(message: EventExec): EventExecAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.result = message.result; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.result = message.result === 0 ? undefined : message.result; return obj; }, fromAminoMsg(object: EventExecAminoMsg): EventExec { @@ -993,8 +993,8 @@ export const EventLeaveGroup = { }, toAmino(message: EventLeaveGroup): EventLeaveGroupAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.address = message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: EventLeaveGroupAminoMsg): EventLeaveGroup { diff --git a/__fixtures__/v-next/outputv4/cosmos/group/v1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/group/v1/genesis.ts index 19b463797a..c6880bfa8a 100644 --- a/__fixtures__/v-next/outputv4/cosmos/group/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/group/v1/genesis.ts @@ -262,33 +262,33 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.group_seq = message.groupSeq ? message.groupSeq.toString() : undefined; + obj.group_seq = message.groupSeq !== BigInt(0) ? message.groupSeq.toString() : undefined; if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } if (message.groupMembers) { obj.group_members = message.groupMembers.map(e => e ? GroupMember.toAmino(e) : undefined); } else { - obj.group_members = []; + obj.group_members = message.groupMembers; } - obj.group_policy_seq = message.groupPolicySeq ? message.groupPolicySeq.toString() : undefined; + obj.group_policy_seq = message.groupPolicySeq !== BigInt(0) ? message.groupPolicySeq.toString() : undefined; if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } - obj.proposal_seq = message.proposalSeq ? message.proposalSeq.toString() : undefined; + obj.proposal_seq = message.proposalSeq !== BigInt(0) ? message.proposalSeq.toString() : undefined; if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/group/v1/query.ts b/__fixtures__/v-next/outputv4/cosmos/group/v1/query.ts index 25052fa7db..7b2e5f6f33 100644 --- a/__fixtures__/v-next/outputv4/cosmos/group/v1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/group/v1/query.ts @@ -463,7 +463,7 @@ export const QueryGroupInfoRequest = { }, toAmino(message: QueryGroupInfoRequest): QueryGroupInfoRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGroupInfoRequestAminoMsg): QueryGroupInfoRequest { @@ -653,7 +653,7 @@ export const QueryGroupPolicyInfoRequest = { }, toAmino(message: QueryGroupPolicyInfoRequest): QueryGroupPolicyInfoRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryGroupPolicyInfoRequestAminoMsg): QueryGroupPolicyInfoRequest { @@ -863,7 +863,7 @@ export const QueryGroupMembersRequest = { }, toAmino(message: QueryGroupMembersRequest): QueryGroupMembersRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -985,7 +985,7 @@ export const QueryGroupMembersResponse = { if (message.members) { obj.members = message.members.map(e => e ? GroupMember.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1099,7 +1099,7 @@ export const QueryGroupsByAdminRequest = { }, toAmino(message: QueryGroupsByAdminRequest): QueryGroupsByAdminRequestAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1221,7 +1221,7 @@ export const QueryGroupsByAdminResponse = { if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1337,7 +1337,7 @@ export const QueryGroupPoliciesByGroupRequest = { }, toAmino(message: QueryGroupPoliciesByGroupRequest): QueryGroupPoliciesByGroupRequestAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1459,7 +1459,7 @@ export const QueryGroupPoliciesByGroupResponse = { if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1573,7 +1573,7 @@ export const QueryGroupPoliciesByAdminRequest = { }, toAmino(message: QueryGroupPoliciesByAdminRequest): QueryGroupPoliciesByAdminRequestAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1695,7 +1695,7 @@ export const QueryGroupPoliciesByAdminResponse = { if (message.groupPolicies) { obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); } else { - obj.group_policies = []; + obj.group_policies = message.groupPolicies; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1793,7 +1793,7 @@ export const QueryProposalRequest = { }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { @@ -2001,7 +2001,7 @@ export const QueryProposalsByGroupPolicyRequest = { }, toAmino(message: QueryProposalsByGroupPolicyRequest): QueryProposalsByGroupPolicyRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2123,7 +2123,7 @@ export const QueryProposalsByGroupPolicyResponse = { if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); } else { - obj.proposals = []; + obj.proposals = message.proposals; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2237,8 +2237,8 @@ export const QueryVoteByProposalVoterRequest = { }, toAmino(message: QueryVoteByProposalVoterRequest): QueryVoteByProposalVoterRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.voter = message.voter; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; return obj; }, fromAminoMsg(object: QueryVoteByProposalVoterRequestAminoMsg): QueryVoteByProposalVoterRequest { @@ -2448,7 +2448,7 @@ export const QueryVotesByProposalRequest = { }, toAmino(message: QueryVotesByProposalRequest): QueryVotesByProposalRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2570,7 +2570,7 @@ export const QueryVotesByProposalResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2684,7 +2684,7 @@ export const QueryVotesByVoterRequest = { }, toAmino(message: QueryVotesByVoterRequest): QueryVotesByVoterRequestAmino { const obj: any = {}; - obj.voter = message.voter; + obj.voter = message.voter === "" ? undefined : message.voter; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2806,7 +2806,7 @@ export const QueryVotesByVoterResponse = { if (message.votes) { obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2920,7 +2920,7 @@ export const QueryGroupsByMemberRequest = { }, toAmino(message: QueryGroupsByMemberRequest): QueryGroupsByMemberRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -3042,7 +3042,7 @@ export const QueryGroupsByMemberResponse = { if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); } else { - obj.groups = []; + obj.groups = message.groups; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -3140,7 +3140,7 @@ export const QueryTallyResultRequest = { }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { diff --git a/__fixtures__/v-next/outputv4/cosmos/group/v1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/group/v1/tx.ts index 0b8c64eeed..50c88e1588 100644 --- a/__fixtures__/v-next/outputv4/cosmos/group/v1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/group/v1/tx.ts @@ -581,13 +581,13 @@ export const MsgCreateGroup = { }, toAmino(message: MsgCreateGroup): MsgCreateGroupAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgCreateGroupAminoMsg): MsgCreateGroup { @@ -683,7 +683,7 @@ export const MsgCreateGroupResponse = { }, toAmino(message: MsgCreateGroupResponse): MsgCreateGroupResponseAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateGroupResponseAminoMsg): MsgCreateGroupResponse { @@ -817,12 +817,12 @@ export const MsgUpdateGroupMembers = { }, toAmino(message: MsgUpdateGroupMembers): MsgUpdateGroupMembersAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; if (message.memberUpdates) { obj.member_updates = message.memberUpdates.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.member_updates = []; + obj.member_updates = message.memberUpdates; } return obj; }, @@ -1025,9 +1025,9 @@ export const MsgUpdateGroupAdmin = { }, 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; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgUpdateGroupAdminAminoMsg): MsgUpdateGroupAdmin { @@ -1229,9 +1229,9 @@ export const MsgUpdateGroupMetadata = { }, toAmino(message: MsgUpdateGroupMetadata): MsgUpdateGroupMetadataAmino { const obj: any = {}; - obj.admin = message.admin; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgUpdateGroupMetadataAminoMsg): MsgUpdateGroupMetadata { @@ -1451,9 +1451,9 @@ export const MsgCreateGroupPolicy = { }, 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.admin = message.admin === "" ? undefined : message.admin; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; return obj; }, @@ -1548,7 +1548,7 @@ export const MsgCreateGroupPolicyResponse = { }, toAmino(message: MsgCreateGroupPolicyResponse): MsgCreateGroupPolicyResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: MsgCreateGroupPolicyResponseAminoMsg): MsgCreateGroupPolicyResponse { @@ -1674,9 +1674,9 @@ export const MsgUpdateGroupPolicyAdmin = { }, toAmino(message: MsgUpdateGroupPolicyAdmin): MsgUpdateGroupPolicyAdminAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; - obj.new_admin = message.newAdmin; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgUpdateGroupPolicyAdminAminoMsg): MsgUpdateGroupPolicyAdmin { @@ -1858,15 +1858,15 @@ export const MsgCreateGroupWithPolicy = { }, toAmino(message: MsgCreateGroupWithPolicy): MsgCreateGroupWithPolicyAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } - obj.group_metadata = message.groupMetadata; - obj.group_policy_metadata = message.groupPolicyMetadata; - obj.group_policy_as_admin = message.groupPolicyAsAdmin; + obj.group_metadata = message.groupMetadata === "" ? undefined : message.groupMetadata; + obj.group_policy_metadata = message.groupPolicyMetadata === "" ? undefined : message.groupPolicyMetadata; + obj.group_policy_as_admin = message.groupPolicyAsAdmin === false ? undefined : message.groupPolicyAsAdmin; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; return obj; }, @@ -1979,8 +1979,8 @@ export const MsgCreateGroupWithPolicyResponse = { }, toAmino(message: MsgCreateGroupWithPolicyResponse): MsgCreateGroupWithPolicyResponseAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; - obj.group_policy_address = message.groupPolicyAddress; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.group_policy_address = message.groupPolicyAddress === "" ? undefined : message.groupPolicyAddress; return obj; }, fromAminoMsg(object: MsgCreateGroupWithPolicyResponseAminoMsg): MsgCreateGroupWithPolicyResponse { @@ -2182,8 +2182,8 @@ export const MsgUpdateGroupPolicyDecisionPolicy = { }, toAmino(message: MsgUpdateGroupPolicyDecisionPolicy): MsgUpdateGroupPolicyDecisionPolicyAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; return obj; }, @@ -2384,9 +2384,9 @@ export const MsgUpdateGroupPolicyMetadata = { }, toAmino(message: MsgUpdateGroupPolicyMetadata): MsgUpdateGroupPolicyMetadataAmino { const obj: any = {}; - obj.admin = message.admin; - obj.address = message.address; - obj.metadata = message.metadata; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.address = message.address === "" ? undefined : message.address; + obj.metadata = message.metadata === "" ? undefined : message.metadata; return obj; }, fromAminoMsg(object: MsgUpdateGroupPolicyMetadataAminoMsg): MsgUpdateGroupPolicyMetadata { @@ -2624,25 +2624,25 @@ export const MsgSubmitProposal = { } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; if (object.exec !== undefined && object.exec !== null) { - message.exec = execFromJSON(object.exec); + message.exec = object.exec; } return message; }, toAmino(message: MsgSubmitProposal): MsgSubmitProposalAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.proposers) { obj.proposers = message.proposers.map(e => e); } else { - obj.proposers = []; + obj.proposers = message.proposers; } - obj.metadata = message.metadata; + obj.metadata = message.metadata === "" ? undefined : message.metadata; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.exec = message.exec; + obj.exec = message.exec === 0 ? undefined : message.exec; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -2738,7 +2738,7 @@ export const MsgSubmitProposalResponse = { }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { @@ -2850,8 +2850,8 @@ export const MsgWithdrawProposal = { }, toAmino(message: MsgWithdrawProposal): MsgWithdrawProposalAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.address = message.address; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: MsgWithdrawProposalAminoMsg): MsgWithdrawProposal { @@ -3073,23 +3073,23 @@ export const MsgVote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; } if (object.exec !== undefined && object.exec !== null) { - message.exec = execFromJSON(object.exec); + message.exec = object.exec; } return message; }, 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; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.exec = message.exec === 0 ? undefined : message.exec; return obj; }, fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { @@ -3275,8 +3275,8 @@ export const MsgExec = { }, toAmino(message: MsgExec): MsgExecAmino { const obj: any = {}; - obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; - obj.signer = message.signer; + obj.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgExecAminoMsg): MsgExec { @@ -3462,8 +3462,8 @@ export const MsgLeaveGroup = { }, toAmino(message: MsgLeaveGroup): MsgLeaveGroupAmino { const obj: any = {}; - obj.address = message.address; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLeaveGroupAminoMsg): MsgLeaveGroup { diff --git a/__fixtures__/v-next/outputv4/cosmos/group/v1/types.ts b/__fixtures__/v-next/outputv4/cosmos/group/v1/types.ts index d1105e2a16..276eed1f6f 100644 --- a/__fixtures__/v-next/outputv4/cosmos/group/v1/types.ts +++ b/__fixtures__/v-next/outputv4/cosmos/group/v1/types.ts @@ -643,9 +643,9 @@ export const Member = { }, toAmino(message: Member): MemberAmino { const obj: any = {}; - obj.address = message.address; - obj.weight = message.weight; - obj.metadata = message.metadata; + obj.address = message.address === "" ? undefined : message.address; + obj.weight = message.weight === "" ? undefined : message.weight; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.added_at = message.addedAt ? Timestamp.toAmino(toTimestamp(message.addedAt)) : undefined; return obj; }, @@ -749,7 +749,7 @@ export const Members = { if (message.members) { obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); } else { - obj.members = []; + obj.members = message.members; } return obj; }, @@ -862,7 +862,7 @@ export const ThresholdDecisionPolicy = { }, toAmino(message: ThresholdDecisionPolicy): ThresholdDecisionPolicyAmino { const obj: any = {}; - obj.threshold = message.threshold; + obj.threshold = message.threshold === "" ? undefined : message.threshold; obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined; return obj; }, @@ -975,7 +975,7 @@ export const PercentageDecisionPolicy = { }, toAmino(message: PercentageDecisionPolicy): PercentageDecisionPolicyAmino { const obj: any = {}; - obj.percentage = message.percentage; + obj.percentage = message.percentage === "" ? undefined : message.percentage; obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined; return obj; }, @@ -1269,11 +1269,11 @@ export const GroupInfo = { }, 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.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; obj.created_at = message.createdAt ? Timestamp.toAmino(toTimestamp(message.createdAt)) : undefined; return obj; }, @@ -1388,7 +1388,7 @@ export const GroupMember = { }, toAmino(message: GroupMember): GroupMemberAmino { const obj: any = {}; - obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; obj.member = message.member ? Member.toAmino(message.member) : undefined; return obj; }, @@ -1585,11 +1585,11 @@ export const GroupPolicyInfo = { }, 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.address = message.address === "" ? undefined : message.address; + obj.group_id = message.groupId !== BigInt(0) ? message.groupId.toString() : undefined; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.metadata = message.metadata === "" ? undefined : message.metadata; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; obj.created_at = message.createdAt ? Timestamp.toAmino(toTimestamp(message.createdAt)) : undefined; return obj; @@ -1878,10 +1878,10 @@ export const Proposal = { message.groupPolicyVersion = BigInt(object.group_policy_version); } if (object.status !== undefined && object.status !== null) { - message.status = proposalStatusFromJSON(object.status); + message.status = object.status; } if (object.result !== undefined && object.result !== null) { - message.result = proposalResultFromJSON(object.result); + message.result = object.result; } if (object.final_tally_result !== undefined && object.final_tally_result !== null) { message.finalTallyResult = TallyResult.fromAmino(object.final_tally_result); @@ -1890,33 +1890,33 @@ export const Proposal = { message.votingPeriodEnd = fromTimestamp(Timestamp.fromAmino(object.voting_period_end)); } if (object.executor_result !== undefined && object.executor_result !== null) { - message.executorResult = proposalExecutorResultFromJSON(object.executor_result); + message.executorResult = object.executor_result; } message.messages = object.messages?.map(e => Any.fromAmino(e)) || []; return message; }, toAmino(message: Proposal): ProposalAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.address = message.address; - obj.metadata = message.metadata; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.metadata = message.metadata === "" ? undefined : message.metadata; if (message.proposers) { obj.proposers = message.proposers.map(e => e); } else { - obj.proposers = []; + obj.proposers = message.proposers; } obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; - 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.group_version = message.groupVersion !== BigInt(0) ? message.groupVersion.toString() : undefined; + obj.group_policy_version = message.groupPolicyVersion !== BigInt(0) ? message.groupPolicyVersion.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.result = message.result === 0 ? undefined : message.result; obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; obj.voting_period_end = message.votingPeriodEnd ? Timestamp.toAmino(toTimestamp(message.votingPeriodEnd)) : undefined; - obj.executor_result = message.executorResult; + obj.executor_result = message.executorResult === 0 ? undefined : message.executorResult; if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } return obj; }, @@ -2059,10 +2059,10 @@ export const TallyResult = { }, 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; + obj.yes_count = message.yesCount === "" ? undefined : message.yesCount; + obj.abstain_count = message.abstainCount === "" ? undefined : message.abstainCount; + obj.no_count = message.noCount === "" ? undefined : message.noCount; + obj.no_with_veto_count = message.noWithVetoCount === "" ? undefined : message.noWithVetoCount; return obj; }, fromAminoMsg(object: TallyResultAminoMsg): TallyResult { @@ -2210,7 +2210,7 @@ export const Vote = { message.voter = object.voter; } if (object.option !== undefined && object.option !== null) { - message.option = voteOptionFromJSON(object.option); + message.option = object.option; } if (object.metadata !== undefined && object.metadata !== null) { message.metadata = object.metadata; @@ -2222,10 +2222,10 @@ export const Vote = { }, 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.proposal_id = message.proposalId !== BigInt(0) ? message.proposalId.toString() : undefined; + obj.voter = message.voter === "" ? undefined : message.voter; + obj.option = message.option === 0 ? undefined : message.option; + obj.metadata = message.metadata === "" ? undefined : message.metadata; obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputv4/cosmos/mint/v1beta1/mint.ts index 5527a7d541..369098833b 100644 --- a/__fixtures__/v-next/outputv4/cosmos/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputv4/cosmos/mint/v1beta1/mint.ts @@ -131,8 +131,8 @@ export const Minter = { }, toAmino(message: Minter): MinterAmino { const obj: any = {}; - obj.inflation = message.inflation; - obj.annual_provisions = message.annualProvisions; + obj.inflation = message.inflation === "" ? undefined : message.inflation; + obj.annual_provisions = message.annualProvisions === "" ? undefined : message.annualProvisions; return obj; }, fromAminoMsg(object: MinterAminoMsg): Minter { @@ -308,12 +308,12 @@ export const Params = { }, 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; + obj.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; + obj.inflation_rate_change = message.inflationRateChange === "" ? undefined : message.inflationRateChange; + obj.inflation_max = message.inflationMax === "" ? undefined : message.inflationMax; + obj.inflation_min = message.inflationMin === "" ? undefined : message.inflationMin; + obj.goal_bonded = message.goalBonded === "" ? undefined : message.goalBonded; + obj.blocks_per_year = message.blocksPerYear !== BigInt(0) ? message.blocksPerYear.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/event.ts b/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/event.ts index b267dbd9ae..87da093e56 100644 --- a/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/event.ts +++ b/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/event.ts @@ -168,10 +168,10 @@ export const EventSend = { }, toAmino(message: EventSend): EventSendAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: EventSendAminoMsg): EventSend { @@ -297,9 +297,9 @@ export const EventMint = { }, toAmino(message: EventMint): EventMintAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: EventMintAminoMsg): EventMint { @@ -425,9 +425,9 @@ export const EventBurn = { }, toAmino(message: EventBurn): EventBurnAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: EventBurnAminoMsg): EventBurn { diff --git a/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/genesis.ts index 7c2d6e70bc..b29ffad4c9 100644 --- a/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/genesis.ts @@ -133,12 +133,12 @@ export const GenesisState = { if (message.classes) { obj.classes = message.classes.map(e => e ? Class.toAmino(e) : undefined); } else { - obj.classes = []; + obj.classes = message.classes; } if (message.entries) { obj.entries = message.entries.map(e => e ? Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -255,11 +255,11 @@ export const Entry = { }, toAmino(message: Entry): EntryAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; if (message.nfts) { obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e) : undefined); } else { - obj.nfts = []; + obj.nfts = message.nfts; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/nft.ts b/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/nft.ts index e02d6d51a0..5dd51cf4aa 100644 --- a/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/nft.ts +++ b/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/nft.ts @@ -225,12 +225,12 @@ export const Class = { }, 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.id = message.id === "" ? undefined : message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.symbol = message.symbol === "" ? undefined : message.symbol; + obj.description = message.description === "" ? undefined : message.description; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; obj.data = message.data ? Any.toAmino(message.data) : undefined; return obj; }, @@ -391,10 +391,10 @@ export const NFT = { }, 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.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.uri = message.uri === "" ? undefined : message.uri; + obj.uri_hash = message.uriHash === "" ? undefined : message.uriHash; obj.data = message.data ? Any.toAmino(message.data) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/query.ts index 6ea94ad1d9..f871471cd2 100644 --- a/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/query.ts @@ -271,8 +271,8 @@ export const QueryBalanceRequest = { }, toAmino(message: QueryBalanceRequest): QueryBalanceRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest { @@ -368,7 +368,7 @@ export const QueryBalanceResponse = { }, toAmino(message: QueryBalanceResponse): QueryBalanceResponseAmino { const obj: any = {}; - obj.amount = message.amount ? message.amount.toString() : undefined; + obj.amount = message.amount !== BigInt(0) ? message.amount.toString() : undefined; return obj; }, fromAminoMsg(object: QueryBalanceResponseAminoMsg): QueryBalanceResponse { @@ -478,8 +478,8 @@ export const QueryOwnerRequest = { }, toAmino(message: QueryOwnerRequest): QueryOwnerRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: QueryOwnerRequestAminoMsg): QueryOwnerRequest { @@ -573,7 +573,7 @@ export const QueryOwnerResponse = { }, toAmino(message: QueryOwnerResponse): QueryOwnerResponseAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: QueryOwnerResponseAminoMsg): QueryOwnerResponse { @@ -667,7 +667,7 @@ export const QuerySupplyRequest = { }, toAmino(message: QuerySupplyRequest): QuerySupplyRequestAmino { const obj: any = {}; - obj.class_id = message.classId; + obj.class_id = message.classId === "" ? undefined : message.classId; return obj; }, fromAminoMsg(object: QuerySupplyRequestAminoMsg): QuerySupplyRequest { @@ -763,7 +763,7 @@ export const QuerySupplyResponse = { }, toAmino(message: QuerySupplyResponse): QuerySupplyResponseAmino { const obj: any = {}; - obj.amount = message.amount ? message.amount.toString() : undefined; + obj.amount = message.amount !== BigInt(0) ? message.amount.toString() : undefined; return obj; }, fromAminoMsg(object: QuerySupplyResponseAminoMsg): QuerySupplyResponse { @@ -891,8 +891,8 @@ export const QueryNFTsRequest = { }, toAmino(message: QueryNFTsRequest): QueryNFTsRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.owner = message.owner; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.owner = message.owner === "" ? undefined : message.owner; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1014,7 +1014,7 @@ export const QueryNFTsResponse = { if (message.nfts) { obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e) : undefined); } else { - obj.nfts = []; + obj.nfts = message.nfts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1126,8 +1126,8 @@ export const QueryNFTRequest = { }, toAmino(message: QueryNFTRequest): QueryNFTRequestAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; return obj; }, fromAminoMsg(object: QueryNFTRequestAminoMsg): QueryNFTRequest { @@ -1317,7 +1317,7 @@ export const QueryClassRequest = { }, toAmino(message: QueryClassRequest): QueryClassRequestAmino { const obj: any = {}; - obj.class_id = message.classId; + obj.class_id = message.classId === "" ? undefined : message.classId; return obj; }, fromAminoMsg(object: QueryClassRequestAminoMsg): QueryClassRequest { @@ -1630,7 +1630,7 @@ export const QueryClassesResponse = { if (message.classes) { obj.classes = message.classes.map(e => e ? Class.toAmino(e) : undefined); } else { - obj.classes = []; + obj.classes = message.classes; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/tx.ts index 186e9a0201..ab63449137 100644 --- a/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/nft/v1beta1/tx.ts @@ -148,10 +148,10 @@ export const MsgSend = { }, toAmino(message: MsgSend): MsgSendAmino { const obj: any = {}; - obj.class_id = message.classId; - obj.id = message.id; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.class_id = message.classId === "" ? undefined : message.classId; + obj.id = message.id === "" ? undefined : message.id; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: MsgSendAminoMsg): MsgSend { diff --git a/__fixtures__/v-next/outputv4/cosmos/orm/v1/orm.ts b/__fixtures__/v-next/outputv4/cosmos/orm/v1/orm.ts index 2d809b43d0..eb484d838c 100644 --- a/__fixtures__/v-next/outputv4/cosmos/orm/v1/orm.ts +++ b/__fixtures__/v-next/outputv4/cosmos/orm/v1/orm.ts @@ -238,9 +238,9 @@ export const TableDescriptor = { if (message.index) { obj.index = message.index.map(e => e ? SecondaryIndexDescriptor.toAmino(e) : undefined); } else { - obj.index = []; + obj.index = message.index; } - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: TableDescriptorAminoMsg): TableDescriptor { @@ -350,8 +350,8 @@ export const PrimaryKeyDescriptor = { }, toAmino(message: PrimaryKeyDescriptor): PrimaryKeyDescriptorAmino { const obj: any = {}; - obj.fields = message.fields; - obj.auto_increment = message.autoIncrement; + obj.fields = message.fields === "" ? undefined : message.fields; + obj.auto_increment = message.autoIncrement === false ? undefined : message.autoIncrement; return obj; }, fromAminoMsg(object: PrimaryKeyDescriptorAminoMsg): PrimaryKeyDescriptor { @@ -477,9 +477,9 @@ export const SecondaryIndexDescriptor = { }, toAmino(message: SecondaryIndexDescriptor): SecondaryIndexDescriptorAmino { const obj: any = {}; - obj.fields = message.fields; - obj.id = message.id; - obj.unique = message.unique; + obj.fields = message.fields === "" ? undefined : message.fields; + obj.id = message.id === 0 ? undefined : message.id; + obj.unique = message.unique === false ? undefined : message.unique; return obj; }, fromAminoMsg(object: SecondaryIndexDescriptorAminoMsg): SecondaryIndexDescriptor { @@ -573,7 +573,7 @@ export const SingletonDescriptor = { }, toAmino(message: SingletonDescriptor): SingletonDescriptorAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: SingletonDescriptorAminoMsg): SingletonDescriptor { diff --git a/__fixtures__/v-next/outputv4/cosmos/orm/v1alpha1/schema.ts b/__fixtures__/v-next/outputv4/cosmos/orm/v1alpha1/schema.ts index 614fecb785..d84ff52617 100644 --- a/__fixtures__/v-next/outputv4/cosmos/orm/v1alpha1/schema.ts +++ b/__fixtures__/v-next/outputv4/cosmos/orm/v1alpha1/schema.ts @@ -227,7 +227,7 @@ export const ModuleSchemaDescriptor = { if (message.schemaFile) { obj.schema_file = message.schemaFile.map(e => e ? ModuleSchemaDescriptor_FileEntry.toAmino(e) : undefined); } else { - obj.schema_file = []; + obj.schema_file = message.schemaFile; } obj.prefix = message.prefix ? base64FromBytes(message.prefix) : undefined; return obj; @@ -349,15 +349,15 @@ export const ModuleSchemaDescriptor_FileEntry = { message.protoFileName = object.proto_file_name; } if (object.storage_type !== undefined && object.storage_type !== null) { - message.storageType = storageTypeFromJSON(object.storage_type); + message.storageType = object.storage_type; } return message; }, toAmino(message: ModuleSchemaDescriptor_FileEntry): ModuleSchemaDescriptor_FileEntryAmino { const obj: any = {}; - obj.id = message.id; - obj.proto_file_name = message.protoFileName; - obj.storage_type = message.storageType; + obj.id = message.id === 0 ? undefined : message.id; + obj.proto_file_name = message.protoFileName === "" ? undefined : message.protoFileName; + obj.storage_type = message.storageType === 0 ? undefined : message.storageType; return obj; }, fromAminoMsg(object: ModuleSchemaDescriptor_FileEntryAminoMsg): ModuleSchemaDescriptor_FileEntry { diff --git a/__fixtures__/v-next/outputv4/cosmos/params/v1beta1/params.ts b/__fixtures__/v-next/outputv4/cosmos/params/v1beta1/params.ts index c9f0c8cefc..031eba73c0 100644 --- a/__fixtures__/v-next/outputv4/cosmos/params/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv4/cosmos/params/v1beta1/params.ts @@ -146,12 +146,12 @@ export const ParameterChangeProposal = { }, toAmino(message: ParameterChangeProposal): ParameterChangeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.changes) { obj.changes = message.changes.map(e => e ? ParamChange.toAmino(e) : undefined); } else { - obj.changes = []; + obj.changes = message.changes; } return obj; }, @@ -278,9 +278,9 @@ export const ParamChange = { }, toAmino(message: ParamChange): ParamChangeAmino { const obj: any = {}; - obj.subspace = message.subspace; - obj.key = message.key; - obj.value = message.value; + obj.subspace = message.subspace === "" ? undefined : message.subspace; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: ParamChangeAminoMsg): ParamChange { diff --git a/__fixtures__/v-next/outputv4/cosmos/params/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/params/v1beta1/query.ts index 7da530343e..84d9c1302f 100644 --- a/__fixtures__/v-next/outputv4/cosmos/params/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/params/v1beta1/query.ts @@ -168,8 +168,8 @@ export const QueryParamsRequest = { }, toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { const obj: any = {}; - obj.subspace = message.subspace; - obj.key = message.key; + obj.subspace = message.subspace === "" ? undefined : message.subspace; + obj.key = message.key === "" ? undefined : message.key; return obj; }, fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { @@ -442,7 +442,7 @@ export const QuerySubspacesResponse = { if (message.subspaces) { obj.subspaces = message.subspaces.map(e => e ? Subspace.toAmino(e) : undefined); } else { - obj.subspaces = []; + obj.subspaces = message.subspaces; } return obj; }, @@ -559,11 +559,11 @@ export const Subspace = { }, toAmino(message: Subspace): SubspaceAmino { const obj: any = {}; - obj.subspace = message.subspace; + obj.subspace = message.subspace === "" ? undefined : message.subspace; if (message.keys) { obj.keys = message.keys.map(e => e); } else { - obj.keys = []; + obj.keys = message.keys; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/genesis.ts index 224bcbaf3b..c5a03f1532 100644 --- a/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/genesis.ts @@ -200,12 +200,12 @@ export const GenesisState = { if (message.signingInfos) { obj.signing_infos = message.signingInfos.map(e => e ? SigningInfo.toAmino(e) : undefined); } else { - obj.signing_infos = []; + obj.signing_infos = message.signingInfos; } if (message.missedBlocks) { obj.missed_blocks = message.missedBlocks.map(e => e ? ValidatorMissedBlocks.toAmino(e) : undefined); } else { - obj.missed_blocks = []; + obj.missed_blocks = message.missedBlocks; } return obj; }, @@ -318,7 +318,7 @@ export const SigningInfo = { }, toAmino(message: SigningInfo): SigningInfoAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.validator_signing_info = message.validatorSigningInfo ? ValidatorSigningInfo.toAmino(message.validatorSigningInfo) : undefined; return obj; }, @@ -435,11 +435,11 @@ export const ValidatorMissedBlocks = { }, toAmino(message: ValidatorMissedBlocks): ValidatorMissedBlocksAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.missedBlocks) { obj.missed_blocks = message.missedBlocks.map(e => e ? MissedBlock.toAmino(e) : undefined); } else { - obj.missed_blocks = []; + obj.missed_blocks = message.missedBlocks; } return obj; }, @@ -552,8 +552,8 @@ export const MissedBlock = { }, toAmino(message: MissedBlock): MissedBlockAmino { const obj: any = {}; - obj.index = message.index ? message.index.toString() : undefined; - obj.missed = message.missed; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; + obj.missed = message.missed === false ? undefined : message.missed; return obj; }, fromAminoMsg(object: MissedBlockAminoMsg): MissedBlock { diff --git a/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/query.ts index 9ef7b4337a..45dac2b073 100644 --- a/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/query.ts @@ -339,7 +339,7 @@ export const QuerySigningInfoRequest = { }, toAmino(message: QuerySigningInfoRequest): QuerySigningInfoRequestAmino { const obj: any = {}; - obj.cons_address = message.consAddress; + obj.cons_address = message.consAddress === "" ? undefined : message.consAddress; return obj; }, fromAminoMsg(object: QuerySigningInfoRequestAminoMsg): QuerySigningInfoRequest { @@ -652,7 +652,7 @@ export const QuerySigningInfosResponse = { if (message.info) { obj.info = message.info.map(e => e ? ValidatorSigningInfo.toAmino(e) : undefined); } else { - obj.info = []; + obj.info = message.info; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/slashing.ts b/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/slashing.ts index cf19b468a1..e1f9756e10 100644 --- a/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/slashing.ts +++ b/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/slashing.ts @@ -221,12 +221,12 @@ export const ValidatorSigningInfo = { }, 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.address = message.address === "" ? undefined : message.address; + obj.start_height = message.startHeight !== BigInt(0) ? message.startHeight.toString() : undefined; + obj.index_offset = message.indexOffset !== BigInt(0) ? message.indexOffset.toString() : undefined; obj.jailed_until = message.jailedUntil ? Timestamp.toAmino(toTimestamp(message.jailedUntil)) : undefined; - obj.tombstoned = message.tombstoned; - obj.missed_blocks_counter = message.missedBlocksCounter ? message.missedBlocksCounter.toString() : undefined; + obj.tombstoned = message.tombstoned === false ? undefined : message.tombstoned; + obj.missed_blocks_counter = message.missedBlocksCounter !== BigInt(0) ? message.missedBlocksCounter.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorSigningInfoAminoMsg): ValidatorSigningInfo { @@ -388,7 +388,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.signed_blocks_window = message.signedBlocksWindow ? message.signedBlocksWindow.toString() : undefined; + obj.signed_blocks_window = message.signedBlocksWindow !== BigInt(0) ? message.signedBlocksWindow.toString() : undefined; obj.min_signed_per_window = message.minSignedPerWindow ? base64FromBytes(message.minSignedPerWindow) : undefined; obj.downtime_jail_duration = message.downtimeJailDuration ? Duration.toAmino(message.downtimeJailDuration) : undefined; obj.slash_fraction_double_sign = message.slashFractionDoubleSign ? base64FromBytes(message.slashFractionDoubleSign) : undefined; diff --git a/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/tx.ts index 9a9294f90e..95d3b99a07 100644 --- a/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/slashing/v1beta1/tx.ts @@ -90,7 +90,7 @@ export const MsgUnjail = { }, toAmino(message: MsgUnjail): MsgUnjailAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr ?? ""; return obj; }, fromAminoMsg(object: MsgUnjailAminoMsg): MsgUnjail { diff --git a/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/authz.ts b/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/authz.ts index 621f68c7b0..c068fd6167 100644 --- a/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/authz.ts @@ -219,7 +219,7 @@ export const StakeAuthorization = { message.denyList = StakeAuthorization_Validators.fromAmino(object.deny_list); } if (object.authorization_type !== undefined && object.authorization_type !== null) { - message.authorizationType = authorizationTypeFromJSON(object.authorization_type); + message.authorizationType = object.authorization_type; } return message; }, @@ -228,7 +228,7 @@ export const StakeAuthorization = { 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; + obj.authorization_type = message.authorizationType === 0 ? undefined : message.authorizationType; return obj; }, fromAminoMsg(object: StakeAuthorizationAminoMsg): StakeAuthorization { @@ -331,7 +331,7 @@ export const StakeAuthorization_Validators = { if (message.address) { obj.address = message.address.map(e => e); } else { - obj.address = []; + obj.address = message.address; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/genesis.ts index 0fad7d8290..0c34e2d307 100644 --- a/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/genesis.ts @@ -275,29 +275,29 @@ export const GenesisState = { if (message.lastValidatorPowers) { obj.last_validator_powers = message.lastValidatorPowers.map(e => e ? LastValidatorPower.toAmino(e) : undefined); } else { - obj.last_validator_powers = []; + obj.last_validator_powers = message.lastValidatorPowers; } if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } if (message.delegations) { obj.delegations = message.delegations.map(e => e ? Delegation.toAmino(e) : undefined); } else { - obj.delegations = []; + obj.delegations = message.delegations; } if (message.unbondingDelegations) { obj.unbonding_delegations = message.unbondingDelegations.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_delegations = []; + obj.unbonding_delegations = message.unbondingDelegations; } if (message.redelegations) { obj.redelegations = message.redelegations.map(e => e ? Redelegation.toAmino(e) : undefined); } else { - obj.redelegations = []; + obj.redelegations = message.redelegations; } - obj.exported = message.exported; + obj.exported = message.exported === false ? undefined : message.exported; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -409,8 +409,8 @@ export const LastValidatorPower = { }, toAmino(message: LastValidatorPower): LastValidatorPowerAmino { const obj: any = {}; - obj.address = message.address; - obj.power = message.power ? message.power.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: LastValidatorPowerAminoMsg): LastValidatorPower { diff --git a/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/query.ts index ad35bdb607..8949ac7d7c 100644 --- a/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/query.ts @@ -605,7 +605,7 @@ export const QueryValidatorsRequest = { }, toAmino(message: QueryValidatorsRequest): QueryValidatorsRequestAmino { const obj: any = {}; - obj.status = message.status; + obj.status = message.status === "" ? undefined : message.status; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -727,7 +727,7 @@ export const QueryValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -823,7 +823,7 @@ export const QueryValidatorRequest = { }, toAmino(message: QueryValidatorRequest): QueryValidatorRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryValidatorRequestAminoMsg): QueryValidatorRequest { @@ -1031,7 +1031,7 @@ export const QueryValidatorDelegationsRequest = { }, toAmino(message: QueryValidatorDelegationsRequest): QueryValidatorDelegationsRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1153,7 +1153,7 @@ export const QueryValidatorDelegationsResponse = { if (message.delegationResponses) { obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_responses = []; + obj.delegation_responses = message.delegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1267,7 +1267,7 @@ export const QueryValidatorUnbondingDelegationsRequest = { }, toAmino(message: QueryValidatorUnbondingDelegationsRequest): QueryValidatorUnbondingDelegationsRequestAmino { const obj: any = {}; - obj.validator_addr = message.validatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1389,7 +1389,7 @@ export const QueryValidatorUnbondingDelegationsResponse = { if (message.unbondingResponses) { obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_responses = []; + obj.unbonding_responses = message.unbondingResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1501,8 +1501,8 @@ export const QueryDelegationRequest = { }, toAmino(message: QueryDelegationRequest): QueryDelegationRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryDelegationRequestAminoMsg): QueryDelegationRequest { @@ -1708,8 +1708,8 @@ export const QueryUnbondingDelegationRequest = { }, toAmino(message: QueryUnbondingDelegationRequest): QueryUnbondingDelegationRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryUnbondingDelegationRequestAminoMsg): QueryUnbondingDelegationRequest { @@ -1917,7 +1917,7 @@ export const QueryDelegatorDelegationsRequest = { }, toAmino(message: QueryDelegatorDelegationsRequest): QueryDelegatorDelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2039,7 +2039,7 @@ export const QueryDelegatorDelegationsResponse = { if (message.delegationResponses) { obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_responses = []; + obj.delegation_responses = message.delegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2153,7 +2153,7 @@ export const QueryDelegatorUnbondingDelegationsRequest = { }, toAmino(message: QueryDelegatorUnbondingDelegationsRequest): QueryDelegatorUnbondingDelegationsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2275,7 +2275,7 @@ export const QueryDelegatorUnbondingDelegationsResponse = { if (message.unbondingResponses) { obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); } else { - obj.unbonding_responses = []; + obj.unbonding_responses = message.unbondingResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2421,9 +2421,9 @@ export const QueryRedelegationsRequest = { }, 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.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.src_validator_addr = message.srcValidatorAddr === "" ? undefined : message.srcValidatorAddr; + obj.dst_validator_addr = message.dstValidatorAddr === "" ? undefined : message.dstValidatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2545,7 +2545,7 @@ export const QueryRedelegationsResponse = { if (message.redelegationResponses) { obj.redelegation_responses = message.redelegationResponses.map(e => e ? RedelegationResponse.toAmino(e) : undefined); } else { - obj.redelegation_responses = []; + obj.redelegation_responses = message.redelegationResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2659,7 +2659,7 @@ export const QueryDelegatorValidatorsRequest = { }, toAmino(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2781,7 +2781,7 @@ export const QueryDelegatorValidatorsResponse = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2893,8 +2893,8 @@ export const QueryDelegatorValidatorRequest = { }, toAmino(message: QueryDelegatorValidatorRequest): QueryDelegatorValidatorRequestAmino { const obj: any = {}; - obj.delegator_addr = message.delegatorAddr; - obj.validator_addr = message.validatorAddr; + obj.delegator_addr = message.delegatorAddr === "" ? undefined : message.delegatorAddr; + obj.validator_addr = message.validatorAddr === "" ? undefined : message.validatorAddr; return obj; }, fromAminoMsg(object: QueryDelegatorValidatorRequestAminoMsg): QueryDelegatorValidatorRequest { @@ -3086,7 +3086,7 @@ export const QueryHistoricalInfoRequest = { }, toAmino(message: QueryHistoricalInfoRequest): QueryHistoricalInfoRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: QueryHistoricalInfoRequestAminoMsg): QueryHistoricalInfoRequest { diff --git a/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/staking.ts index a503a1be54..a9f39d7534 100644 --- a/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/staking.ts +++ b/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/staking.ts @@ -624,7 +624,7 @@ export const HistoricalInfo = { if (message.valset) { obj.valset = message.valset.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.valset = []; + obj.valset = message.valset; } return obj; }, @@ -751,9 +751,9 @@ export const CommissionRates = { }, toAmino(message: CommissionRates): CommissionRatesAmino { const obj: any = {}; - obj.rate = message.rate; - obj.max_rate = message.maxRate; - obj.max_change_rate = message.maxChangeRate; + obj.rate = message.rate === "" ? undefined : message.rate; + obj.max_rate = message.maxRate === "" ? undefined : message.maxRate; + obj.max_change_rate = message.maxChangeRate === "" ? undefined : message.maxChangeRate; return obj; }, fromAminoMsg(object: CommissionRatesAminoMsg): CommissionRates { @@ -1024,11 +1024,11 @@ export const Description = { }, 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; + obj.moniker = message.moniker === "" ? undefined : message.moniker; + obj.identity = message.identity === "" ? undefined : message.identity; + obj.website = message.website === "" ? undefined : message.website; + obj.security_contact = message.securityContact === "" ? undefined : message.securityContact; + obj.details = message.details === "" ? undefined : message.details; return obj; }, fromAminoMsg(object: DescriptionAminoMsg): Description { @@ -1263,7 +1263,7 @@ export const Validator = { message.jailed = object.jailed; } if (object.status !== undefined && object.status !== null) { - message.status = bondStatusFromJSON(object.status); + message.status = object.status; } if (object.tokens !== undefined && object.tokens !== null) { message.tokens = object.tokens; @@ -1290,17 +1290,17 @@ export const Validator = { }, toAmino(message: Validator): ValidatorAmino { const obj: any = {}; - obj.operator_address = message.operatorAddress; + obj.operator_address = message.operatorAddress === "" ? undefined : 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.jailed = message.jailed === false ? undefined : message.jailed; + obj.status = message.status === 0 ? undefined : message.status; + obj.tokens = message.tokens === "" ? undefined : message.tokens; + obj.delegator_shares = message.delegatorShares === "" ? undefined : message.delegatorShares; obj.description = message.description ? Description.toAmino(message.description) : undefined; - obj.unbonding_height = message.unbondingHeight ? message.unbondingHeight.toString() : undefined; + obj.unbonding_height = message.unbondingHeight !== BigInt(0) ? message.unbondingHeight.toString() : undefined; obj.unbonding_time = message.unbondingTime ? Timestamp.toAmino(toTimestamp(message.unbondingTime)) : undefined; obj.commission = message.commission ? Commission.toAmino(message.commission) : undefined; - obj.min_self_delegation = message.minSelfDelegation; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -1403,7 +1403,7 @@ export const ValAddresses = { if (message.addresses) { obj.addresses = message.addresses.map(e => e); } else { - obj.addresses = []; + obj.addresses = message.addresses; } return obj; }, @@ -1514,8 +1514,8 @@ export const DVPair = { }, toAmino(message: DVPair): DVPairAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; return obj; }, fromAminoMsg(object: DVPairAminoMsg): DVPair { @@ -1618,7 +1618,7 @@ export const DVPairs = { if (message.pairs) { obj.pairs = message.pairs.map(e => e ? DVPair.toAmino(e) : undefined); } else { - obj.pairs = []; + obj.pairs = message.pairs; } return obj; }, @@ -1745,9 +1745,9 @@ export const DVVTriplet = { }, toAmino(message: DVVTriplet): DVVTripletAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; return obj; }, fromAminoMsg(object: DVVTripletAminoMsg): DVVTriplet { @@ -1850,7 +1850,7 @@ export const DVVTriplets = { if (message.triplets) { obj.triplets = message.triplets.map(e => e ? DVVTriplet.toAmino(e) : undefined); } else { - obj.triplets = []; + obj.triplets = message.triplets; } return obj; }, @@ -1977,9 +1977,9 @@ export const Delegation = { }, toAmino(message: Delegation): DelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.shares = message.shares; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.shares = message.shares === "" ? undefined : message.shares; return obj; }, fromAminoMsg(object: DelegationAminoMsg): Delegation { @@ -2111,12 +2111,12 @@ export const UnbondingDelegation = { }, toAmino(message: UnbondingDelegation): UnbondingDelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; if (message.entries) { obj.entries = message.entries.map(e => e ? UnbondingDelegationEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2261,10 +2261,10 @@ export const UnbondingDelegationEntry = { }, toAmino(message: UnbondingDelegationEntry): UnbondingDelegationEntryAmino { const obj: any = {}; - obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.creation_height = message.creationHeight !== BigInt(0) ? message.creationHeight.toString() : undefined; obj.completion_time = message.completionTime ? Timestamp.toAmino(toTimestamp(message.completionTime)) : undefined; - obj.initial_balance = message.initialBalance; - obj.balance = message.balance; + obj.initial_balance = message.initialBalance === "" ? undefined : message.initialBalance; + obj.balance = message.balance === "" ? undefined : message.balance; return obj; }, fromAminoMsg(object: UnbondingDelegationEntryAminoMsg): UnbondingDelegationEntry { @@ -2408,10 +2408,10 @@ export const RedelegationEntry = { }, toAmino(message: RedelegationEntry): RedelegationEntryAmino { const obj: any = {}; - obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.creation_height = message.creationHeight !== BigInt(0) ? message.creationHeight.toString() : undefined; obj.completion_time = message.completionTime ? Timestamp.toAmino(toTimestamp(message.completionTime)) : undefined; - obj.initial_balance = message.initialBalance; - obj.shares_dst = message.sharesDst; + obj.initial_balance = message.initialBalance === "" ? undefined : message.initialBalance; + obj.shares_dst = message.sharesDst === "" ? undefined : message.sharesDst; return obj; }, fromAminoMsg(object: RedelegationEntryAminoMsg): RedelegationEntry { @@ -2559,13 +2559,13 @@ export const Redelegation = { }, toAmino(message: Redelegation): RedelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_src_address = message.validatorSrcAddress; - obj.validator_dst_address = message.validatorDstAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; if (message.entries) { obj.entries = message.entries.map(e => e ? RedelegationEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2743,11 +2743,11 @@ export const Params = { 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; + obj.max_validators = message.maxValidators === 0 ? undefined : message.maxValidators; + obj.max_entries = message.maxEntries === 0 ? undefined : message.maxEntries; + obj.historical_entries = message.historicalEntries === 0 ? undefined : message.historicalEntries; + obj.bond_denom = message.bondDenom === "" ? undefined : message.bondDenom; + obj.min_commission_rate = message.minCommissionRate === "" ? undefined : message.minCommissionRate; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -2975,7 +2975,7 @@ export const RedelegationEntryResponse = { toAmino(message: RedelegationEntryResponse): RedelegationEntryResponseAmino { const obj: any = {}; obj.redelegation_entry = message.redelegationEntry ? RedelegationEntry.toAmino(message.redelegationEntry) : undefined; - obj.balance = message.balance; + obj.balance = message.balance === "" ? undefined : message.balance; return obj; }, fromAminoMsg(object: RedelegationEntryResponseAminoMsg): RedelegationEntryResponse { @@ -3097,7 +3097,7 @@ export const RedelegationResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? RedelegationEntryResponse.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -3208,8 +3208,8 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.not_bonded_tokens = message.notBondedTokens; - obj.bonded_tokens = message.bondedTokens; + obj.not_bonded_tokens = message.notBondedTokens ?? ""; + obj.bonded_tokens = message.bondedTokens ?? ""; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { diff --git a/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/tx.ts index ba705910f9..d600227701 100644 --- a/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/tx.ts @@ -346,9 +346,9 @@ export const MsgCreateValidator = { 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.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; obj.value = message.value ? Coin.toAmino(message.value) : undefined; return obj; @@ -569,9 +569,9 @@ export const MsgEditValidator = { 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; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.commission_rate = message.commissionRate === "" ? undefined : message.commissionRate; + obj.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; return obj; }, fromAminoMsg(object: MsgEditValidatorAminoMsg): MsgEditValidator { @@ -773,8 +773,8 @@ export const MsgDelegate = { }, toAmino(message: MsgDelegate): MsgDelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -993,9 +993,9 @@ export const MsgBeginRedelegate = { }, 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.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress === "" ? undefined : message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress === "" ? undefined : message.validatorDstAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -1218,8 +1218,8 @@ export const MsgUndelegate = { }, toAmino(message: MsgUndelegate): MsgUndelegateAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/tx/signing/v1beta1/signing.ts b/__fixtures__/v-next/outputv4/cosmos/tx/signing/v1beta1/signing.ts index 49239110d6..d6f2bf58bb 100644 --- a/__fixtures__/v-next/outputv4/cosmos/tx/signing/v1beta1/signing.ts +++ b/__fixtures__/v-next/outputv4/cosmos/tx/signing/v1beta1/signing.ts @@ -258,7 +258,7 @@ export const SignatureDescriptors = { if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor.toAmino(e) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -393,7 +393,7 @@ export const SignatureDescriptor = { 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; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureDescriptorAminoMsg): SignatureDescriptor { @@ -609,7 +609,7 @@ export const SignatureDescriptor_Data_Single = { fromAmino(object: SignatureDescriptor_Data_SingleAmino): SignatureDescriptor_Data_Single { const message = createBaseSignatureDescriptor_Data_Single(); if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.signature !== undefined && object.signature !== null) { message.signature = bytesFromBase64(object.signature); @@ -618,7 +618,7 @@ export const SignatureDescriptor_Data_Single = { }, toAmino(message: SignatureDescriptor_Data_Single): SignatureDescriptor_Data_SingleAmino { const obj: any = {}; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; return obj; }, @@ -741,7 +741,7 @@ export const SignatureDescriptor_Data_Multi = { if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor_Data.toAmino(e) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/tx/v1beta1/service.ts b/__fixtures__/v-next/outputv4/cosmos/tx/v1beta1/service.ts index 377a4cde9f..4c39105a05 100644 --- a/__fixtures__/v-next/outputv4/cosmos/tx/v1beta1/service.ts +++ b/__fixtures__/v-next/outputv4/cosmos/tx/v1beta1/service.ts @@ -438,7 +438,7 @@ export const GetTxsEventRequest = { message.pagination = PageRequest.fromAmino(object.pagination); } if (object.order_by !== undefined && object.order_by !== null) { - message.orderBy = orderByFromJSON(object.order_by); + message.orderBy = object.order_by; } return message; }, @@ -447,10 +447,10 @@ export const GetTxsEventRequest = { if (message.events) { obj.events = message.events.map(e => e); } else { - obj.events = []; + obj.events = message.events; } obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; - obj.order_by = message.orderBy; + obj.order_by = message.orderBy === 0 ? undefined : message.orderBy; return obj; }, fromAminoMsg(object: GetTxsEventRequestAminoMsg): GetTxsEventRequest { @@ -593,12 +593,12 @@ export const GetTxsEventResponse = { if (message.txs) { obj.txs = message.txs.map(e => e ? Tx.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } if (message.txResponses) { obj.tx_responses = message.txResponses.map(e => e ? TxResponse.toAmino(e) : undefined); } else { - obj.tx_responses = []; + obj.tx_responses = message.txResponses; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -704,14 +704,14 @@ export const BroadcastTxRequest = { message.txBytes = bytesFromBase64(object.tx_bytes); } if (object.mode !== undefined && object.mode !== null) { - message.mode = broadcastModeFromJSON(object.mode); + message.mode = object.mode; } return message; }, toAmino(message: BroadcastTxRequest): BroadcastTxRequestAmino { const obj: any = {}; obj.tx_bytes = message.txBytes ? base64FromBytes(message.txBytes) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; return obj; }, fromAminoMsg(object: BroadcastTxRequestAminoMsg): BroadcastTxRequest { @@ -1129,7 +1129,7 @@ export const GetTxRequest = { }, toAmino(message: GetTxRequest): GetTxRequestAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === "" ? undefined : message.hash; return obj; }, fromAminoMsg(object: GetTxRequestAminoMsg): GetTxRequest { @@ -1358,7 +1358,7 @@ export const GetBlockWithTxsRequest = { }, toAmino(message: GetBlockWithTxsRequest): GetBlockWithTxsRequestAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1516,7 +1516,7 @@ export const GetBlockWithTxsResponse = { if (message.txs) { obj.txs = message.txs.map(e => e ? Tx.toAmino(e) : undefined); } else { - obj.txs = []; + obj.txs = message.txs; } obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.block = message.block ? Block.toAmino(message.block) : undefined; diff --git a/__fixtures__/v-next/outputv4/cosmos/tx/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/tx/v1beta1/tx.ts index a169f0e0f9..94569400d1 100644 --- a/__fixtures__/v-next/outputv4/cosmos/tx/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/tx/v1beta1/tx.ts @@ -556,7 +556,7 @@ export const Tx = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -694,7 +694,7 @@ export const TxRaw = { if (message.signatures) { obj.signatures = message.signatures.map(e => base64FromBytes(e)); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -841,8 +841,8 @@ export const SignDoc = { const obj: any = {}; obj.body_bytes = message.bodyBytes ? base64FromBytes(message.bodyBytes) : undefined; obj.auth_info_bytes = message.authInfoBytes ? base64FromBytes(message.authInfoBytes) : undefined; - obj.chain_id = message.chainId; - obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; return obj; }, fromAminoMsg(object: SignDocAminoMsg): SignDoc { @@ -1026,9 +1026,9 @@ export const SignDocDirectAux = { const obj: any = {}; obj.body_bytes = message.bodyBytes ? base64FromBytes(message.bodyBytes) : undefined; 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.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.account_number = message.accountNumber !== BigInt(0) ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined; return obj; }, @@ -1210,19 +1210,19 @@ export const TxBody = { if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.messages = []; + obj.messages = message.messages; } - obj.memo = message.memo; - obj.timeout_height = message.timeoutHeight ? message.timeoutHeight.toString() : undefined; + obj.memo = message.memo === "" ? undefined : message.memo; + obj.timeout_height = message.timeoutHeight !== BigInt(0) ? message.timeoutHeight.toString() : undefined; if (message.extensionOptions) { obj.extension_options = message.extensionOptions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extension_options = []; + obj.extension_options = message.extensionOptions; } if (message.nonCriticalExtensionOptions) { obj.non_critical_extension_options = message.nonCriticalExtensionOptions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.non_critical_extension_options = []; + obj.non_critical_extension_options = message.nonCriticalExtensionOptions; } return obj; }, @@ -1362,7 +1362,7 @@ export const AuthInfo = { if (message.signerInfos) { obj.signer_infos = message.signerInfos.map(e => e ? SignerInfo.toAmino(e) : undefined); } else { - obj.signer_infos = []; + obj.signer_infos = message.signerInfos; } obj.fee = message.fee ? Fee.toAmino(message.fee) : undefined; obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined; @@ -1499,7 +1499,7 @@ export const SignerInfo = { 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; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: SignerInfoAminoMsg): SignerInfo { @@ -1702,13 +1702,13 @@ export const ModeInfo_Single = { fromAmino(object: ModeInfo_SingleAmino): ModeInfo_Single { const message = createBaseModeInfo_Single(); if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } return message; }, toAmino(message: ModeInfo_Single): ModeInfo_SingleAmino { const obj: any = {}; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; return obj; }, fromAminoMsg(object: ModeInfo_SingleAminoMsg): ModeInfo_Single { @@ -1830,7 +1830,7 @@ export const ModeInfo_Multi = { if (message.modeInfos) { obj.mode_infos = message.modeInfos.map(e => e ? ModeInfo.toAmino(e) : undefined); } else { - obj.mode_infos = []; + obj.mode_infos = message.modeInfos; } return obj; }, @@ -1984,11 +1984,11 @@ export const Fee = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.gas_limit = message.gasLimit ? message.gasLimit.toString() : undefined; - obj.payer = message.payer; - obj.granter = message.granter; + obj.gas_limit = message.gasLimit !== BigInt(0) ? message.gasLimit.toString() : undefined; + obj.payer = message.payer === "" ? undefined : message.payer; + obj.granter = message.granter === "" ? undefined : message.granter; return obj; }, fromAminoMsg(object: FeeAminoMsg): Fee { @@ -2107,9 +2107,9 @@ export const Tip = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.tipper = message.tipper; + obj.tipper = message.tipper === "" ? undefined : message.tipper; return obj; }, fromAminoMsg(object: TipAminoMsg): Tip { @@ -2244,7 +2244,7 @@ export const AuxSignerData = { message.signDoc = SignDocDirectAux.fromAmino(object.sign_doc); } if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.sig !== undefined && object.sig !== null) { message.sig = bytesFromBase64(object.sig); @@ -2253,9 +2253,9 @@ export const AuxSignerData = { }, toAmino(message: AuxSignerData): AuxSignerDataAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.sign_doc = message.signDoc ? SignDocDirectAux.toAmino(message.signDoc) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.sig = message.sig ? base64FromBytes(message.sig) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/upgrade/v1beta1/query.ts b/__fixtures__/v-next/outputv4/cosmos/upgrade/v1beta1/query.ts index 496351bab8..3802cccd71 100644 --- a/__fixtures__/v-next/outputv4/cosmos/upgrade/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmos/upgrade/v1beta1/query.ts @@ -443,7 +443,7 @@ export const QueryAppliedPlanRequest = { }, toAmino(message: QueryAppliedPlanRequest): QueryAppliedPlanRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: QueryAppliedPlanRequestAminoMsg): QueryAppliedPlanRequest { @@ -539,7 +539,7 @@ export const QueryAppliedPlanResponse = { }, toAmino(message: QueryAppliedPlanResponse): QueryAppliedPlanResponseAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: QueryAppliedPlanResponseAminoMsg): QueryAppliedPlanResponse { @@ -635,7 +635,7 @@ export const QueryUpgradedConsensusStateRequest = { }, toAmino(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAmino { const obj: any = {}; - obj.last_height = message.lastHeight ? message.lastHeight.toString() : undefined; + obj.last_height = message.lastHeight !== BigInt(0) ? message.lastHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryUpgradedConsensusStateRequestAminoMsg): QueryUpgradedConsensusStateRequest { @@ -823,7 +823,7 @@ export const QueryModuleVersionsRequest = { }, toAmino(message: QueryModuleVersionsRequest): QueryModuleVersionsRequestAmino { const obj: any = {}; - obj.module_name = message.moduleName; + obj.module_name = message.moduleName === "" ? undefined : message.moduleName; return obj; }, fromAminoMsg(object: QueryModuleVersionsRequestAminoMsg): QueryModuleVersionsRequest { @@ -926,7 +926,7 @@ export const QueryModuleVersionsResponse = { if (message.moduleVersions) { obj.module_versions = message.moduleVersions.map(e => e ? ModuleVersion.toAmino(e) : undefined); } else { - obj.module_versions = []; + obj.module_versions = message.moduleVersions; } return obj; }, @@ -1095,7 +1095,7 @@ export const QueryAuthorityResponse = { }, toAmino(message: QueryAuthorityResponse): QueryAuthorityResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryAuthorityResponseAminoMsg): QueryAuthorityResponse { diff --git a/__fixtures__/v-next/outputv4/cosmos/upgrade/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/upgrade/v1beta1/tx.ts index 8b91d13afb..e1dd8a5a0a 100644 --- a/__fixtures__/v-next/outputv4/cosmos/upgrade/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/upgrade/v1beta1/tx.ts @@ -166,7 +166,7 @@ export const MsgSoftwareUpgrade = { }, toAmino(message: MsgSoftwareUpgrade): MsgSoftwareUpgradeAmino { const obj: any = {}; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; return obj; }, @@ -335,7 +335,7 @@ export const MsgCancelUpgrade = { }, toAmino(message: MsgCancelUpgrade): MsgCancelUpgradeAmino { const obj: any = {}; - obj.authority = message.authority; + obj.authority = message.authority === "" ? undefined : message.authority; return obj; }, fromAminoMsg(object: MsgCancelUpgradeAminoMsg): MsgCancelUpgrade { diff --git a/__fixtures__/v-next/outputv4/cosmos/upgrade/v1beta1/upgrade.ts b/__fixtures__/v-next/outputv4/cosmos/upgrade/v1beta1/upgrade.ts index 53a8f02865..c77b4f802f 100644 --- a/__fixtures__/v-next/outputv4/cosmos/upgrade/v1beta1/upgrade.ts +++ b/__fixtures__/v-next/outputv4/cosmos/upgrade/v1beta1/upgrade.ts @@ -269,10 +269,10 @@ export const Plan = { }, toAmino(message: Plan): PlanAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.height = message.height ? message.height.toString() : undefined; - obj.info = message.info; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.info = message.info === "" ? undefined : message.info; obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; return obj; }, @@ -401,8 +401,8 @@ export const SoftwareUpgradeProposal = { }, toAmino(message: SoftwareUpgradeProposal): SoftwareUpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; return obj; }, @@ -513,8 +513,8 @@ export const CancelSoftwareUpgradeProposal = { }, toAmino(message: CancelSoftwareUpgradeProposal): CancelSoftwareUpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: CancelSoftwareUpgradeProposalAminoMsg): CancelSoftwareUpgradeProposal { @@ -626,8 +626,8 @@ export const ModuleVersion = { }, toAmino(message: ModuleVersion): ModuleVersionAmino { const obj: any = {}; - obj.name = message.name; - obj.version = message.version ? message.version.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.version = message.version !== BigInt(0) ? message.version.toString() : undefined; return obj; }, fromAminoMsg(object: ModuleVersionAminoMsg): ModuleVersion { diff --git a/__fixtures__/v-next/outputv4/cosmos/vesting/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/cosmos/vesting/v1beta1/tx.ts index 2b6911c967..5d51a93a48 100644 --- a/__fixtures__/v-next/outputv4/cosmos/vesting/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmos/vesting/v1beta1/tx.ts @@ -246,15 +246,15 @@ export const MsgCreateVestingAccount = { }, toAmino(message: MsgCreateVestingAccount): MsgCreateVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } - obj.end_time = message.endTime ? message.endTime.toString() : undefined; - obj.delayed = message.delayed; + obj.end_time = message.endTime !== BigInt(0) ? message.endTime.toString() : undefined; + obj.delayed = message.delayed === false ? undefined : message.delayed; return obj; }, fromAminoMsg(object: MsgCreateVestingAccountAminoMsg): MsgCreateVestingAccount { @@ -460,12 +460,12 @@ export const MsgCreatePermanentLockedAccount = { }, toAmino(message: MsgCreatePermanentLockedAccount): MsgCreatePermanentLockedAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -690,13 +690,13 @@ export const MsgCreatePeriodicVestingAccount = { }, 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; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos/vesting/v1beta1/vesting.ts b/__fixtures__/v-next/outputv4/cosmos/vesting/v1beta1/vesting.ts index ce283a3b2e..a08a48b3fd 100644 --- a/__fixtures__/v-next/outputv4/cosmos/vesting/v1beta1/vesting.ts +++ b/__fixtures__/v-next/outputv4/cosmos/vesting/v1beta1/vesting.ts @@ -288,19 +288,19 @@ export const BaseVestingAccount = { if (message.originalVesting) { obj.original_vesting = message.originalVesting.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.original_vesting = []; + obj.original_vesting = message.originalVesting; } if (message.delegatedFree) { obj.delegated_free = message.delegatedFree.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.delegated_free = []; + obj.delegated_free = message.delegatedFree; } if (message.delegatedVesting) { obj.delegated_vesting = message.delegatedVesting.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.delegated_vesting = []; + obj.delegated_vesting = message.delegatedVesting; } - obj.end_time = message.endTime ? message.endTime.toString() : undefined; + obj.end_time = message.endTime !== BigInt(0) ? message.endTime.toString() : undefined; return obj; }, fromAminoMsg(object: BaseVestingAccountAminoMsg): BaseVestingAccount { @@ -415,7 +415,7 @@ export const ContinuousVestingAccount = { 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; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; return obj; }, fromAminoMsg(object: ContinuousVestingAccountAminoMsg): ContinuousVestingAccount { @@ -629,11 +629,11 @@ export const Period = { }, toAmino(message: Period): PeriodAmino { const obj: any = {}; - obj.length = message.length ? message.length.toString() : undefined; + obj.length = message.length !== BigInt(0) ? message.length.toString() : undefined; if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -771,11 +771,11 @@ export const PeriodicVestingAccount = { 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; + obj.start_time = message.startTime !== BigInt(0) ? message.startTime.toString() : undefined; if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmos_proto/cosmos.ts b/__fixtures__/v-next/outputv4/cosmos_proto/cosmos.ts index 03ed813507..323c2ddf40 100644 --- a/__fixtures__/v-next/outputv4/cosmos_proto/cosmos.ts +++ b/__fixtures__/v-next/outputv4/cosmos_proto/cosmos.ts @@ -202,8 +202,8 @@ export const InterfaceDescriptor = { }, toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: InterfaceDescriptorAminoMsg): InterfaceDescriptor { @@ -333,17 +333,17 @@ export const ScalarDescriptor = { if (object.description !== undefined && object.description !== null) { message.description = object.description; } - message.fieldType = object.field_type?.map(e => scalarTypeFromJSON(e)) || []; + message.fieldType = object.field_type?.map(e => e) || []; return message; }, toAmino(message: ScalarDescriptor): ScalarDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; if (message.fieldType) { obj.field_type = message.fieldType.map(e => e); } else { - obj.field_type = []; + obj.field_type = message.fieldType; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/genesis.ts b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/genesis.ts index 53c8bf0dde..81f21b3f15 100644 --- a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/genesis.ts @@ -257,22 +257,22 @@ export const GenesisState = { if (message.codes) { obj.codes = message.codes.map(e => e ? Code.toAmino(e) : undefined); } else { - obj.codes = []; + obj.codes = message.codes; } if (message.contracts) { obj.contracts = message.contracts.map(e => e ? Contract.toAmino(e) : undefined); } else { - obj.contracts = []; + obj.contracts = message.contracts; } if (message.sequences) { obj.sequences = message.sequences.map(e => e ? Sequence.toAmino(e) : undefined); } else { - obj.sequences = []; + obj.sequences = message.sequences; } if (message.genMsgs) { obj.gen_msgs = message.genMsgs.map(e => e ? GenesisState_GenMsgs.toAmino(e) : undefined); } else { - obj.gen_msgs = []; + obj.gen_msgs = message.genMsgs; } return obj; }, @@ -553,10 +553,10 @@ export const Code = { }, toAmino(message: Code): CodeAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.code_info = message.codeInfo ? CodeInfo.toAmino(message.codeInfo) : undefined; obj.code_bytes = message.codeBytes ? base64FromBytes(message.codeBytes) : undefined; - obj.pinned = message.pinned; + obj.pinned = message.pinned === false ? undefined : message.pinned; return obj; }, fromAminoMsg(object: CodeAminoMsg): Code { @@ -690,12 +690,12 @@ export const Contract = { }, toAmino(message: Contract): ContractAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : 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 = []; + obj.contract_state = message.contractState; } return obj; }, @@ -809,7 +809,7 @@ export const Sequence = { toAmino(message: Sequence): SequenceAmino { const obj: any = {}; obj.id_key = message.idKey ? base64FromBytes(message.idKey) : undefined; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: SequenceAminoMsg): Sequence { diff --git a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/ibc.ts b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/ibc.ts index 83feddf0a2..e9ac988fc2 100644 --- a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/ibc.ts +++ b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/ibc.ts @@ -165,9 +165,9 @@ export const MsgIBCSend = { }, 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.channel = message.channel === "" ? undefined : message.channel; + obj.timeout_height = message.timeoutHeight !== BigInt(0) ? message.timeoutHeight.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -262,7 +262,7 @@ export const MsgIBCCloseChannel = { }, toAmino(message: MsgIBCCloseChannel): MsgIBCCloseChannelAmino { const obj: any = {}; - obj.channel = message.channel; + obj.channel = message.channel === "" ? undefined : message.channel; return obj; }, fromAminoMsg(object: MsgIBCCloseChannelAminoMsg): MsgIBCCloseChannel { diff --git a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/proposal.ts b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/proposal.ts index ca49c00721..f3f216feba 100644 --- a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/proposal.ts +++ b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/proposal.ts @@ -382,9 +382,9 @@ export const StoreCodeProposal = { }, toAmino(message: StoreCodeProposal): StoreCodeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.run_as = message.runAs; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; return obj; @@ -600,17 +600,17 @@ export const InstantiateContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -771,10 +771,10 @@ export const MigrateContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -917,9 +917,9 @@ export const SudoContractProposal = { }, toAmino(message: SudoContractProposal): SudoContractProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1100,15 +1100,15 @@ export const ExecuteContractProposal = { }, 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.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.run_as = message.runAs === "" ? undefined : message.runAs; + obj.contract = message.contract === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -1251,10 +1251,10 @@ export const UpdateAdminProposal = { }, toAmino(message: UpdateAdminProposal): UpdateAdminProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.new_admin = message.newAdmin; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: UpdateAdminProposalAminoMsg): UpdateAdminProposal { @@ -1380,9 +1380,9 @@ export const ClearAdminProposal = { }, toAmino(message: ClearAdminProposal): ClearAdminProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: ClearAdminProposalAminoMsg): ClearAdminProposal { @@ -1523,12 +1523,12 @@ export const PinCodesProposal = { }, toAmino(message: PinCodesProposal): PinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, @@ -1670,12 +1670,12 @@ export const UnpinCodesProposal = { }, toAmino(message: UnpinCodesProposal): UnpinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/query.ts index bb2d5d1cce..922d121679 100644 --- a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/query.ts @@ -437,7 +437,7 @@ export const QueryContractInfoRequest = { }, toAmino(message: QueryContractInfoRequest): QueryContractInfoRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryContractInfoRequestAminoMsg): QueryContractInfoRequest { @@ -549,7 +549,7 @@ export const QueryContractInfoResponse = { }, toAmino(message: QueryContractInfoResponse): QueryContractInfoResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.contract_info = message.contractInfo ? ContractInfo.toAmino(message.contractInfo) : undefined; return obj; }, @@ -662,7 +662,7 @@ export const QueryContractHistoryRequest = { }, toAmino(message: QueryContractHistoryRequest): QueryContractHistoryRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -784,7 +784,7 @@ export const QueryContractHistoryResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? ContractCodeHistoryEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -900,7 +900,7 @@ export const QueryContractsByCodeRequest = { }, toAmino(message: QueryContractsByCodeRequest): QueryContractsByCodeRequestAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1022,7 +1022,7 @@ export const QueryContractsByCodeResponse = { if (message.contracts) { obj.contracts = message.contracts.map(e => e); } else { - obj.contracts = []; + obj.contracts = message.contracts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1136,7 +1136,7 @@ export const QueryAllContractStateRequest = { }, toAmino(message: QueryAllContractStateRequest): QueryAllContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1258,7 +1258,7 @@ export const QueryAllContractStateResponse = { if (message.models) { obj.models = message.models.map(e => e ? Model.toAmino(e) : undefined); } else { - obj.models = []; + obj.models = message.models; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1370,7 +1370,7 @@ export const QueryRawContractStateRequest = { }, toAmino(message: QueryRawContractStateRequest): QueryRawContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? base64FromBytes(message.queryData) : undefined; return obj; }, @@ -1575,7 +1575,7 @@ export const QuerySmartContractStateRequest = { }, toAmino(message: QuerySmartContractStateRequest): QuerySmartContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? JSON.parse(fromUtf8(message.queryData)) : undefined; return obj; }, @@ -1766,7 +1766,7 @@ export const QueryCodeRequest = { }, toAmino(message: QueryCodeRequest): QueryCodeRequestAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCodeRequestAminoMsg): QueryCodeRequest { @@ -1894,8 +1894,8 @@ export const CodeInfoResponse = { }, toAmino(message: CodeInfoResponse): CodeInfoResponseAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; - obj.creator = message.creator; + obj.code_id = message.codeId ? message.codeId.toString() : "0"; + obj.creator = message.creator === "" ? undefined : message.creator; obj.data_hash = message.dataHash ? base64FromBytes(message.dataHash) : undefined; return obj; }, @@ -2009,7 +2009,7 @@ export const QueryCodeResponse = { toAmino(message: QueryCodeResponse): QueryCodeResponseAmino { const obj: any = {}; obj.code_info = message.codeInfo ? CodeInfoResponse.toAmino(message.codeInfo) : undefined; - obj.data = message.data ? base64FromBytes(message.data) : undefined; + obj.data = message.data ? base64FromBytes(message.data) : ""; return obj; }, fromAminoMsg(object: QueryCodeResponseAminoMsg): QueryCodeResponse { @@ -2226,7 +2226,7 @@ export const QueryCodesResponse = { if (message.codeInfos) { obj.code_infos = message.codeInfos.map(e => e ? CodeInfoResponse.toAmino(e) : undefined); } else { - obj.code_infos = []; + obj.code_infos = message.codeInfos; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2454,7 +2454,7 @@ export const QueryPinnedCodesResponse = { if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/tx.ts b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/tx.ts index b020cc0738..a4fcbdb309 100644 --- a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/tx.ts +++ b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/tx.ts @@ -316,7 +316,7 @@ export const MsgStoreCode = { }, toAmino(message: MsgStoreCode): MsgStoreCodeAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; return obj; @@ -414,7 +414,7 @@ export const MsgStoreCodeResponse = { }, toAmino(message: MsgStoreCodeResponse): MsgStoreCodeResponseAmino { const obj: any = {}; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgStoreCodeResponseAminoMsg): MsgStoreCodeResponse { @@ -596,15 +596,15 @@ export const MsgInstantiateContract = { }, 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.sender = message.sender === "" ? undefined : message.sender; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.label = message.label === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -715,7 +715,7 @@ export const MsgInstantiateContractResponse = { }, toAmino(message: MsgInstantiateContractResponse): MsgInstantiateContractResponseAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -864,13 +864,13 @@ export const MsgExecuteContract = { }, toAmino(message: MsgExecuteContract): MsgExecuteContractAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, @@ -1109,9 +1109,9 @@ export const MsgMigrateContract = { }, 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.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; return obj; }, @@ -1332,9 +1332,9 @@ export const MsgUpdateAdmin = { }, toAmino(message: MsgUpdateAdmin): MsgUpdateAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.new_admin = message.newAdmin; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: MsgUpdateAdminAminoMsg): MsgUpdateAdmin { @@ -1518,8 +1518,8 @@ export const MsgClearAdmin = { }, toAmino(message: MsgClearAdmin): MsgClearAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: MsgClearAdminAminoMsg): MsgClearAdmin { diff --git a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/types.ts b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/types.ts index 99e37beb6e..04502688af 100644 --- a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/types.ts +++ b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/types.ts @@ -321,13 +321,13 @@ export const AccessTypeParam = { fromAmino(object: AccessTypeParamAmino): AccessTypeParam { const message = createBaseAccessTypeParam(); if (object.value !== undefined && object.value !== null) { - message.value = accessTypeFromJSON(object.value); + message.value = object.value; } return message; }, toAmino(message: AccessTypeParam): AccessTypeParamAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: AccessTypeParamAminoMsg): AccessTypeParam { @@ -428,7 +428,7 @@ export const AccessConfig = { fromAmino(object: AccessConfigAmino): AccessConfig { const message = createBaseAccessConfig(); if (object.permission !== undefined && object.permission !== null) { - message.permission = accessTypeFromJSON(object.permission); + message.permission = object.permission; } if (object.address !== undefined && object.address !== null) { message.address = object.address; @@ -437,8 +437,8 @@ export const AccessConfig = { }, toAmino(message: AccessConfig): AccessConfigAmino { const obj: any = {}; - obj.permission = message.permission; - obj.address = message.address; + obj.permission = message.permission === 0 ? undefined : message.permission; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { @@ -559,7 +559,7 @@ export const Params = { message.codeUploadAccess = AccessConfig.fromAmino(object.code_upload_access); } if (object.instantiate_default_permission !== undefined && object.instantiate_default_permission !== null) { - message.instantiateDefaultPermission = accessTypeFromJSON(object.instantiate_default_permission); + message.instantiateDefaultPermission = object.instantiate_default_permission; } if (object.max_wasm_code_size !== undefined && object.max_wasm_code_size !== null) { message.maxWasmCodeSize = BigInt(object.max_wasm_code_size); @@ -569,8 +569,8 @@ export const Params = { 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; + obj.instantiate_default_permission = message.instantiateDefaultPermission === 0 ? undefined : message.instantiateDefaultPermission; + obj.max_wasm_code_size = message.maxWasmCodeSize !== BigInt(0) ? message.maxWasmCodeSize.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -699,7 +699,7 @@ export const CodeInfo = { toAmino(message: CodeInfo): CodeInfoAmino { const obj: any = {}; obj.code_hash = message.codeHash ? base64FromBytes(message.codeHash) : undefined; - obj.creator = message.creator; + obj.creator = message.creator === "" ? undefined : message.creator; obj.instantiate_config = message.instantiateConfig ? AccessConfig.toAmino(message.instantiateConfig) : undefined; return obj; }, @@ -896,12 +896,12 @@ export const ContractInfo = { }, 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.code_id = message.codeId !== BigInt(0) ? message.codeId.toString() : undefined; + obj.creator = message.creator === "" ? undefined : message.creator; + obj.admin = message.admin === "" ? undefined : message.admin; + obj.label = message.label === "" ? undefined : message.label; obj.created = message.created ? AbsoluteTxPosition.toAmino(message.created) : undefined; - obj.ibc_port_id = message.ibcPortId; + obj.ibc_port_id = message.ibcPortId === "" ? undefined : message.ibcPortId; obj.extension = message.extension ? Any.toAmino(message.extension) : undefined; return obj; }, @@ -1033,7 +1033,7 @@ export const ContractCodeHistoryEntry = { fromAmino(object: ContractCodeHistoryEntryAmino): ContractCodeHistoryEntry { const message = createBaseContractCodeHistoryEntry(); if (object.operation !== undefined && object.operation !== null) { - message.operation = contractCodeHistoryOperationTypeFromJSON(object.operation); + message.operation = object.operation; } if (object.code_id !== undefined && object.code_id !== null) { message.codeId = BigInt(object.code_id); @@ -1048,8 +1048,8 @@ export const ContractCodeHistoryEntry = { }, toAmino(message: ContractCodeHistoryEntry): ContractCodeHistoryEntryAmino { const obj: any = {}; - obj.operation = message.operation; - obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.operation = message.operation === 0 ? undefined : message.operation; + obj.code_id = message.codeId !== BigInt(0) ? 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; @@ -1165,8 +1165,8 @@ export const AbsoluteTxPosition = { }, 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; + obj.block_height = message.blockHeight !== BigInt(0) ? message.blockHeight.toString() : undefined; + obj.tx_index = message.txIndex !== BigInt(0) ? message.txIndex.toString() : undefined; return obj; }, fromAminoMsg(object: AbsoluteTxPositionAminoMsg): AbsoluteTxPosition { diff --git a/__fixtures__/v-next/outputv4/evmos/claims/v1/claims.ts b/__fixtures__/v-next/outputv4/evmos/claims/v1/claims.ts index dccbc86aaa..7e6c20d76b 100644 --- a/__fixtures__/v-next/outputv4/evmos/claims/v1/claims.ts +++ b/__fixtures__/v-next/outputv4/evmos/claims/v1/claims.ts @@ -211,7 +211,7 @@ export const Claim = { fromAmino(object: ClaimAmino): Claim { const message = createBaseClaim(); if (object.action !== undefined && object.action !== null) { - message.action = actionFromJSON(object.action); + message.action = object.action; } if (object.completed !== undefined && object.completed !== null) { message.completed = object.completed; @@ -223,9 +223,9 @@ export const Claim = { }, toAmino(message: Claim): ClaimAmino { const obj: any = {}; - obj.action = message.action; - obj.completed = message.completed; - obj.claimable_amount = message.claimableAmount; + obj.action = message.action === 0 ? undefined : message.action; + obj.completed = message.completed === false ? undefined : message.completed; + obj.claimable_amount = message.claimableAmount === "" ? undefined : message.claimableAmount; return obj; }, fromAminoMsg(object: ClaimAminoMsg): Claim { @@ -360,12 +360,12 @@ export const ClaimsRecordAddress = { }, toAmino(message: ClaimsRecordAddress): ClaimsRecordAddressAmino { const obj: any = {}; - obj.address = message.address; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.address = message.address === "" ? undefined : message.address; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.actionsCompleted) { obj.actions_completed = message.actionsCompleted.map(e => e); } else { - obj.actions_completed = []; + obj.actions_completed = message.actionsCompleted; } return obj; }, @@ -485,11 +485,11 @@ export const ClaimsRecord = { }, toAmino(message: ClaimsRecord): ClaimsRecordAmino { const obj: any = {}; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.actionsCompleted) { obj.actions_completed = message.actionsCompleted.map(e => e); } else { - obj.actions_completed = []; + obj.actions_completed = message.actionsCompleted; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/evmos/claims/v1/genesis.ts b/__fixtures__/v-next/outputv4/evmos/claims/v1/genesis.ts index 3e78603a28..f6ed9ff78d 100644 --- a/__fixtures__/v-next/outputv4/evmos/claims/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/evmos/claims/v1/genesis.ts @@ -151,7 +151,7 @@ export const GenesisState = { if (message.claimsRecords) { obj.claims_records = message.claimsRecords.map(e => e ? ClaimsRecordAddress.toAmino(e) : undefined); } else { - obj.claims_records = []; + obj.claims_records = message.claimsRecords; } return obj; }, @@ -352,20 +352,20 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_claims = message.enableClaims; + obj.enable_claims = message.enableClaims === false ? undefined : message.enableClaims; obj.airdrop_start_time = message.airdropStartTime ? Timestamp.toAmino(toTimestamp(message.airdropStartTime)) : undefined; 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; + obj.claims_denom = message.claimsDenom === "" ? undefined : message.claimsDenom; if (message.authorizedChannels) { obj.authorized_channels = message.authorizedChannels.map(e => e); } else { - obj.authorized_channels = []; + obj.authorized_channels = message.authorizedChannels; } if (message.evmChannels) { obj.evm_channels = message.evmChannels.map(e => e); } else { - obj.evm_channels = []; + obj.evm_channels = message.evmChannels; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/evmos/claims/v1/query.ts b/__fixtures__/v-next/outputv4/evmos/claims/v1/query.ts index ddd75cbaec..2018f52b10 100644 --- a/__fixtures__/v-next/outputv4/evmos/claims/v1/query.ts +++ b/__fixtures__/v-next/outputv4/evmos/claims/v1/query.ts @@ -287,7 +287,7 @@ export const QueryTotalUnclaimedResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -651,7 +651,7 @@ export const QueryClaimsRecordsResponse = { if (message.claims) { obj.claims = message.claims.map(e => e ? ClaimsRecordAddress.toAmino(e) : undefined); } else { - obj.claims = []; + obj.claims = message.claims; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -741,7 +741,7 @@ export const QueryClaimsRecordRequest = { }, toAmino(message: QueryClaimsRecordRequest): QueryClaimsRecordRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryClaimsRecordRequestAminoMsg): QueryClaimsRecordRequest { @@ -851,11 +851,11 @@ export const QueryClaimsRecordResponse = { }, toAmino(message: QueryClaimsRecordResponse): QueryClaimsRecordResponseAmino { const obj: any = {}; - obj.initial_claimable_amount = message.initialClaimableAmount; + obj.initial_claimable_amount = message.initialClaimableAmount === "" ? undefined : message.initialClaimableAmount; if (message.claims) { obj.claims = message.claims.map(e => e ? Claim.toAmino(e) : undefined); } else { - obj.claims = []; + obj.claims = message.claims; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/evmos/epochs/v1/genesis.ts b/__fixtures__/v-next/outputv4/evmos/epochs/v1/genesis.ts index 20b8fc6d75..7266b7325e 100644 --- a/__fixtures__/v-next/outputv4/evmos/epochs/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/evmos/epochs/v1/genesis.ts @@ -208,13 +208,13 @@ export const EpochInfo = { }, toAmino(message: EpochInfo): EpochInfoAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; obj.current_epoch_start_time = message.currentEpochStartTime ? Timestamp.toAmino(toTimestamp(message.currentEpochStartTime)) : undefined; - obj.epoch_counting_started = message.epochCountingStarted; - obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + obj.epoch_counting_started = message.epochCountingStarted === false ? undefined : message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight !== BigInt(0) ? message.currentEpochStartHeight.toString() : undefined; return obj; }, fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo { @@ -311,7 +311,7 @@ export const GenesisState = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/evmos/epochs/v1/query.ts b/__fixtures__/v-next/outputv4/evmos/epochs/v1/query.ts index 23e066f1a4..259c230ef8 100644 --- a/__fixtures__/v-next/outputv4/evmos/epochs/v1/query.ts +++ b/__fixtures__/v-next/outputv4/evmos/epochs/v1/query.ts @@ -231,7 +231,7 @@ export const QueryEpochsInfoResponse = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -321,7 +321,7 @@ export const QueryCurrentEpochRequest = { }, toAmino(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; return obj; }, fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest { @@ -411,7 +411,7 @@ export const QueryCurrentEpochResponse = { }, toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { const obj: any = {}; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse { diff --git a/__fixtures__/v-next/outputv4/evmos/erc20/v1/erc20.ts b/__fixtures__/v-next/outputv4/evmos/erc20/v1/erc20.ts index 7c4e8c4df8..c0181a0f74 100644 --- a/__fixtures__/v-next/outputv4/evmos/erc20/v1/erc20.ts +++ b/__fixtures__/v-next/outputv4/evmos/erc20/v1/erc20.ts @@ -260,16 +260,16 @@ export const TokenPair = { message.enabled = object.enabled; } if (object.contract_owner !== undefined && object.contract_owner !== null) { - message.contractOwner = ownerFromJSON(object.contract_owner); + message.contractOwner = object.contract_owner; } return message; }, 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; + obj.erc20_address = message.erc20Address === "" ? undefined : message.erc20Address; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.enabled = message.enabled === false ? undefined : message.enabled; + obj.contract_owner = message.contractOwner === 0 ? undefined : message.contractOwner; return obj; }, fromAminoMsg(object: TokenPairAminoMsg): TokenPair { @@ -391,8 +391,8 @@ export const RegisterCoinProposal = { }, toAmino(message: RegisterCoinProposal): RegisterCoinProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; }, @@ -513,9 +513,9 @@ export const RegisterERC20Proposal = { }, toAmino(message: RegisterERC20Proposal): RegisterERC20ProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.erc20address = message.erc20address; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.erc20address = message.erc20address === "" ? undefined : message.erc20address; return obj; }, fromAminoMsg(object: RegisterERC20ProposalAminoMsg): RegisterERC20Proposal { @@ -635,9 +635,9 @@ export const ToggleTokenConversionProposal = { }, toAmino(message: ToggleTokenConversionProposal): ToggleTokenConversionProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.token = message.token; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.token = message.token === "" ? undefined : message.token; return obj; }, fromAminoMsg(object: ToggleTokenConversionProposalAminoMsg): ToggleTokenConversionProposal { diff --git a/__fixtures__/v-next/outputv4/evmos/erc20/v1/genesis.ts b/__fixtures__/v-next/outputv4/evmos/erc20/v1/genesis.ts index ef920d583f..7965af5ad5 100644 --- a/__fixtures__/v-next/outputv4/evmos/erc20/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/evmos/erc20/v1/genesis.ts @@ -135,7 +135,7 @@ export const GenesisState = { if (message.tokenPairs) { obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e) : undefined); } else { - obj.token_pairs = []; + obj.token_pairs = message.tokenPairs; } return obj; }, @@ -240,8 +240,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_erc20 = message.enableErc20; - obj.enable_evm_hook = message.enableEvmHook; + obj.enable_erc20 = message.enableErc20 === false ? undefined : message.enableErc20; + obj.enable_evm_hook = message.enableEvmHook === false ? undefined : message.enableEvmHook; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/evmos/erc20/v1/query.ts b/__fixtures__/v-next/outputv4/evmos/erc20/v1/query.ts index 1772568744..5d582cb95b 100644 --- a/__fixtures__/v-next/outputv4/evmos/erc20/v1/query.ts +++ b/__fixtures__/v-next/outputv4/evmos/erc20/v1/query.ts @@ -290,7 +290,7 @@ export const QueryTokenPairsResponse = { if (message.tokenPairs) { obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e) : undefined); } else { - obj.token_pairs = []; + obj.token_pairs = message.tokenPairs; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -380,7 +380,7 @@ export const QueryTokenPairRequest = { }, toAmino(message: QueryTokenPairRequest): QueryTokenPairRequestAmino { const obj: any = {}; - obj.token = message.token; + obj.token = message.token === "" ? undefined : message.token; return obj; }, fromAminoMsg(object: QueryTokenPairRequestAminoMsg): QueryTokenPairRequest { diff --git a/__fixtures__/v-next/outputv4/evmos/erc20/v1/tx.ts b/__fixtures__/v-next/outputv4/evmos/erc20/v1/tx.ts index 605414b3ec..486029ad07 100644 --- a/__fixtures__/v-next/outputv4/evmos/erc20/v1/tx.ts +++ b/__fixtures__/v-next/outputv4/evmos/erc20/v1/tx.ts @@ -172,8 +172,8 @@ export const MsgConvertCoin = { toAmino(message: MsgConvertCoin): MsgConvertCoinAmino { const obj: any = {}; obj.coin = message.coin ? Coin.toAmino(message.coin) : undefined; - obj.receiver = message.receiver; - obj.sender = message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgConvertCoinAminoMsg): MsgConvertCoin { @@ -377,10 +377,10 @@ export const MsgConvertERC20 = { }, toAmino(message: MsgConvertERC20): MsgConvertERC20Amino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.amount = message.amount; - obj.receiver = message.receiver; - obj.sender = message.sender; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.receiver = message.receiver === "" ? undefined : message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: MsgConvertERC20AminoMsg): MsgConvertERC20 { diff --git a/__fixtures__/v-next/outputv4/evmos/fees/v1/fees.ts b/__fixtures__/v-next/outputv4/evmos/fees/v1/fees.ts index 980edfa4e5..0d72231999 100644 --- a/__fixtures__/v-next/outputv4/evmos/fees/v1/fees.ts +++ b/__fixtures__/v-next/outputv4/evmos/fees/v1/fees.ts @@ -130,9 +130,9 @@ export const DevFeeInfo = { }, toAmino(message: DevFeeInfo): DevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: DevFeeInfoAminoMsg): DevFeeInfo { diff --git a/__fixtures__/v-next/outputv4/evmos/fees/v1/genesis.ts b/__fixtures__/v-next/outputv4/evmos/fees/v1/genesis.ts index 119372e1cb..81003cf27c 100644 --- a/__fixtures__/v-next/outputv4/evmos/fees/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/evmos/fees/v1/genesis.ts @@ -150,7 +150,7 @@ export const GenesisState = { if (message.devFeeInfos) { obj.dev_fee_infos = message.devFeeInfos.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.dev_fee_infos = []; + obj.dev_fee_infos = message.devFeeInfos; } return obj; }, @@ -305,11 +305,11 @@ export const Params = { }, 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; + obj.enable_fees = message.enableFees === false ? undefined : message.enableFees; + obj.developer_shares = message.developerShares === "" ? undefined : message.developerShares; + obj.validator_shares = message.validatorShares === "" ? undefined : message.validatorShares; + obj.addr_derivation_cost_create = message.addrDerivationCostCreate !== BigInt(0) ? message.addrDerivationCostCreate.toString() : undefined; + obj.min_gas_price = message.minGasPrice === "" ? undefined : message.minGasPrice; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/evmos/fees/v1/query.ts b/__fixtures__/v-next/outputv4/evmos/fees/v1/query.ts index 005310d29a..b455127f67 100644 --- a/__fixtures__/v-next/outputv4/evmos/fees/v1/query.ts +++ b/__fixtures__/v-next/outputv4/evmos/fees/v1/query.ts @@ -336,7 +336,7 @@ export const QueryDevFeeInfosResponse = { if (message.fees) { obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.fees = []; + obj.fees = message.fees; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -426,7 +426,7 @@ export const QueryDevFeeInfoRequest = { }, toAmino(message: QueryDevFeeInfoRequest): QueryDevFeeInfoRequestAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; return obj; }, fromAminoMsg(object: QueryDevFeeInfoRequestAminoMsg): QueryDevFeeInfoRequest { @@ -780,7 +780,7 @@ export const QueryDevFeeInfosPerDeployerRequest = { }, toAmino(message: QueryDevFeeInfosPerDeployerRequest): QueryDevFeeInfosPerDeployerRequestAmino { const obj: any = {}; - obj.deployer_address = message.deployerAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -896,7 +896,7 @@ export const QueryDevFeeInfosPerDeployerResponse = { if (message.fees) { obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e) : undefined); } else { - obj.fees = []; + obj.fees = message.fees; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/evmos/fees/v1/tx.ts b/__fixtures__/v-next/outputv4/evmos/fees/v1/tx.ts index 42e644af59..437bb6b2fe 100644 --- a/__fixtures__/v-next/outputv4/evmos/fees/v1/tx.ts +++ b/__fixtures__/v-next/outputv4/evmos/fees/v1/tx.ts @@ -239,13 +239,13 @@ export const MsgRegisterDevFeeInfo = { }, toAmino(message: MsgRegisterDevFeeInfo): MsgRegisterDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; if (message.nonces) { obj.nonces = message.nonces.map(e => e.toString()); } else { - obj.nonces = []; + obj.nonces = message.nonces; } return obj; }, @@ -418,8 +418,8 @@ export const MsgCancelDevFeeInfo = { }, toAmino(message: MsgCancelDevFeeInfo): MsgCancelDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; return obj; }, fromAminoMsg(object: MsgCancelDevFeeInfoAminoMsg): MsgCancelDevFeeInfo { @@ -607,9 +607,9 @@ export const MsgUpdateDevFeeInfo = { }, toAmino(message: MsgUpdateDevFeeInfo): MsgUpdateDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; return obj; }, fromAminoMsg(object: MsgUpdateDevFeeInfoAminoMsg): MsgUpdateDevFeeInfo { diff --git a/__fixtures__/v-next/outputv4/evmos/incentives/v1/genesis.ts b/__fixtures__/v-next/outputv4/evmos/incentives/v1/genesis.ts index 40e2e6314f..ea73685a40 100644 --- a/__fixtures__/v-next/outputv4/evmos/incentives/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/evmos/incentives/v1/genesis.ts @@ -163,12 +163,12 @@ export const GenesisState = { if (message.incentives) { obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e) : undefined); } else { - obj.incentives = []; + obj.incentives = message.incentives; } if (message.gasMeters) { obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e) : undefined); } else { - obj.gas_meters = []; + obj.gas_meters = message.gasMeters; } return obj; }, @@ -305,10 +305,10 @@ export const Params = { }, 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; + obj.enable_incentives = message.enableIncentives === false ? undefined : message.enableIncentives; + obj.allocation_limit = message.allocationLimit === "" ? undefined : message.allocationLimit; + obj.incentives_epoch_identifier = message.incentivesEpochIdentifier === "" ? undefined : message.incentivesEpochIdentifier; + obj.reward_scaler = message.rewardScaler === "" ? undefined : message.rewardScaler; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/evmos/incentives/v1/incentives.ts b/__fixtures__/v-next/outputv4/evmos/incentives/v1/incentives.ts index c563bf6a30..7424e30ede 100644 --- a/__fixtures__/v-next/outputv4/evmos/incentives/v1/incentives.ts +++ b/__fixtures__/v-next/outputv4/evmos/incentives/v1/incentives.ts @@ -238,15 +238,15 @@ export const Incentive = { }, toAmino(message: Incentive): IncentiveAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; if (message.allocations) { obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } - obj.epochs = message.epochs; + obj.epochs = message.epochs === 0 ? undefined : message.epochs; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.total_gas = message.totalGas ? message.totalGas.toString() : undefined; + obj.total_gas = message.totalGas !== BigInt(0) ? message.totalGas.toString() : undefined; return obj; }, fromAminoMsg(object: IncentiveAminoMsg): Incentive { @@ -368,9 +368,9 @@ export const GasMeter = { }, toAmino(message: GasMeter): GasMeterAmino { const obj: any = {}; - obj.contract = message.contract; - obj.participant = message.participant; - obj.cumulative_gas = message.cumulativeGas ? message.cumulativeGas.toString() : undefined; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.participant = message.participant === "" ? undefined : message.participant; + obj.cumulative_gas = message.cumulativeGas !== BigInt(0) ? message.cumulativeGas.toString() : undefined; return obj; }, fromAminoMsg(object: GasMeterAminoMsg): GasMeter { @@ -528,15 +528,15 @@ export const RegisterIncentiveProposal = { }, toAmino(message: RegisterIncentiveProposal): RegisterIncentiveProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; if (message.allocations) { obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocations = []; + obj.allocations = message.allocations; } - obj.epochs = message.epochs; + obj.epochs = message.epochs === 0 ? undefined : message.epochs; return obj; }, fromAminoMsg(object: RegisterIncentiveProposalAminoMsg): RegisterIncentiveProposal { @@ -656,9 +656,9 @@ export const CancelIncentiveProposal = { }, toAmino(message: CancelIncentiveProposal): CancelIncentiveProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; - obj.contract = message.contract; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: CancelIncentiveProposalAminoMsg): CancelIncentiveProposal { diff --git a/__fixtures__/v-next/outputv4/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputv4/evmos/incentives/v1/query.ts index 8232ee1043..9858d8ae82 100644 --- a/__fixtures__/v-next/outputv4/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputv4/evmos/incentives/v1/query.ts @@ -446,7 +446,7 @@ export const QueryIncentivesResponse = { if (message.incentives) { obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e) : undefined); } else { - obj.incentives = []; + obj.incentives = message.incentives; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -536,7 +536,7 @@ export const QueryIncentiveRequest = { }, toAmino(message: QueryIncentiveRequest): QueryIncentiveRequestAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; return obj; }, fromAminoMsg(object: QueryIncentiveRequestAminoMsg): QueryIncentiveRequest { @@ -732,7 +732,7 @@ export const QueryGasMetersRequest = { }, toAmino(message: QueryGasMetersRequest): QueryGasMetersRequestAmino { const obj: any = {}; - obj.contract = message.contract; + obj.contract = message.contract === "" ? undefined : message.contract; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -848,7 +848,7 @@ export const QueryGasMetersResponse = { if (message.gasMeters) { obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e) : undefined); } else { - obj.gas_meters = []; + obj.gas_meters = message.gasMeters; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -954,8 +954,8 @@ export const QueryGasMeterRequest = { }, toAmino(message: QueryGasMeterRequest): QueryGasMeterRequestAmino { const obj: any = {}; - obj.contract = message.contract; - obj.participant = message.participant; + obj.contract = message.contract === "" ? undefined : message.contract; + obj.participant = message.participant === "" ? undefined : message.participant; return obj; }, fromAminoMsg(object: QueryGasMeterRequestAminoMsg): QueryGasMeterRequest { @@ -1045,7 +1045,7 @@ export const QueryGasMeterResponse = { }, toAmino(message: QueryGasMeterResponse): QueryGasMeterResponseAmino { const obj: any = {}; - obj.gas_meter = message.gasMeter ? message.gasMeter.toString() : undefined; + obj.gas_meter = message.gasMeter !== BigInt(0) ? message.gasMeter.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGasMeterResponseAminoMsg): QueryGasMeterResponse { @@ -1250,7 +1250,7 @@ export const QueryAllocationMetersResponse = { if (message.allocationMeters) { obj.allocation_meters = message.allocationMeters.map(e => e ? DecCoin.toAmino(e) : undefined); } else { - obj.allocation_meters = []; + obj.allocation_meters = message.allocationMeters; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1340,7 +1340,7 @@ export const QueryAllocationMeterRequest = { }, toAmino(message: QueryAllocationMeterRequest): QueryAllocationMeterRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryAllocationMeterRequestAminoMsg): QueryAllocationMeterRequest { diff --git a/__fixtures__/v-next/outputv4/evmos/inflation/v1/genesis.ts b/__fixtures__/v-next/outputv4/evmos/inflation/v1/genesis.ts index 021f781274..12c5cc94f0 100644 --- a/__fixtures__/v-next/outputv4/evmos/inflation/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/evmos/inflation/v1/genesis.ts @@ -191,10 +191,10 @@ export const GenesisState = { 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; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; + obj.epoch_identifier = message.epochIdentifier === "" ? undefined : message.epochIdentifier; + obj.epochs_per_period = message.epochsPerPeriod !== BigInt(0) ? message.epochsPerPeriod.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs !== BigInt(0) ? message.skippedEpochs.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -334,10 +334,10 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.mint_denom = message.mintDenom; + obj.mint_denom = message.mintDenom === "" ? undefined : 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; + obj.enable_inflation = message.enableInflation === false ? undefined : message.enableInflation; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/evmos/inflation/v1/inflation.ts b/__fixtures__/v-next/outputv4/evmos/inflation/v1/inflation.ts index 571fd32b00..bb47bc2295 100644 --- a/__fixtures__/v-next/outputv4/evmos/inflation/v1/inflation.ts +++ b/__fixtures__/v-next/outputv4/evmos/inflation/v1/inflation.ts @@ -184,9 +184,9 @@ export const InflationDistribution = { }, toAmino(message: InflationDistribution): InflationDistributionAmino { const obj: any = {}; - obj.staking_rewards = message.stakingRewards; - obj.usage_incentives = message.usageIncentives; - obj.community_pool = message.communityPool; + obj.staking_rewards = message.stakingRewards === "" ? undefined : message.stakingRewards; + obj.usage_incentives = message.usageIncentives === "" ? undefined : message.usageIncentives; + obj.community_pool = message.communityPool === "" ? undefined : message.communityPool; return obj; }, fromAminoMsg(object: InflationDistributionAminoMsg): InflationDistribution { @@ -338,11 +338,11 @@ export const ExponentialCalculation = { }, 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; + obj.a = message.a === "" ? undefined : message.a; + obj.r = message.r === "" ? undefined : message.r; + obj.c = message.c === "" ? undefined : message.c; + obj.bonding_target = message.bondingTarget === "" ? undefined : message.bondingTarget; + obj.max_variance = message.maxVariance === "" ? undefined : message.maxVariance; return obj; }, fromAminoMsg(object: ExponentialCalculationAminoMsg): ExponentialCalculation { diff --git a/__fixtures__/v-next/outputv4/evmos/inflation/v1/query.ts b/__fixtures__/v-next/outputv4/evmos/inflation/v1/query.ts index 627e3d9fe0..9b13bfcea1 100644 --- a/__fixtures__/v-next/outputv4/evmos/inflation/v1/query.ts +++ b/__fixtures__/v-next/outputv4/evmos/inflation/v1/query.ts @@ -317,7 +317,7 @@ export const QueryPeriodResponse = { }, toAmino(message: QueryPeriodResponse): QueryPeriodResponseAmino { const obj: any = {}; - obj.period = message.period ? message.period.toString() : undefined; + obj.period = message.period !== BigInt(0) ? message.period.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPeriodResponseAminoMsg): QueryPeriodResponse { @@ -633,7 +633,7 @@ export const QuerySkippedEpochsResponse = { }, toAmino(message: QuerySkippedEpochsResponse): QuerySkippedEpochsResponseAmino { const obj: any = {}; - obj.skipped_epochs = message.skippedEpochs ? message.skippedEpochs.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs !== BigInt(0) ? message.skippedEpochs.toString() : undefined; return obj; }, fromAminoMsg(object: QuerySkippedEpochsResponseAminoMsg): QuerySkippedEpochsResponse { @@ -947,7 +947,7 @@ export const QueryInflationRateResponse = { }, toAmino(message: QueryInflationRateResponse): QueryInflationRateResponseAmino { const obj: any = {}; - obj.inflation_rate = message.inflationRate; + obj.inflation_rate = message.inflationRate === "" ? undefined : message.inflationRate; return obj; }, fromAminoMsg(object: QueryInflationRateResponseAminoMsg): QueryInflationRateResponse { diff --git a/__fixtures__/v-next/outputv4/evmos/recovery/v1/genesis.ts b/__fixtures__/v-next/outputv4/evmos/recovery/v1/genesis.ts index fd797582aa..11b39553c0 100644 --- a/__fixtures__/v-next/outputv4/evmos/recovery/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/evmos/recovery/v1/genesis.ts @@ -208,7 +208,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.enable_recovery = message.enableRecovery; + obj.enable_recovery = message.enableRecovery === false ? undefined : message.enableRecovery; obj.packet_timeout_duration = message.packetTimeoutDuration ? Duration.toAmino(message.packetTimeoutDuration) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/evmos/vesting/v1/query.ts b/__fixtures__/v-next/outputv4/evmos/vesting/v1/query.ts index 1601453e8c..bfda615b80 100644 --- a/__fixtures__/v-next/outputv4/evmos/vesting/v1/query.ts +++ b/__fixtures__/v-next/outputv4/evmos/vesting/v1/query.ts @@ -109,7 +109,7 @@ export const QueryBalancesRequest = { }, toAmino(message: QueryBalancesRequest): QueryBalancesRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryBalancesRequestAminoMsg): QueryBalancesRequest { @@ -250,17 +250,17 @@ export const QueryBalancesResponse = { if (message.locked) { obj.locked = message.locked.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.locked = []; + obj.locked = message.locked; } if (message.unvested) { obj.unvested = message.unvested.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.unvested = []; + obj.unvested = message.unvested; } if (message.vested) { obj.vested = message.vested.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.vested = []; + obj.vested = message.vested; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/evmos/vesting/v1/tx.ts b/__fixtures__/v-next/outputv4/evmos/vesting/v1/tx.ts index 1a301fc010..c6dc1c0a23 100644 --- a/__fixtures__/v-next/outputv4/evmos/vesting/v1/tx.ts +++ b/__fixtures__/v-next/outputv4/evmos/vesting/v1/tx.ts @@ -252,20 +252,20 @@ export const MsgCreateClawbackVestingAccount = { }, toAmino(message: MsgCreateClawbackVestingAccount): MsgCreateClawbackVestingAccountAmino { const obj: any = {}; - obj.from_address = message.fromAddress; - obj.to_address = message.toAddress; + obj.from_address = message.fromAddress === "" ? undefined : message.fromAddress; + obj.to_address = message.toAddress === "" ? undefined : message.toAddress; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; if (message.lockupPeriods) { obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.lockup_periods = []; + obj.lockup_periods = message.lockupPeriods; } if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } - obj.merge = message.merge; + obj.merge = message.merge === false ? undefined : message.merge; return obj; }, fromAminoMsg(object: MsgCreateClawbackVestingAccountAminoMsg): MsgCreateClawbackVestingAccount { @@ -453,9 +453,9 @@ export const MsgClawback = { }, toAmino(message: MsgClawback): MsgClawbackAmino { const obj: any = {}; - obj.funder_address = message.funderAddress; - obj.account_address = message.accountAddress; - obj.dest_address = message.destAddress; + obj.funder_address = message.funderAddress === "" ? undefined : message.funderAddress; + obj.account_address = message.accountAddress === "" ? undefined : message.accountAddress; + obj.dest_address = message.destAddress === "" ? undefined : message.destAddress; return obj; }, fromAminoMsg(object: MsgClawbackAminoMsg): MsgClawback { diff --git a/__fixtures__/v-next/outputv4/evmos/vesting/v1/vesting.ts b/__fixtures__/v-next/outputv4/evmos/vesting/v1/vesting.ts index ffb222d228..03523bb20e 100644 --- a/__fixtures__/v-next/outputv4/evmos/vesting/v1/vesting.ts +++ b/__fixtures__/v-next/outputv4/evmos/vesting/v1/vesting.ts @@ -189,17 +189,17 @@ export const ClawbackVestingAccount = { toAmino(message: ClawbackVestingAccount): ClawbackVestingAccountAmino { const obj: any = {}; obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined; - obj.funder_address = message.funderAddress; + obj.funder_address = message.funderAddress === "" ? undefined : message.funderAddress; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; if (message.lockupPeriods) { obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.lockup_periods = []; + obj.lockup_periods = message.lockupPeriods; } if (message.vestingPeriods) { obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); } else { - obj.vesting_periods = []; + obj.vesting_periods = message.vestingPeriods; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/auth.ts b/__fixtures__/v-next/outputv4/google/api/auth.ts index 7cd1e92b5f..c4ac81b745 100644 --- a/__fixtures__/v-next/outputv4/google/api/auth.ts +++ b/__fixtures__/v-next/outputv4/google/api/auth.ts @@ -442,12 +442,12 @@ export const Authentication = { if (message.rules) { obj.rules = message.rules.map(e => e ? AuthenticationRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } if (message.providers) { obj.providers = message.providers.map(e => e ? AuthProvider.toAmino(e) : undefined); } else { - obj.providers = []; + obj.providers = message.providers; } return obj; }, @@ -592,13 +592,13 @@ export const AuthenticationRule = { }, toAmino(message: AuthenticationRule): AuthenticationRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.oauth = message.oauth ? OAuthRequirements.toAmino(message.oauth) : undefined; - obj.allow_without_credential = message.allowWithoutCredential; + obj.allow_without_credential = message.allowWithoutCredential === false ? undefined : message.allowWithoutCredential; if (message.requirements) { obj.requirements = message.requirements.map(e => e ? AuthRequirement.toAmino(e) : undefined); } else { - obj.requirements = []; + obj.requirements = message.requirements; } return obj; }, @@ -719,9 +719,9 @@ export const JwtLocation = { }, toAmino(message: JwtLocation): JwtLocationAmino { const obj: any = {}; - obj.header = message.header; - obj.query = message.query; - obj.value_prefix = message.valuePrefix; + obj.header = message.header === null ? undefined : message.header; + obj.query = message.query === null ? undefined : message.query; + obj.value_prefix = message.valuePrefix === "" ? undefined : message.valuePrefix; return obj; }, fromAminoMsg(object: JwtLocationAminoMsg): JwtLocation { @@ -895,15 +895,15 @@ export const AuthProvider = { }, 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; + obj.id = message.id === "" ? undefined : message.id; + obj.issuer = message.issuer === "" ? undefined : message.issuer; + obj.jwks_uri = message.jwksUri === "" ? undefined : message.jwksUri; + obj.audiences = message.audiences === "" ? undefined : message.audiences; + obj.authorization_url = message.authorizationUrl === "" ? undefined : message.authorizationUrl; if (message.jwtLocations) { obj.jwt_locations = message.jwtLocations.map(e => e ? JwtLocation.toAmino(e) : undefined); } else { - obj.jwt_locations = []; + obj.jwt_locations = message.jwtLocations; } return obj; }, @@ -992,7 +992,7 @@ export const OAuthRequirements = { }, toAmino(message: OAuthRequirements): OAuthRequirementsAmino { const obj: any = {}; - obj.canonical_scopes = message.canonicalScopes; + obj.canonical_scopes = message.canonicalScopes === "" ? undefined : message.canonicalScopes; return obj; }, fromAminoMsg(object: OAuthRequirementsAminoMsg): OAuthRequirements { @@ -1096,8 +1096,8 @@ export const AuthRequirement = { }, toAmino(message: AuthRequirement): AuthRequirementAmino { const obj: any = {}; - obj.provider_id = message.providerId; - obj.audiences = message.audiences; + obj.provider_id = message.providerId === "" ? undefined : message.providerId; + obj.audiences = message.audiences === "" ? undefined : message.audiences; return obj; }, fromAminoMsg(object: AuthRequirementAminoMsg): AuthRequirement { diff --git a/__fixtures__/v-next/outputv4/google/api/backend.ts b/__fixtures__/v-next/outputv4/google/api/backend.ts index 2d0466c330..953d36987c 100644 --- a/__fixtures__/v-next/outputv4/google/api/backend.ts +++ b/__fixtures__/v-next/outputv4/google/api/backend.ts @@ -289,7 +289,7 @@ export const Backend = { if (message.rules) { obj.rules = message.rules.map(e => e ? BackendRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -491,7 +491,7 @@ export const BackendRule = { message.operationDeadline = object.operation_deadline; } if (object.path_translation !== undefined && object.path_translation !== null) { - message.pathTranslation = backendRule_PathTranslationFromJSON(object.path_translation); + message.pathTranslation = object.path_translation; } if (object.jwt_audience !== undefined && object.jwt_audience !== null) { message.jwtAudience = object.jwt_audience; @@ -506,15 +506,15 @@ export const BackendRule = { }, 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; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.address = message.address === "" ? undefined : message.address; + obj.deadline = message.deadline === 0 ? undefined : message.deadline; + obj.min_deadline = message.minDeadline === 0 ? undefined : message.minDeadline; + obj.operation_deadline = message.operationDeadline === 0 ? undefined : message.operationDeadline; + obj.path_translation = message.pathTranslation === 0 ? undefined : message.pathTranslation; + obj.jwt_audience = message.jwtAudience === null ? undefined : message.jwtAudience; + obj.disable_auth = message.disableAuth === null ? undefined : message.disableAuth; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: BackendRuleAminoMsg): BackendRule { diff --git a/__fixtures__/v-next/outputv4/google/api/billing.ts b/__fixtures__/v-next/outputv4/google/api/billing.ts index e2ad5411bf..cae2208762 100644 --- a/__fixtures__/v-next/outputv4/google/api/billing.ts +++ b/__fixtures__/v-next/outputv4/google/api/billing.ts @@ -191,7 +191,7 @@ export const Billing = { if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Billing_BillingDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -302,11 +302,11 @@ export const Billing_BillingDestination = { }, toAmino(message: Billing_BillingDestination): Billing_BillingDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.metrics) { obj.metrics = message.metrics.map(e => e); } else { - obj.metrics = []; + obj.metrics = message.metrics; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/config_change.ts b/__fixtures__/v-next/outputv4/google/api/config_change.ts index 0efcf4aee2..3c4038a3da 100644 --- a/__fixtures__/v-next/outputv4/google/api/config_change.ts +++ b/__fixtures__/v-next/outputv4/google/api/config_change.ts @@ -273,21 +273,21 @@ export const ConfigChange = { message.newValue = object.new_value; } if (object.change_type !== undefined && object.change_type !== null) { - message.changeType = changeTypeFromJSON(object.change_type); + message.changeType = object.change_type; } message.advices = object.advices?.map(e => Advice.fromAmino(e)) || []; return message; }, 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; + obj.element = message.element === "" ? undefined : message.element; + obj.old_value = message.oldValue === "" ? undefined : message.oldValue; + obj.new_value = message.newValue === "" ? undefined : message.newValue; + obj.change_type = message.changeType === 0 ? undefined : message.changeType; if (message.advices) { obj.advices = message.advices.map(e => e ? Advice.toAmino(e) : undefined); } else { - obj.advices = []; + obj.advices = message.advices; } return obj; }, @@ -376,7 +376,7 @@ export const Advice = { }, toAmino(message: Advice): AdviceAmino { const obj: any = {}; - obj.description = message.description; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: AdviceAminoMsg): Advice { diff --git a/__fixtures__/v-next/outputv4/google/api/consumer.ts b/__fixtures__/v-next/outputv4/google/api/consumer.ts index 964e640f32..bf377fdf76 100644 --- a/__fixtures__/v-next/outputv4/google/api/consumer.ts +++ b/__fixtures__/v-next/outputv4/google/api/consumer.ts @@ -222,7 +222,7 @@ export const ProjectProperties = { if (message.properties) { obj.properties = message.properties.map(e => e ? Property.toAmino(e) : undefined); } else { - obj.properties = []; + obj.properties = message.properties; } return obj; }, @@ -334,7 +334,7 @@ export const Property = { message.name = object.name; } if (object.type !== undefined && object.type !== null) { - message.type = property_PropertyTypeFromJSON(object.type); + message.type = object.type; } if (object.description !== undefined && object.description !== null) { message.description = object.description; @@ -343,9 +343,9 @@ export const Property = { }, toAmino(message: Property): PropertyAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === 0 ? undefined : message.type; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: PropertyAminoMsg): Property { diff --git a/__fixtures__/v-next/outputv4/google/api/context.ts b/__fixtures__/v-next/outputv4/google/api/context.ts index 91b357a791..e4d582c18c 100644 --- a/__fixtures__/v-next/outputv4/google/api/context.ts +++ b/__fixtures__/v-next/outputv4/google/api/context.ts @@ -211,7 +211,7 @@ export const Context = { if (message.rules) { obj.rules = message.rules.map(e => e ? ContextRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -388,26 +388,26 @@ export const ContextRule = { }, toAmino(message: ContextRule): ContextRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; if (message.requested) { obj.requested = message.requested.map(e => e); } else { - obj.requested = []; + obj.requested = message.requested; } if (message.provided) { obj.provided = message.provided.map(e => e); } else { - obj.provided = []; + obj.provided = message.provided; } if (message.allowedRequestExtensions) { obj.allowed_request_extensions = message.allowedRequestExtensions.map(e => e); } else { - obj.allowed_request_extensions = []; + obj.allowed_request_extensions = message.allowedRequestExtensions; } if (message.allowedResponseExtensions) { obj.allowed_response_extensions = message.allowedResponseExtensions.map(e => e); } else { - obj.allowed_response_extensions = []; + obj.allowed_response_extensions = message.allowedResponseExtensions; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/control.ts b/__fixtures__/v-next/outputv4/google/api/control.ts index c4a382b7a1..084229d3cd 100644 --- a/__fixtures__/v-next/outputv4/google/api/control.ts +++ b/__fixtures__/v-next/outputv4/google/api/control.ts @@ -94,7 +94,7 @@ export const Control = { }, toAmino(message: Control): ControlAmino { const obj: any = {}; - obj.environment = message.environment; + obj.environment = message.environment === "" ? undefined : message.environment; return obj; }, fromAminoMsg(object: ControlAminoMsg): Control { diff --git a/__fixtures__/v-next/outputv4/google/api/distribution.ts b/__fixtures__/v-next/outputv4/google/api/distribution.ts index 976cec91cd..0967ffbaaf 100644 --- a/__fixtures__/v-next/outputv4/google/api/distribution.ts +++ b/__fixtures__/v-next/outputv4/google/api/distribution.ts @@ -523,20 +523,20 @@ export const Distribution = { }, 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.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.mean = message.mean === 0 ? undefined : message.mean; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation === 0 ? undefined : 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 = []; + obj.bucket_counts = message.bucketCounts; } if (message.exemplars) { obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e) : undefined); } else { - obj.exemplars = []; + obj.exemplars = message.exemplars; } return obj; }, @@ -641,8 +641,8 @@ export const Distribution_Range = { }, toAmino(message: Distribution_Range): Distribution_RangeAmino { const obj: any = {}; - obj.min = message.min; - obj.max = message.max; + obj.min = message.min === 0 ? undefined : message.min; + obj.max = message.max === 0 ? undefined : message.max; return obj; }, fromAminoMsg(object: Distribution_RangeAminoMsg): Distribution_Range { @@ -890,9 +890,9 @@ export const Distribution_BucketOptions_Linear = { }, 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; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.width = message.width === 0 ? undefined : message.width; + obj.offset = message.offset === 0 ? undefined : message.offset; return obj; }, fromAminoMsg(object: Distribution_BucketOptions_LinearAminoMsg): Distribution_BucketOptions_Linear { @@ -1012,9 +1012,9 @@ export const Distribution_BucketOptions_Exponential = { }, 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; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.growth_factor = message.growthFactor === 0 ? undefined : message.growthFactor; + obj.scale = message.scale === 0 ? undefined : message.scale; return obj; }, fromAminoMsg(object: Distribution_BucketOptions_ExponentialAminoMsg): Distribution_BucketOptions_Exponential { @@ -1120,7 +1120,7 @@ export const Distribution_BucketOptions_Explicit = { if (message.bounds) { obj.bounds = message.bounds.map(e => e); } else { - obj.bounds = []; + obj.bounds = message.bounds; } return obj; }, @@ -1247,12 +1247,12 @@ export const Distribution_Exemplar = { }, toAmino(message: Distribution_Exemplar): Distribution_ExemplarAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; if (message.attachments) { obj.attachments = message.attachments.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.attachments = []; + obj.attachments = message.attachments; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/documentation.ts b/__fixtures__/v-next/outputv4/google/api/documentation.ts index e08d2d92e5..77dcae98fc 100644 --- a/__fixtures__/v-next/outputv4/google/api/documentation.ts +++ b/__fixtures__/v-next/outputv4/google/api/documentation.ts @@ -403,20 +403,20 @@ export const Documentation = { }, toAmino(message: Documentation): DocumentationAmino { const obj: any = {}; - obj.summary = message.summary; + obj.summary = message.summary === "" ? undefined : message.summary; if (message.pages) { obj.pages = message.pages.map(e => e ? Page.toAmino(e) : undefined); } else { - obj.pages = []; + obj.pages = message.pages; } if (message.rules) { obj.rules = message.rules.map(e => e ? DocumentationRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.documentation_root_url = message.documentationRootUrl; - obj.service_root_url = message.serviceRootUrl; - obj.overview = message.overview; + obj.documentation_root_url = message.documentationRootUrl === "" ? undefined : message.documentationRootUrl; + obj.service_root_url = message.serviceRootUrl === "" ? undefined : message.serviceRootUrl; + obj.overview = message.overview === "" ? undefined : message.overview; return obj; }, fromAminoMsg(object: DocumentationAminoMsg): Documentation { @@ -536,9 +536,9 @@ export const DocumentationRule = { }, toAmino(message: DocumentationRule): DocumentationRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.description = message.description; - obj.deprecation_description = message.deprecationDescription; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.description = message.description === "" ? undefined : message.description; + obj.deprecation_description = message.deprecationDescription === "" ? undefined : message.deprecationDescription; return obj; }, fromAminoMsg(object: DocumentationRuleAminoMsg): DocumentationRule { @@ -664,12 +664,12 @@ export const Page = { }, toAmino(message: Page): PageAmino { const obj: any = {}; - obj.name = message.name; - obj.content = message.content; + obj.name = message.name === "" ? undefined : message.name; + obj.content = message.content === "" ? undefined : message.content; if (message.subpages) { obj.subpages = message.subpages.map(e => e ? Page.toAmino(e) : undefined); } else { - obj.subpages = []; + obj.subpages = message.subpages; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/endpoint.ts b/__fixtures__/v-next/outputv4/google/api/endpoint.ts index ea00824b27..63ea26cf9e 100644 --- a/__fixtures__/v-next/outputv4/google/api/endpoint.ts +++ b/__fixtures__/v-next/outputv4/google/api/endpoint.ts @@ -203,14 +203,14 @@ export const Endpoint = { }, toAmino(message: Endpoint): EndpointAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.aliases) { obj.aliases = message.aliases.map(e => e); } else { - obj.aliases = []; + obj.aliases = message.aliases; } - obj.target = message.target; - obj.allow_cors = message.allowCors; + obj.target = message.target === "" ? undefined : message.target; + obj.allow_cors = message.allowCors === false ? undefined : message.allowCors; return obj; }, fromAminoMsg(object: EndpointAminoMsg): Endpoint { diff --git a/__fixtures__/v-next/outputv4/google/api/expr/conformance/v1alpha1/conformance_service.ts b/__fixtures__/v-next/outputv4/google/api/expr/conformance/v1alpha1/conformance_service.ts index 9737c60a4d..fcf3d0737c 100644 --- a/__fixtures__/v-next/outputv4/google/api/expr/conformance/v1alpha1/conformance_service.ts +++ b/__fixtures__/v-next/outputv4/google/api/expr/conformance/v1alpha1/conformance_service.ts @@ -349,10 +349,10 @@ export const ParseRequest = { }, 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; + obj.cel_source = message.celSource === "" ? undefined : message.celSource; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.source_location = message.sourceLocation === "" ? undefined : message.sourceLocation; + obj.disable_macros = message.disableMacros === false ? undefined : message.disableMacros; return obj; }, fromAminoMsg(object: ParseRequestAminoMsg): ParseRequest { @@ -468,7 +468,7 @@ export const ParseResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -617,10 +617,10 @@ export const CheckRequest = { if (message.typeEnv) { obj.type_env = message.typeEnv.map(e => e ? Decl.toAmino(e) : undefined); } else { - obj.type_env = []; + obj.type_env = message.typeEnv; } - obj.container = message.container; - obj.no_std_env = message.noStdEnv; + obj.container = message.container === "" ? undefined : message.container; + obj.no_std_env = message.noStdEnv === false ? undefined : message.noStdEnv; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -736,7 +736,7 @@ export const CheckResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -842,7 +842,7 @@ export const EvalRequest_BindingsEntry = { }, toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; return obj; }, @@ -1028,7 +1028,7 @@ export const EvalRequest = { obj.bindings[k] = ExprValue.toAmino(v); }); } - obj.container = message.container; + obj.container = message.container === "" ? undefined : message.container; return obj; }, fromAminoMsg(object: EvalRequestAminoMsg): EvalRequest { @@ -1144,7 +1144,7 @@ export const EvalResponse = { if (message.issues) { obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.issues = []; + obj.issues = message.issues; } return obj; }, @@ -1257,7 +1257,7 @@ export const IssueDetails = { fromAmino(object: IssueDetailsAmino): IssueDetails { const message = createBaseIssueDetails(); if (object.severity !== undefined && object.severity !== null) { - message.severity = issueDetails_SeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.position !== undefined && object.position !== null) { message.position = SourcePosition.fromAmino(object.position); @@ -1269,9 +1269,9 @@ export const IssueDetails = { }, toAmino(message: IssueDetails): IssueDetailsAmino { const obj: any = {}; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.position = message.position ? SourcePosition.toAmino(message.position) : undefined; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; return obj; }, fromAminoMsg(object: IssueDetailsAminoMsg): IssueDetails { diff --git a/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/checked.ts b/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/checked.ts index eaf739cc81..1bb1e2eb2d 100644 --- a/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/checked.ts +++ b/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/checked.ts @@ -663,7 +663,7 @@ export const CheckedExpr_ReferenceMapEntry = { }, toAmino(message: CheckedExpr_ReferenceMapEntry): CheckedExpr_ReferenceMapEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Reference.toAmino(message.value) : undefined; return obj; }, @@ -765,7 +765,7 @@ export const CheckedExpr_TypeMapEntry = { }, toAmino(message: CheckedExpr_TypeMapEntry): CheckedExpr_TypeMapEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Type.toAmino(message.value) : undefined; return obj; }, @@ -1015,7 +1015,7 @@ export const CheckedExpr = { }); } obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined; - obj.expr_version = message.exprVersion; + obj.expr_version = message.exprVersion === "" ? undefined : message.exprVersion; obj.expr = message.expr ? Expr.toAmino(message.expr) : undefined; return obj; }, @@ -1271,16 +1271,16 @@ export const Type = { message.dyn = Empty.fromAmino(object.dyn); } if (object.null !== undefined && object.null !== null) { - message.null = nullValueFromJSON(object.null); + message.null = object.null; } if (object.primitive !== undefined && object.primitive !== null) { - message.primitive = type_PrimitiveTypeFromJSON(object.primitive); + message.primitive = object.primitive; } if (object.wrapper !== undefined && object.wrapper !== null) { - message.wrapper = type_PrimitiveTypeFromJSON(object.wrapper); + message.wrapper = object.wrapper; } if (object.well_known !== undefined && object.well_known !== null) { - message.wellKnown = type_WellKnownTypeFromJSON(object.well_known); + message.wellKnown = object.well_known; } if (object.list_type !== undefined && object.list_type !== null) { message.listType = Type_ListType.fromAmino(object.list_type); @@ -1311,15 +1311,15 @@ export const Type = { 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.null = message.null === null ? undefined : message.null; + obj.primitive = message.primitive === null ? undefined : message.primitive; + obj.wrapper = message.wrapper === null ? undefined : message.wrapper; + obj.well_known = message.wellKnown === null ? undefined : 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.message_type = message.messageType === null ? undefined : message.messageType; + obj.type_param = message.typeParam === null ? undefined : 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; @@ -1637,7 +1637,7 @@ export const Type_FunctionType = { if (message.argTypes) { obj.arg_types = message.argTypes.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.arg_types = []; + obj.arg_types = message.argTypes; } return obj; }, @@ -1748,11 +1748,11 @@ export const Type_AbstractType = { }, toAmino(message: Type_AbstractType): Type_AbstractTypeAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.parameterTypes) { obj.parameter_types = message.parameterTypes.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.parameter_types = []; + obj.parameter_types = message.parameterTypes; } return obj; }, @@ -1877,7 +1877,7 @@ export const Decl = { }, toAmino(message: Decl): DeclAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.ident = message.ident ? Decl_IdentDecl.toAmino(message.ident) : undefined; obj.function = message.function ? Decl_FunctionDecl.toAmino(message.function) : undefined; return obj; @@ -2005,7 +2005,7 @@ export const Decl_IdentDecl = { 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; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromAminoMsg(object: Decl_IdentDeclAminoMsg): Decl_IdentDecl { @@ -2102,7 +2102,7 @@ export const Decl_FunctionDecl = { if (message.overloads) { obj.overloads = message.overloads.map(e => e ? Decl_FunctionDecl_Overload.toAmino(e) : undefined); } else { - obj.overloads = []; + obj.overloads = message.overloads; } return obj; }, @@ -2285,20 +2285,20 @@ export const Decl_FunctionDecl_Overload = { }, toAmino(message: Decl_FunctionDecl_Overload): Decl_FunctionDecl_OverloadAmino { const obj: any = {}; - obj.overload_id = message.overloadId; + obj.overload_id = message.overloadId === "" ? undefined : message.overloadId; if (message.params) { obj.params = message.params.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.params = []; + obj.params = message.params; } if (message.typeParams) { obj.type_params = message.typeParams.map(e => e); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } obj.result_type = message.resultType ? Type.toAmino(message.resultType) : undefined; - obj.is_instance_function = message.isInstanceFunction; - obj.doc = message.doc; + obj.is_instance_function = message.isInstanceFunction === false ? undefined : message.isInstanceFunction; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromAminoMsg(object: Decl_FunctionDecl_OverloadAminoMsg): Decl_FunctionDecl_Overload { @@ -2426,11 +2426,11 @@ export const Reference = { }, toAmino(message: Reference): ReferenceAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.overloadId) { obj.overload_id = message.overloadId.map(e => e); } else { - obj.overload_id = []; + obj.overload_id = message.overloadId; } obj.value = message.value ? Constant.toAmino(message.value) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/eval.ts b/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/eval.ts index cdf6dbc118..6a6f5d581d 100644 --- a/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/eval.ts @@ -251,12 +251,12 @@ export const EvalState = { if (message.values) { obj.values = message.values.map(e => e ? ExprValue.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.results) { obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e) : undefined); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -365,8 +365,8 @@ export const EvalState_Result = { }, 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; + obj.expr = message.expr !== BigInt(0) ? message.expr.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result { @@ -591,7 +591,7 @@ export const ErrorSet = { if (message.errors) { obj.errors = message.errors.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.errors = []; + obj.errors = message.errors; } return obj; }, @@ -698,7 +698,7 @@ export const UnknownSet = { if (message.exprs) { obj.exprs = message.exprs.map(e => e.toString()); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/explain.ts b/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/explain.ts index cc2921cfe6..d803047c0d 100644 --- a/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/explain.ts +++ b/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/explain.ts @@ -153,12 +153,12 @@ export const Explain = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.exprSteps) { obj.expr_steps = message.exprSteps.map(e => e ? Explain_ExprStep.toAmino(e) : undefined); } else { - obj.expr_steps = []; + obj.expr_steps = message.exprSteps; } return obj; }, @@ -265,8 +265,8 @@ export const Explain_ExprStep = { }, toAmino(message: Explain_ExprStep): Explain_ExprStepAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.value_index = message.valueIndex; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.value_index = message.valueIndex === 0 ? undefined : message.valueIndex; return obj; }, fromAminoMsg(object: Explain_ExprStepAminoMsg): Explain_ExprStep { diff --git a/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/syntax.ts b/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/syntax.ts index e074a74f60..801b92b798 100644 --- a/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/syntax.ts +++ b/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/syntax.ts @@ -842,7 +842,7 @@ export const Expr = { }, toAmino(message: Expr): ExprAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? 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; @@ -937,7 +937,7 @@ export const Expr_Ident = { }, toAmino(message: Expr_Ident): Expr_IdentAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident { @@ -1060,8 +1060,8 @@ export const Expr_Select = { 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; + obj.field = message.field === "" ? undefined : message.field; + obj.test_only = message.testOnly === false ? undefined : message.testOnly; return obj; }, fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select { @@ -1190,11 +1190,11 @@ export const Expr_Call = { toAmino(message: Expr_Call): Expr_CallAmino { const obj: any = {}; obj.target = message.target ? Expr.toAmino(message.target) : undefined; - obj.function = message.function; + obj.function = message.function === "" ? undefined : message.function; if (message.args) { obj.args = message.args.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } return obj; }, @@ -1292,7 +1292,7 @@ export const Expr_CreateList = { if (message.elements) { obj.elements = message.elements.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.elements = []; + obj.elements = message.elements; } return obj; }, @@ -1403,11 +1403,11 @@ export const Expr_CreateStruct = { }, toAmino(message: Expr_CreateStruct): Expr_CreateStructAmino { const obj: any = {}; - obj.message_name = message.messageName; + obj.message_name = message.messageName === "" ? undefined : message.messageName; if (message.entries) { obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1550,8 +1550,8 @@ export const Expr_CreateStruct_Entry = { }, 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.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.field_key = message.fieldKey === null ? undefined : message.fieldKey; obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; @@ -1747,9 +1747,9 @@ export const Expr_Comprehension = { }, toAmino(message: Expr_Comprehension): Expr_ComprehensionAmino { const obj: any = {}; - obj.iter_var = message.iterVar; + obj.iter_var = message.iterVar === "" ? undefined : message.iterVar; obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange) : undefined; - obj.accu_var = message.accuVar; + obj.accu_var = message.accuVar === "" ? undefined : 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; @@ -1949,7 +1949,7 @@ export const Constant = { fromAmino(object: ConstantAmino): Constant { const message = createBaseConstant(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -1979,12 +1979,12 @@ export const Constant = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; obj.duration_value = message.durationValue ? Duration.toAmino(message.durationValue) : undefined; obj.timestamp_value = message.timestampValue ? Timestamp.toAmino(toTimestamp(message.timestampValue)) : undefined; @@ -2092,8 +2092,8 @@ export const SourceInfo_PositionsEntry = { }, toAmino(message: SourceInfo_PositionsEntry): SourceInfo_PositionsEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; - obj.value = message.value; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry { @@ -2194,7 +2194,7 @@ export const SourceInfo_MacroCallsEntry = { }, toAmino(message: SourceInfo_MacroCallsEntry): SourceInfo_MacroCallsEntryAmino { const obj: any = {}; - obj.key = message.key ? message.key.toString() : undefined; + obj.key = message.key !== BigInt(0) ? message.key.toString() : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; }, @@ -2442,12 +2442,12 @@ export const SourceInfo = { }, toAmino(message: SourceInfo): SourceInfoAmino { const obj: any = {}; - obj.syntax_version = message.syntaxVersion; - obj.location = message.location; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -2596,10 +2596,10 @@ export const SourcePosition = { }, toAmino(message: SourcePosition): SourcePositionAmino { const obj: any = {}; - obj.location = message.location; - obj.offset = message.offset; - obj.line = message.line; - obj.column = message.column; + obj.location = message.location === "" ? undefined : message.location; + obj.offset = message.offset === 0 ? undefined : message.offset; + obj.line = message.line === 0 ? undefined : message.line; + obj.column = message.column === 0 ? undefined : message.column; return obj; }, fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition { diff --git a/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/value.ts b/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/value.ts index 885e7fecb0..f7387d7dc3 100644 --- a/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/value.ts +++ b/__fixtures__/v-next/outputv4/google/api/expr/v1alpha1/value.ts @@ -369,7 +369,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -408,18 +408,18 @@ export const 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; 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; + obj.type_value = message.typeValue === null ? undefined : message.typeValue; return obj; }, fromAminoMsg(object: ValueAminoMsg): Value { @@ -523,8 +523,8 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.type = message.type; - obj.value = message.value; + obj.type = message.type === "" ? undefined : message.type; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EnumValueAminoMsg): EnumValue { @@ -621,7 +621,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, @@ -719,7 +719,7 @@ export const MapValue = { if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/decl.ts b/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/decl.ts index d58da40c85..aa5c27d0e9 100644 --- a/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/decl.ts +++ b/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/decl.ts @@ -231,9 +231,9 @@ export const Decl = { }, toAmino(message: Decl): DeclAmino { const obj: any = {}; - obj.id = message.id; - obj.name = message.name; - obj.doc = message.doc; + obj.id = message.id === 0 ? undefined : message.id; + obj.name = message.name === "" ? undefined : message.name; + obj.doc = message.doc === "" ? undefined : message.doc; obj.ident = message.ident ? IdentDecl.toAmino(message.ident) : undefined; obj.function = message.function ? FunctionDecl.toAmino(message.function) : undefined; return obj; @@ -361,12 +361,12 @@ export const DeclType = { }, toAmino(message: DeclType): DeclTypeAmino { const obj: any = {}; - obj.id = message.id; - obj.type = message.type; + obj.id = message.id === 0 ? undefined : message.id; + obj.type = message.type === "" ? undefined : message.type; if (message.typeParams) { obj.type_params = message.typeParams.map(e => e ? DeclType.toAmino(e) : undefined); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } return obj; }, @@ -607,10 +607,10 @@ export const FunctionDecl = { if (message.args) { obj.args = message.args.map(e => e ? IdentDecl.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } obj.return_type = message.returnType ? DeclType.toAmino(message.returnType) : undefined; - obj.receiver_function = message.receiverFunction; + obj.receiver_function = message.receiverFunction === false ? undefined : message.receiverFunction; return obj; }, fromAminoMsg(object: FunctionDeclAminoMsg): FunctionDecl { diff --git a/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/eval.ts b/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/eval.ts index 2613dc06f8..a0c78e0fcc 100644 --- a/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/eval.ts +++ b/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/eval.ts @@ -264,12 +264,12 @@ export const EvalState = { if (message.values) { obj.values = message.values.map(e => e ? ExprValue.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } if (message.results) { obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e) : undefined); } else { - obj.results = []; + obj.results = message.results; } return obj; }, @@ -377,7 +377,7 @@ export const EvalState_Result = { toAmino(message: EvalState_Result): EvalState_ResultAmino { const obj: any = {}; obj.expr = message.expr ? IdRef.toAmino(message.expr) : undefined; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result { @@ -602,7 +602,7 @@ export const ErrorSet = { if (message.errors) { obj.errors = message.errors.map(e => e ? Status.toAmino(e) : undefined); } else { - obj.errors = []; + obj.errors = message.errors; } return obj; }, @@ -700,7 +700,7 @@ export const UnknownSet = { if (message.exprs) { obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); } else { - obj.exprs = []; + obj.exprs = message.exprs; } return obj; }, @@ -789,7 +789,7 @@ export const IdRef = { }, toAmino(message: IdRef): IdRefAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : message.id; return obj; }, fromAminoMsg(object: IdRefAminoMsg): IdRef { diff --git a/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/expr.ts b/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/expr.ts index 5e90f4ccd5..d461fbe243 100644 --- a/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/expr.ts +++ b/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/expr.ts @@ -513,7 +513,7 @@ export const ParsedExpr = { 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; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; return obj; }, fromAminoMsg(object: ParsedExprAminoMsg): ParsedExpr { @@ -727,7 +727,7 @@ export const Expr = { }, toAmino(message: Expr): ExprAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === 0 ? undefined : 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; @@ -822,7 +822,7 @@ export const Expr_Ident = { }, toAmino(message: Expr_Ident): Expr_IdentAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident { @@ -945,8 +945,8 @@ export const Expr_Select = { 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; + obj.field = message.field === "" ? undefined : message.field; + obj.test_only = message.testOnly === false ? undefined : message.testOnly; return obj; }, fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select { @@ -1075,11 +1075,11 @@ export const Expr_Call = { toAmino(message: Expr_Call): Expr_CallAmino { const obj: any = {}; obj.target = message.target ? Expr.toAmino(message.target) : undefined; - obj.function = message.function; + obj.function = message.function === "" ? undefined : message.function; if (message.args) { obj.args = message.args.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.args = []; + obj.args = message.args; } return obj; }, @@ -1177,7 +1177,7 @@ export const Expr_CreateList = { if (message.elements) { obj.elements = message.elements.map(e => e ? Expr.toAmino(e) : undefined); } else { - obj.elements = []; + obj.elements = message.elements; } return obj; }, @@ -1288,11 +1288,11 @@ export const Expr_CreateStruct = { }, toAmino(message: Expr_CreateStruct): Expr_CreateStructAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.entries) { obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -1433,8 +1433,8 @@ export const Expr_CreateStruct_Entry = { }, toAmino(message: Expr_CreateStruct_Entry): Expr_CreateStruct_EntryAmino { const obj: any = {}; - obj.id = message.id; - obj.field_key = message.fieldKey; + obj.id = message.id === 0 ? undefined : message.id; + obj.field_key = message.fieldKey === null ? undefined : message.fieldKey; obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined; obj.value = message.value ? Expr.toAmino(message.value) : undefined; return obj; @@ -1630,9 +1630,9 @@ export const Expr_Comprehension = { }, toAmino(message: Expr_Comprehension): Expr_ComprehensionAmino { const obj: any = {}; - obj.iter_var = message.iterVar; + obj.iter_var = message.iterVar === "" ? undefined : message.iterVar; obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange) : undefined; - obj.accu_var = message.accuVar; + obj.accu_var = message.accuVar === "" ? undefined : 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; @@ -1804,7 +1804,7 @@ export const Literal = { fromAmino(object: LiteralAmino): Literal { const message = createBaseLiteral(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -1828,12 +1828,12 @@ export const Literal = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/source.ts b/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/source.ts index 74d34127db..afa2dccaf0 100644 --- a/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/source.ts +++ b/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/source.ts @@ -163,8 +163,8 @@ export const SourceInfo_PositionsEntry = { }, toAmino(message: SourceInfo_PositionsEntry): SourceInfo_PositionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === 0 ? undefined : message.key; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry { @@ -336,11 +336,11 @@ export const SourceInfo = { }, toAmino(message: SourceInfo): SourceInfoAmino { const obj: any = {}; - obj.location = message.location; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -483,10 +483,10 @@ export const SourcePosition = { }, toAmino(message: SourcePosition): SourcePositionAmino { const obj: any = {}; - obj.location = message.location; - obj.offset = message.offset; - obj.line = message.line; - obj.column = message.column; + obj.location = message.location === "" ? undefined : message.location; + obj.offset = message.offset === 0 ? undefined : message.offset; + obj.line = message.line === 0 ? undefined : message.line; + obj.column = message.column === 0 ? undefined : message.column; return obj; }, fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition { diff --git a/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/value.ts b/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/value.ts index c77a38f1b5..5de8bc247e 100644 --- a/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/value.ts +++ b/__fixtures__/v-next/outputv4/google/api/expr/v1beta1/value.ts @@ -369,7 +369,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -408,18 +408,18 @@ export const 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; 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; + obj.type_value = message.typeValue === null ? undefined : message.typeValue; return obj; }, fromAminoMsg(object: ValueAminoMsg): Value { @@ -523,8 +523,8 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.type = message.type; - obj.value = message.value; + obj.type = message.type === "" ? undefined : message.type; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: EnumValueAminoMsg): EnumValue { @@ -621,7 +621,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, @@ -719,7 +719,7 @@ export const MapValue = { if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/http.ts b/__fixtures__/v-next/outputv4/google/api/http.ts index 0464bcb646..27fefd5395 100644 --- a/__fixtures__/v-next/outputv4/google/api/http.ts +++ b/__fixtures__/v-next/outputv4/google/api/http.ts @@ -756,9 +756,9 @@ export const Http = { if (message.rules) { obj.rules = message.rules.map(e => e ? HttpRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion; + obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion === false ? undefined : message.fullyDecodeReservedExpansion; return obj; }, fromAminoMsg(object: HttpAminoMsg): Http { @@ -998,19 +998,19 @@ export const HttpRule = { }, 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.selector = message.selector === "" ? undefined : message.selector; + obj.get = message.get === null ? undefined : message.get; + obj.put = message.put === null ? undefined : message.put; + obj.post = message.post === null ? undefined : message.post; + obj.delete = message.delete === null ? undefined : message.delete; + obj.patch = message.patch === null ? undefined : message.patch; obj.custom = message.custom ? CustomHttpPattern.toAmino(message.custom) : undefined; - obj.body = message.body; - obj.response_body = message.responseBody; + obj.body = message.body === "" ? undefined : message.body; + obj.response_body = message.responseBody === "" ? undefined : message.responseBody; if (message.additionalBindings) { obj.additional_bindings = message.additionalBindings.map(e => e ? HttpRule.toAmino(e) : undefined); } else { - obj.additional_bindings = []; + obj.additional_bindings = message.additionalBindings; } return obj; }, @@ -1115,8 +1115,8 @@ export const CustomHttpPattern = { }, toAmino(message: CustomHttpPattern): CustomHttpPatternAmino { const obj: any = {}; - obj.kind = message.kind; - obj.path = message.path; + obj.kind = message.kind === "" ? undefined : message.kind; + obj.path = message.path === "" ? undefined : message.path; return obj; }, fromAminoMsg(object: CustomHttpPatternAminoMsg): CustomHttpPattern { diff --git a/__fixtures__/v-next/outputv4/google/api/httpbody.ts b/__fixtures__/v-next/outputv4/google/api/httpbody.ts index 2bc4912c79..bc07994016 100644 --- a/__fixtures__/v-next/outputv4/google/api/httpbody.ts +++ b/__fixtures__/v-next/outputv4/google/api/httpbody.ts @@ -219,12 +219,12 @@ export const HttpBody = { }, toAmino(message: HttpBody): HttpBodyAmino { const obj: any = {}; - obj.content_type = message.contentType; + obj.content_type = message.contentType === "" ? undefined : message.contentType; obj.data = message.data ? base64FromBytes(message.data) : undefined; if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/label.ts b/__fixtures__/v-next/outputv4/google/api/label.ts index 034a9d8e4b..a26f34855d 100644 --- a/__fixtures__/v-next/outputv4/google/api/label.ts +++ b/__fixtures__/v-next/outputv4/google/api/label.ts @@ -153,7 +153,7 @@ export const LabelDescriptor = { message.key = object.key; } if (object.value_type !== undefined && object.value_type !== null) { - message.valueType = labelDescriptor_ValueTypeFromJSON(object.value_type); + message.valueType = object.value_type; } if (object.description !== undefined && object.description !== null) { message.description = object.description; @@ -162,9 +162,9 @@ export const LabelDescriptor = { }, toAmino(message: LabelDescriptor): LabelDescriptorAmino { const obj: any = {}; - obj.key = message.key; - obj.value_type = message.valueType; - obj.description = message.description; + obj.key = message.key === "" ? undefined : message.key; + obj.value_type = message.valueType === 0 ? undefined : message.valueType; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: LabelDescriptorAminoMsg): LabelDescriptor { diff --git a/__fixtures__/v-next/outputv4/google/api/log.ts b/__fixtures__/v-next/outputv4/google/api/log.ts index 240c58997a..aaf0a95b5c 100644 --- a/__fixtures__/v-next/outputv4/google/api/log.ts +++ b/__fixtures__/v-next/outputv4/google/api/log.ts @@ -180,14 +180,14 @@ export const LogDescriptor = { }, toAmino(message: LogDescriptor): LogDescriptorAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.labels; } - obj.description = message.description; - obj.display_name = message.displayName; + obj.description = message.description === "" ? undefined : message.description; + obj.display_name = message.displayName === "" ? undefined : message.displayName; return obj; }, fromAminoMsg(object: LogDescriptorAminoMsg): LogDescriptor { diff --git a/__fixtures__/v-next/outputv4/google/api/logging.ts b/__fixtures__/v-next/outputv4/google/api/logging.ts index 0af3ad896c..640f2aced6 100644 --- a/__fixtures__/v-next/outputv4/google/api/logging.ts +++ b/__fixtures__/v-next/outputv4/google/api/logging.ts @@ -217,12 +217,12 @@ export const Logging = { if (message.producerDestinations) { obj.producer_destinations = message.producerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e) : undefined); } else { - obj.producer_destinations = []; + obj.producer_destinations = message.producerDestinations; } if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -333,11 +333,11 @@ export const Logging_LoggingDestination = { }, toAmino(message: Logging_LoggingDestination): Logging_LoggingDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.logs) { obj.logs = message.logs.map(e => e); } else { - obj.logs = []; + obj.logs = message.logs; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/metric.ts b/__fixtures__/v-next/outputv4/google/api/metric.ts index fac907d104..e77750b1b5 100644 --- a/__fixtures__/v-next/outputv4/google/api/metric.ts +++ b/__fixtures__/v-next/outputv4/google/api/metric.ts @@ -616,10 +616,10 @@ export const MetricDescriptor = { } message.labels = object.labels?.map(e => LabelDescriptor.fromAmino(e)) || []; if (object.metric_kind !== undefined && object.metric_kind !== null) { - message.metricKind = metricDescriptor_MetricKindFromJSON(object.metric_kind); + message.metricKind = object.metric_kind; } if (object.value_type !== undefined && object.value_type !== null) { - message.valueType = metricDescriptor_ValueTypeFromJSON(object.value_type); + message.valueType = object.value_type; } if (object.unit !== undefined && object.unit !== null) { message.unit = object.unit; @@ -634,31 +634,31 @@ export const MetricDescriptor = { message.metadata = MetricDescriptor_MetricDescriptorMetadata.fromAmino(object.metadata); } if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } message.monitoredResourceTypes = object.monitored_resource_types?.map(e => e) || []; return message; }, toAmino(message: MetricDescriptor): MetricDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.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.metric_kind = message.metricKind === 0 ? undefined : message.metricKind; + obj.value_type = message.valueType === 0 ? undefined : message.valueType; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.description = message.description === "" ? undefined : message.description; + obj.display_name = message.displayName === "" ? undefined : message.displayName; obj.metadata = message.metadata ? MetricDescriptor_MetricDescriptorMetadata.toAmino(message.metadata) : undefined; - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; if (message.monitoredResourceTypes) { obj.monitored_resource_types = message.monitoredResourceTypes.map(e => e); } else { - obj.monitored_resource_types = []; + obj.monitored_resource_types = message.monitoredResourceTypes; } return obj; }, @@ -771,7 +771,7 @@ export const MetricDescriptor_MetricDescriptorMetadata = { fromAmino(object: MetricDescriptor_MetricDescriptorMetadataAmino): MetricDescriptor_MetricDescriptorMetadata { const message = createBaseMetricDescriptor_MetricDescriptorMetadata(); if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } if (object.sample_period !== undefined && object.sample_period !== null) { message.samplePeriod = Duration.fromAmino(object.sample_period); @@ -783,7 +783,7 @@ export const MetricDescriptor_MetricDescriptorMetadata = { }, toAmino(message: MetricDescriptor_MetricDescriptorMetadata): MetricDescriptor_MetricDescriptorMetadataAmino { const obj: any = {}; - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; obj.sample_period = message.samplePeriod ? Duration.toAmino(message.samplePeriod) : undefined; obj.ingest_delay = message.ingestDelay ? Duration.toAmino(message.ingestDelay) : undefined; return obj; @@ -888,8 +888,8 @@ export const Metric_LabelsEntry = { }, toAmino(message: Metric_LabelsEntry): Metric_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: Metric_LabelsEntryAminoMsg): Metric_LabelsEntry { @@ -1030,7 +1030,7 @@ export const Metric = { }, toAmino(message: Metric): MetricAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { diff --git a/__fixtures__/v-next/outputv4/google/api/monitored_resource.ts b/__fixtures__/v-next/outputv4/google/api/monitored_resource.ts index b30b9532b3..08ce330325 100644 --- a/__fixtures__/v-next/outputv4/google/api/monitored_resource.ts +++ b/__fixtures__/v-next/outputv4/google/api/monitored_resource.ts @@ -348,22 +348,22 @@ export const MonitoredResourceDescriptor = { } message.labels = object.labels?.map(e => LabelDescriptor.fromAmino(e)) || []; if (object.launch_stage !== undefined && object.launch_stage !== null) { - message.launchStage = launchStageFromJSON(object.launch_stage); + message.launchStage = object.launch_stage; } return message; }, toAmino(message: MonitoredResourceDescriptor): MonitoredResourceDescriptorAmino { const obj: any = {}; - obj.name = message.name; - obj.type = message.type; - obj.display_name = message.displayName; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; + obj.display_name = message.displayName === "" ? undefined : message.displayName; + obj.description = message.description === "" ? undefined : message.description; if (message.labels) { obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); } else { - obj.labels = []; + obj.labels = message.labels; } - obj.launch_stage = message.launchStage; + obj.launch_stage = message.launchStage === 0 ? undefined : message.launchStage; return obj; }, fromAminoMsg(object: MonitoredResourceDescriptorAminoMsg): MonitoredResourceDescriptor { @@ -466,8 +466,8 @@ export const MonitoredResource_LabelsEntry = { }, toAmino(message: MonitoredResource_LabelsEntry): MonitoredResource_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MonitoredResource_LabelsEntryAminoMsg): MonitoredResource_LabelsEntry { @@ -608,7 +608,7 @@ export const MonitoredResource = { }, toAmino(message: MonitoredResource): MonitoredResourceAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -717,8 +717,8 @@ export const MonitoredResourceMetadata_UserLabelsEntry = { }, toAmino(message: MonitoredResourceMetadata_UserLabelsEntry): MonitoredResourceMetadata_UserLabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MonitoredResourceMetadata_UserLabelsEntryAminoMsg): MonitoredResourceMetadata_UserLabelsEntry { diff --git a/__fixtures__/v-next/outputv4/google/api/monitoring.ts b/__fixtures__/v-next/outputv4/google/api/monitoring.ts index 4df9a3652e..ab5f9b5a3d 100644 --- a/__fixtures__/v-next/outputv4/google/api/monitoring.ts +++ b/__fixtures__/v-next/outputv4/google/api/monitoring.ts @@ -265,12 +265,12 @@ export const Monitoring = { if (message.producerDestinations) { obj.producer_destinations = message.producerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e) : undefined); } else { - obj.producer_destinations = []; + obj.producer_destinations = message.producerDestinations; } if (message.consumerDestinations) { obj.consumer_destinations = message.consumerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e) : undefined); } else { - obj.consumer_destinations = []; + obj.consumer_destinations = message.consumerDestinations; } return obj; }, @@ -381,11 +381,11 @@ export const Monitoring_MonitoringDestination = { }, toAmino(message: Monitoring_MonitoringDestination): Monitoring_MonitoringDestinationAmino { const obj: any = {}; - obj.monitored_resource = message.monitoredResource; + obj.monitored_resource = message.monitoredResource === "" ? undefined : message.monitoredResource; if (message.metrics) { obj.metrics = message.metrics.map(e => e); } else { - obj.metrics = []; + obj.metrics = message.metrics; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/quota.ts b/__fixtures__/v-next/outputv4/google/api/quota.ts index e5bee1b8e7..62d8ed3331 100644 --- a/__fixtures__/v-next/outputv4/google/api/quota.ts +++ b/__fixtures__/v-next/outputv4/google/api/quota.ts @@ -401,12 +401,12 @@ export const Quota = { if (message.limits) { obj.limits = message.limits.map(e => e ? QuotaLimit.toAmino(e) : undefined); } else { - obj.limits = []; + obj.limits = message.limits; } if (message.metricRules) { obj.metric_rules = message.metricRules.map(e => e ? MetricRule.toAmino(e) : undefined); } else { - obj.metric_rules = []; + obj.metric_rules = message.metricRules; } return obj; }, @@ -512,8 +512,8 @@ export const MetricRule_MetricCostsEntry = { }, toAmino(message: MetricRule_MetricCostsEntry): MetricRule_MetricCostsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value ? message.value.toString() : undefined; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: MetricRule_MetricCostsEntryAminoMsg): MetricRule_MetricCostsEntry { @@ -654,7 +654,7 @@ export const MetricRule = { }, toAmino(message: MetricRule): MetricRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.metric_costs = {}; if (message.metricCosts) { Object.entries(message.metricCosts).forEach(([k, v]) => { @@ -765,8 +765,8 @@ export const QuotaLimit_ValuesEntry = { }, toAmino(message: QuotaLimit_ValuesEntry): QuotaLimit_ValuesEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value ? message.value.toString() : undefined; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: QuotaLimit_ValuesEntryAminoMsg): QuotaLimit_ValuesEntry { @@ -1041,21 +1041,21 @@ export const QuotaLimit = { }, 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.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.default_limit = message.defaultLimit !== BigInt(0) ? message.defaultLimit.toString() : undefined; + obj.max_limit = message.maxLimit !== BigInt(0) ? message.maxLimit.toString() : undefined; + obj.free_tier = message.freeTier !== BigInt(0) ? message.freeTier.toString() : undefined; + obj.duration = message.duration === "" ? undefined : message.duration; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; obj.values = {}; if (message.values) { Object.entries(message.values).forEach(([k, v]) => { obj.values[k] = v.toString(); }); } - obj.display_name = message.displayName; + obj.display_name = message.displayName === "" ? undefined : message.displayName; return obj; }, fromAminoMsg(object: QuotaLimitAminoMsg): QuotaLimit { diff --git a/__fixtures__/v-next/outputv4/google/api/resource.ts b/__fixtures__/v-next/outputv4/google/api/resource.ts index 962d17d5ef..0e4a5e2623 100644 --- a/__fixtures__/v-next/outputv4/google/api/resource.ts +++ b/__fixtures__/v-next/outputv4/google/api/resource.ts @@ -517,7 +517,7 @@ export const ResourceDescriptor = { message.nameField = object.name_field; } if (object.history !== undefined && object.history !== null) { - message.history = resourceDescriptor_HistoryFromJSON(object.history); + message.history = object.history; } if (object.plural !== undefined && object.plural !== null) { message.plural = object.plural; @@ -525,25 +525,25 @@ export const ResourceDescriptor = { if (object.singular !== undefined && object.singular !== null) { message.singular = object.singular; } - message.style = object.style?.map(e => resourceDescriptor_StyleFromJSON(e)) || []; + message.style = object.style?.map(e => e) || []; return message; }, toAmino(message: ResourceDescriptor): ResourceDescriptorAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.pattern) { obj.pattern = message.pattern.map(e => e); } else { - obj.pattern = []; + obj.pattern = message.pattern; } - obj.name_field = message.nameField; - obj.history = message.history; - obj.plural = message.plural; - obj.singular = message.singular; + obj.name_field = message.nameField === "" ? undefined : message.nameField; + obj.history = message.history === 0 ? undefined : message.history; + obj.plural = message.plural === "" ? undefined : message.plural; + obj.singular = message.singular === "" ? undefined : message.singular; if (message.style) { obj.style = message.style.map(e => e); } else { - obj.style = []; + obj.style = message.style; } return obj; }, @@ -648,8 +648,8 @@ export const ResourceReference = { }, toAmino(message: ResourceReference): ResourceReferenceAmino { const obj: any = {}; - obj.type = message.type; - obj.child_type = message.childType; + obj.type = message.type === "" ? undefined : message.type; + obj.child_type = message.childType === "" ? undefined : message.childType; return obj; }, fromAminoMsg(object: ResourceReferenceAminoMsg): ResourceReference { diff --git a/__fixtures__/v-next/outputv4/google/api/routing.ts b/__fixtures__/v-next/outputv4/google/api/routing.ts index 43980d662e..f045948f92 100644 --- a/__fixtures__/v-next/outputv4/google/api/routing.ts +++ b/__fixtures__/v-next/outputv4/google/api/routing.ts @@ -890,7 +890,7 @@ export const RoutingRule = { if (message.routingParameters) { obj.routing_parameters = message.routingParameters.map(e => e ? RoutingParameter.toAmino(e) : undefined); } else { - obj.routing_parameters = []; + obj.routing_parameters = message.routingParameters; } return obj; }, @@ -995,8 +995,8 @@ export const RoutingParameter = { }, toAmino(message: RoutingParameter): RoutingParameterAmino { const obj: any = {}; - obj.field = message.field; - obj.path_template = message.pathTemplate; + obj.field = message.field === "" ? undefined : message.field; + obj.path_template = message.pathTemplate === "" ? undefined : message.pathTemplate; return obj; }, fromAminoMsg(object: RoutingParameterAminoMsg): RoutingParameter { diff --git a/__fixtures__/v-next/outputv4/google/api/service.ts b/__fixtures__/v-next/outputv4/google/api/service.ts index 92c85c7773..0a985a4bd4 100644 --- a/__fixtures__/v-next/outputv4/google/api/service.ts +++ b/__fixtures__/v-next/outputv4/google/api/service.ts @@ -722,24 +722,24 @@ export const Service = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; + obj.id = message.id === "" ? undefined : message.id; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } if (message.types) { obj.types = message.types.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.types = []; + obj.types = message.types; } if (message.enums) { obj.enums = message.enums.map(e => e ? Enum.toAmino(e) : undefined); } else { - obj.enums = []; + obj.enums = message.enums; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.backend = message.backend ? Backend.toAmino(message.backend) : undefined; @@ -751,23 +751,23 @@ export const Service = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.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 = []; + obj.logs = message.logs; } if (message.metrics) { obj.metrics = message.metrics.map(e => e ? MetricDescriptor.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.billing = message.billing ? Billing.toAmino(message.billing) : undefined; obj.logging = message.logging ? Logging.toAmino(message.logging) : undefined; diff --git a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/check_error.ts b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/check_error.ts index f5a810c0d4..9cfb8461ed 100644 --- a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/check_error.ts +++ b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/check_error.ts @@ -333,7 +333,7 @@ export const CheckError = { fromAmino(object: CheckErrorAmino): CheckError { const message = createBaseCheckError(); if (object.code !== undefined && object.code !== null) { - message.code = checkError_CodeFromJSON(object.code); + message.code = object.code; } if (object.subject !== undefined && object.subject !== null) { message.subject = object.subject; @@ -348,9 +348,9 @@ export const CheckError = { }, toAmino(message: CheckError): CheckErrorAmino { const obj: any = {}; - obj.code = message.code; - obj.subject = message.subject; - obj.detail = message.detail; + obj.code = message.code === 0 ? undefined : message.code; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.detail = message.detail === "" ? undefined : message.detail; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/distribution.ts b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/distribution.ts index af739438ec..2d585a36c2 100644 --- a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/distribution.ts +++ b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/distribution.ts @@ -416,15 +416,15 @@ export const Distribution = { }, 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; + obj.count = message.count !== BigInt(0) ? message.count.toString() : undefined; + obj.mean = message.mean === 0 ? undefined : message.mean; + obj.minimum = message.minimum === 0 ? undefined : message.minimum; + obj.maximum = message.maximum === 0 ? undefined : message.maximum; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation === 0 ? undefined : message.sumOfSquaredDeviation; if (message.bucketCounts) { obj.bucket_counts = message.bucketCounts.map(e => e.toString()); } else { - obj.bucket_counts = []; + obj.bucket_counts = message.bucketCounts; } obj.linear_buckets = message.linearBuckets ? Distribution_LinearBuckets.toAmino(message.linearBuckets) : undefined; obj.exponential_buckets = message.exponentialBuckets ? Distribution_ExponentialBuckets.toAmino(message.exponentialBuckets) : undefined; @@ -432,7 +432,7 @@ export const Distribution = { if (message.exemplars) { obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e) : undefined); } else { - obj.exemplars = []; + obj.exemplars = message.exemplars; } return obj; }, @@ -553,9 +553,9 @@ export const Distribution_LinearBuckets = { }, toAmino(message: Distribution_LinearBuckets): Distribution_LinearBucketsAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.width = message.width; - obj.offset = message.offset; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.width = message.width === 0 ? undefined : message.width; + obj.offset = message.offset === 0 ? undefined : message.offset; return obj; }, fromAminoMsg(object: Distribution_LinearBucketsAminoMsg): Distribution_LinearBuckets { @@ -675,9 +675,9 @@ export const Distribution_ExponentialBuckets = { }, toAmino(message: Distribution_ExponentialBuckets): Distribution_ExponentialBucketsAmino { const obj: any = {}; - obj.num_finite_buckets = message.numFiniteBuckets; - obj.growth_factor = message.growthFactor; - obj.scale = message.scale; + obj.num_finite_buckets = message.numFiniteBuckets === 0 ? undefined : message.numFiniteBuckets; + obj.growth_factor = message.growthFactor === 0 ? undefined : message.growthFactor; + obj.scale = message.scale === 0 ? undefined : message.scale; return obj; }, fromAminoMsg(object: Distribution_ExponentialBucketsAminoMsg): Distribution_ExponentialBuckets { @@ -783,7 +783,7 @@ export const Distribution_ExplicitBuckets = { if (message.bounds) { obj.bounds = message.bounds.map(e => e); } else { - obj.bounds = []; + obj.bounds = message.bounds; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/http_request.ts b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/http_request.ts index 42a252a826..62ddb90d53 100644 --- a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/http_request.ts +++ b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/http_request.ts @@ -406,21 +406,21 @@ export const HttpRequest = { }, 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.request_method = message.requestMethod === "" ? undefined : message.requestMethod; + obj.request_url = message.requestUrl === "" ? undefined : message.requestUrl; + obj.request_size = message.requestSize !== BigInt(0) ? message.requestSize.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.response_size = message.responseSize !== BigInt(0) ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent === "" ? undefined : message.userAgent; + obj.remote_ip = message.remoteIp === "" ? undefined : message.remoteIp; + obj.server_ip = message.serverIp === "" ? undefined : message.serverIp; + obj.referer = message.referer === "" ? undefined : 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; + obj.cache_lookup = message.cacheLookup === false ? undefined : message.cacheLookup; + obj.cache_hit = message.cacheHit === false ? undefined : message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer === false ? undefined : message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes !== BigInt(0) ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest { diff --git a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/log_entry.ts b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/log_entry.ts index ae3b9973d1..3217d86cfe 100644 --- a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/log_entry.ts +++ b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/log_entry.ts @@ -261,8 +261,8 @@ export const LogEntry_LabelsEntry = { }, toAmino(message: LogEntry_LabelsEntry): LogEntry_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry { @@ -535,7 +535,7 @@ export const LogEntry = { message.timestamp = fromTimestamp(Timestamp.fromAmino(object.timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.http_request !== undefined && object.http_request !== null) { message.httpRequest = HttpRequest.fromAmino(object.http_request); @@ -573,12 +573,12 @@ export const LogEntry = { }, toAmino(message: LogEntry): LogEntryAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; - obj.trace = message.trace; - obj.insert_id = message.insertId; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -586,7 +586,7 @@ export const LogEntry = { }); } obj.proto_payload = message.protoPayload ? Any.toAmino(message.protoPayload) : undefined; - obj.text_payload = message.textPayload; + obj.text_payload = message.textPayload === null ? undefined : 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; @@ -725,10 +725,10 @@ export const LogEntryOperation = { }, toAmino(message: LogEntryOperation): LogEntryOperationAmino { const obj: any = {}; - obj.id = message.id; - obj.producer = message.producer; - obj.first = message.first; - obj.last = message.last; + obj.id = message.id === "" ? undefined : message.id; + obj.producer = message.producer === "" ? undefined : message.producer; + obj.first = message.first === false ? undefined : message.first; + obj.last = message.last === false ? undefined : message.last; return obj; }, fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation { @@ -850,9 +850,9 @@ export const LogEntrySourceLocation = { }, toAmino(message: LogEntrySourceLocation): LogEntrySourceLocationAmino { const obj: any = {}; - obj.file = message.file; - obj.line = message.line ? message.line.toString() : undefined; - obj.function = message.function; + obj.file = message.file === "" ? undefined : message.file; + obj.line = message.line !== BigInt(0) ? message.line.toString() : undefined; + obj.function = message.function === "" ? undefined : message.function; return obj; }, fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation { diff --git a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/metric_value.ts b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/metric_value.ts index 6f369d68b9..47d8c3ac9d 100644 --- a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/metric_value.ts +++ b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/metric_value.ts @@ -176,8 +176,8 @@ export const MetricValue_LabelsEntry = { }, toAmino(message: MetricValue_LabelsEntry): MetricValue_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: MetricValue_LabelsEntryAminoMsg): MetricValue_LabelsEntry { @@ -428,10 +428,10 @@ export const MetricValue = { } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; - 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.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.distribution_value = message.distributionValue ? Distribution.toAmino(message.distributionValue) : undefined; return obj; }, @@ -542,11 +542,11 @@ export const MetricValueSet = { }, toAmino(message: MetricValueSet): MetricValueSetAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; if (message.metricValues) { obj.metric_values = message.metricValues.map(e => e ? MetricValue.toAmino(e) : undefined); } else { - obj.metric_values = []; + obj.metric_values = message.metricValues; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/operation.ts b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/operation.ts index 516a95321a..f35cf14063 100644 --- a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/operation.ts +++ b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/operation.ts @@ -243,8 +243,8 @@ export const Operation_LabelsEntry = { }, toAmino(message: Operation_LabelsEntry): Operation_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: Operation_LabelsEntryAminoMsg): Operation_LabelsEntry { @@ -524,16 +524,16 @@ export const Operation = { message.metricValueSets = object.metric_value_sets?.map(e => MetricValueSet.fromAmino(e)) || []; message.logEntries = object.log_entries?.map(e => LogEntry.fromAmino(e)) || []; if (object.importance !== undefined && object.importance !== null) { - message.importance = operation_ImportanceFromJSON(object.importance); + message.importance = object.importance; } message.extensions = object.extensions?.map(e => Any.fromAmino(e)) || []; return message; }, toAmino(message: Operation): OperationAmino { const obj: any = {}; - obj.operation_id = message.operationId; - obj.operation_name = message.operationName; - obj.consumer_id = message.consumerId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; + obj.operation_name = message.operationName === "" ? undefined : message.operationName; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; obj.labels = {}; @@ -545,18 +545,18 @@ export const Operation = { if (message.metricValueSets) { obj.metric_value_sets = message.metricValueSets.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.metric_value_sets = []; + obj.metric_value_sets = message.metricValueSets; } if (message.logEntries) { obj.log_entries = message.logEntries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.log_entries = []; + obj.log_entries = message.logEntries; } - obj.importance = message.importance; + obj.importance = message.importance === 0 ? undefined : message.importance; if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/quota_controller.ts b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/quota_controller.ts index 5398852c61..932a0e3206 100644 --- a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/quota_controller.ts +++ b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/quota_controller.ts @@ -453,9 +453,9 @@ export const AllocateQuotaRequest = { }, toAmino(message: AllocateQuotaRequest): AllocateQuotaRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.allocate_operation = message.allocateOperation ? QuotaOperation.toAmino(message.allocateOperation) : undefined; - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: AllocateQuotaRequestAminoMsg): AllocateQuotaRequest { @@ -558,8 +558,8 @@ export const QuotaOperation_LabelsEntry = { }, toAmino(message: QuotaOperation_LabelsEntry): QuotaOperation_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaOperation_LabelsEntryAminoMsg): QuotaOperation_LabelsEntry { @@ -764,15 +764,15 @@ export const QuotaOperation = { }, {}); message.quotaMetrics = object.quota_metrics?.map(e => MetricValueSet.fromAmino(e)) || []; if (object.quota_mode !== undefined && object.quota_mode !== null) { - message.quotaMode = quotaOperation_QuotaModeFromJSON(object.quota_mode); + message.quotaMode = object.quota_mode; } return message; }, toAmino(message: QuotaOperation): QuotaOperationAmino { const obj: any = {}; - obj.operation_id = message.operationId; - obj.method_name = message.methodName; - obj.consumer_id = message.consumerId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; + obj.method_name = message.methodName === "" ? undefined : message.methodName; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -782,9 +782,9 @@ export const QuotaOperation = { if (message.quotaMetrics) { obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.quota_metrics = []; + obj.quota_metrics = message.quotaMetrics; } - obj.quota_mode = message.quotaMode; + obj.quota_mode = message.quotaMode === 0 ? undefined : message.quotaMode; return obj; }, fromAminoMsg(object: QuotaOperationAminoMsg): QuotaOperation { @@ -932,18 +932,18 @@ export const AllocateQuotaResponse = { }, toAmino(message: AllocateQuotaResponse): AllocateQuotaResponseAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; if (message.allocateErrors) { obj.allocate_errors = message.allocateErrors.map(e => e ? QuotaError.toAmino(e) : undefined); } else { - obj.allocate_errors = []; + obj.allocate_errors = message.allocateErrors; } if (message.quotaMetrics) { obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e) : undefined); } else { - obj.quota_metrics = []; + obj.quota_metrics = message.quotaMetrics; } - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: AllocateQuotaResponseAminoMsg): AllocateQuotaResponse { @@ -1066,7 +1066,7 @@ export const QuotaError = { fromAmino(object: QuotaErrorAmino): QuotaError { const message = createBaseQuotaError(); if (object.code !== undefined && object.code !== null) { - message.code = quotaError_CodeFromJSON(object.code); + message.code = object.code; } if (object.subject !== undefined && object.subject !== null) { message.subject = object.subject; @@ -1081,9 +1081,9 @@ export const QuotaError = { }, toAmino(message: QuotaError): QuotaErrorAmino { const obj: any = {}; - obj.code = message.code; - obj.subject = message.subject; - obj.description = message.description; + obj.code = message.code === 0 ? undefined : message.code; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/service_controller.ts b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/service_controller.ts index 73adaa976a..cba968e113 100644 --- a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/service_controller.ts +++ b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v1/service_controller.ts @@ -395,9 +395,9 @@ export const CheckRequest = { }, toAmino(message: CheckRequest): CheckRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.operation = message.operation ? Operation.toAmino(message.operation) : undefined; - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -557,14 +557,14 @@ export const CheckResponse = { }, toAmino(message: CheckResponse): CheckResponseAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; if (message.checkErrors) { obj.check_errors = message.checkErrors.map(e => e ? CheckError.toAmino(e) : undefined); } else { - obj.check_errors = []; + obj.check_errors = message.checkErrors; } - obj.service_config_id = message.serviceConfigId; - obj.service_rollout_id = message.serviceRolloutId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId === "" ? undefined : message.serviceRolloutId; obj.check_info = message.checkInfo ? CheckResponse_CheckInfo.toAmino(message.checkInfo) : undefined; return obj; }, @@ -680,7 +680,7 @@ export const CheckResponse_CheckInfo = { if (message.unusedArguments) { obj.unused_arguments = message.unusedArguments.map(e => e); } else { - obj.unused_arguments = []; + obj.unused_arguments = message.unusedArguments; } obj.consumer_info = message.consumerInfo ? CheckResponse_ConsumerInfo.toAmino(message.consumerInfo) : undefined; return obj; @@ -797,7 +797,7 @@ export const CheckResponse_ConsumerInfo = { message.projectNumber = BigInt(object.project_number); } if (object.type !== undefined && object.type !== null) { - message.type = checkResponse_ConsumerInfo_ConsumerTypeFromJSON(object.type); + message.type = object.type; } if (object.consumer_number !== undefined && object.consumer_number !== null) { message.consumerNumber = BigInt(object.consumer_number); @@ -806,9 +806,9 @@ export const CheckResponse_ConsumerInfo = { }, 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; + obj.project_number = message.projectNumber !== BigInt(0) ? message.projectNumber.toString() : undefined; + obj.type = message.type === 0 ? undefined : message.type; + obj.consumer_number = message.consumerNumber !== BigInt(0) ? message.consumerNumber.toString() : undefined; return obj; }, fromAminoMsg(object: CheckResponse_ConsumerInfoAminoMsg): CheckResponse_ConsumerInfo { @@ -934,13 +934,13 @@ export const ReportRequest = { }, toAmino(message: ReportRequest): ReportRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; if (message.operations) { obj.operations = message.operations.map(e => e ? Operation.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } - obj.service_config_id = message.serviceConfigId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; return obj; }, fromAminoMsg(object: ReportRequestAminoMsg): ReportRequest { @@ -1069,10 +1069,10 @@ export const ReportResponse = { if (message.reportErrors) { obj.report_errors = message.reportErrors.map(e => e ? ReportResponse_ReportError.toAmino(e) : undefined); } else { - obj.report_errors = []; + obj.report_errors = message.reportErrors; } - obj.service_config_id = message.serviceConfigId; - obj.service_rollout_id = message.serviceRolloutId; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId === "" ? undefined : message.serviceRolloutId; return obj; }, fromAminoMsg(object: ReportResponseAminoMsg): ReportResponse { @@ -1178,7 +1178,7 @@ export const ReportResponse_ReportError = { }, toAmino(message: ReportResponse_ReportError): ReportResponse_ReportErrorAmino { const obj: any = {}; - obj.operation_id = message.operationId; + obj.operation_id = message.operationId === "" ? undefined : message.operationId; obj.status = message.status ? Status.toAmino(message.status) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v2/service_controller.ts b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v2/service_controller.ts index 9c8027e793..aa0391be97 100644 --- a/__fixtures__/v-next/outputv4/google/api/servicecontrol/v2/service_controller.ts +++ b/__fixtures__/v-next/outputv4/google/api/servicecontrol/v2/service_controller.ts @@ -305,15 +305,15 @@ export const CheckRequest = { }, toAmino(message: CheckRequest): CheckRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.service_config_id = message.serviceConfigId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.service_config_id = message.serviceConfigId === "" ? undefined : 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.resources = message.resources; } - obj.flags = message.flags; + obj.flags = message.flags === "" ? undefined : message.flags; return obj; }, fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { @@ -465,11 +465,11 @@ export const ResourceInfo = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; + obj.permission = message.permission === "" ? undefined : message.permission; + obj.container = message.container === "" ? undefined : message.container; + obj.location = message.location === "" ? undefined : message.location; return obj; }, fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo { @@ -572,8 +572,8 @@ export const CheckResponse_HeadersEntry = { }, toAmino(message: CheckResponse_HeadersEntry): CheckResponse_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: CheckResponse_HeadersEntryAminoMsg): CheckResponse_HeadersEntry { @@ -848,12 +848,12 @@ export const ReportRequest = { }, toAmino(message: ReportRequest): ReportRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.service_config_id = message.serviceConfigId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.service_config_id = message.serviceConfigId === "" ? undefined : message.serviceConfigId; if (message.operations) { obj.operations = message.operations.map(e => e ? AttributeContext.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/servicemanagement/v1/resources.ts b/__fixtures__/v-next/outputv4/google/api/servicemanagement/v1/resources.ts index 122986199d..7f9a439da8 100644 --- a/__fixtures__/v-next/outputv4/google/api/servicemanagement/v1/resources.ts +++ b/__fixtures__/v-next/outputv4/google/api/servicemanagement/v1/resources.ts @@ -682,8 +682,8 @@ export const ManagedService = { }, toAmino(message: ManagedService): ManagedServiceAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.producer_project_id = message.producerProjectId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; return obj; }, fromAminoMsg(object: ManagedServiceAminoMsg): ManagedService { @@ -834,14 +834,14 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } if (message.steps) { obj.steps = message.steps.map(e => e ? OperationMetadata_Step.toAmino(e) : undefined); } else { - obj.steps = []; + obj.steps = message.steps; } - obj.progress_percentage = message.progressPercentage; + obj.progress_percentage = message.progressPercentage === 0 ? undefined : message.progressPercentage; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, @@ -940,14 +940,14 @@ export const OperationMetadata_Step = { message.description = object.description; } if (object.status !== undefined && object.status !== null) { - message.status = operationMetadata_StatusFromJSON(object.status); + message.status = object.status; } return message; }, toAmino(message: OperationMetadata_Step): OperationMetadata_StepAmino { const obj: any = {}; - obj.description = message.description; - obj.status = message.status; + obj.description = message.description === "" ? undefined : message.description; + obj.status = message.status === 0 ? undefined : message.status; return obj; }, fromAminoMsg(object: OperationMetadata_StepAminoMsg): OperationMetadata_Step { @@ -1058,7 +1058,7 @@ export const Diagnostic = { message.location = object.location; } if (object.kind !== undefined && object.kind !== null) { - message.kind = diagnostic_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.message !== undefined && object.message !== null) { message.message = object.message; @@ -1067,9 +1067,9 @@ export const Diagnostic = { }, toAmino(message: Diagnostic): DiagnosticAmino { const obj: any = {}; - obj.location = message.location; - obj.kind = message.kind; - obj.message = message.message; + obj.location = message.location === "" ? undefined : message.location; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: DiagnosticAminoMsg): Diagnostic { @@ -1179,11 +1179,11 @@ export const ConfigSource = { }, toAmino(message: ConfigSource): ConfigSourceAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; if (message.files) { obj.files = message.files.map(e => e ? ConfigFile.toAmino(e) : undefined); } else { - obj.files = []; + obj.files = message.files; } return obj; }, @@ -1298,15 +1298,15 @@ export const ConfigFile = { message.fileContents = bytesFromBase64(object.file_contents); } if (object.file_type !== undefined && object.file_type !== null) { - message.fileType = configFile_FileTypeFromJSON(object.file_type); + message.fileType = object.file_type; } return message; }, toAmino(message: ConfigFile): ConfigFileAmino { const obj: any = {}; - obj.file_path = message.filePath; + obj.file_path = message.filePath === "" ? undefined : message.filePath; obj.file_contents = message.fileContents ? base64FromBytes(message.fileContents) : undefined; - obj.file_type = message.fileType; + obj.file_type = message.fileType === 0 ? undefined : message.fileType; return obj; }, fromAminoMsg(object: ConfigFileAminoMsg): ConfigFile { @@ -1394,7 +1394,7 @@ export const ConfigRef = { }, toAmino(message: ConfigRef): ConfigRefAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: ConfigRefAminoMsg): ConfigRef { @@ -1491,7 +1491,7 @@ export const ChangeReport = { if (message.configChanges) { obj.config_changes = message.configChanges.map(e => e ? ConfigChange.toAmino(e) : undefined); } else { - obj.config_changes = []; + obj.config_changes = message.configChanges; } return obj; }, @@ -1665,7 +1665,7 @@ export const Rollout = { message.createdBy = object.created_by; } if (object.status !== undefined && object.status !== null) { - message.status = rollout_RolloutStatusFromJSON(object.status); + message.status = object.status; } if (object.traffic_percent_strategy !== undefined && object.traffic_percent_strategy !== null) { message.trafficPercentStrategy = Rollout_TrafficPercentStrategy.fromAmino(object.traffic_percent_strategy); @@ -1680,13 +1680,13 @@ export const Rollout = { }, toAmino(message: Rollout): RolloutAmino { const obj: any = {}; - obj.rollout_id = message.rolloutId; + obj.rollout_id = message.rolloutId === "" ? undefined : message.rolloutId; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; - obj.created_by = message.createdBy; - obj.status = message.status; + obj.created_by = message.createdBy === "" ? undefined : message.createdBy; + obj.status = message.status === 0 ? undefined : 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; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: RolloutAminoMsg): Rollout { @@ -1789,8 +1789,8 @@ export const Rollout_TrafficPercentStrategy_PercentagesEntry = { }, toAmino(message: Rollout_TrafficPercentStrategy_PercentagesEntry): Rollout_TrafficPercentStrategy_PercentagesEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: Rollout_TrafficPercentStrategy_PercentagesEntryAminoMsg): Rollout_TrafficPercentStrategy_PercentagesEntry { diff --git a/__fixtures__/v-next/outputv4/google/api/servicemanagement/v1/servicemanager.ts b/__fixtures__/v-next/outputv4/google/api/servicemanagement/v1/servicemanager.ts index 4657b47d10..a5b9a64b21 100644 --- a/__fixtures__/v-next/outputv4/google/api/servicemanagement/v1/servicemanager.ts +++ b/__fixtures__/v-next/outputv4/google/api/servicemanagement/v1/servicemanager.ts @@ -562,10 +562,10 @@ export const ListServicesRequest = { }, 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; + obj.producer_project_id = message.producerProjectId === "" ? undefined : message.producerProjectId; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.consumer_id = message.consumerId === "" ? undefined : message.consumerId; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -678,9 +678,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? ManagedService.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -768,7 +768,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -946,7 +946,7 @@ export const DeleteServiceRequest = { }, toAmino(message: DeleteServiceRequest): DeleteServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: DeleteServiceRequestAminoMsg): DeleteServiceRequest { @@ -1034,7 +1034,7 @@ export const UndeleteServiceRequest = { }, toAmino(message: UndeleteServiceRequest): UndeleteServiceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; return obj; }, fromAminoMsg(object: UndeleteServiceRequestAminoMsg): UndeleteServiceRequest { @@ -1238,15 +1238,15 @@ export const GetServiceConfigRequest = { message.configId = object.config_id; } if (object.view !== undefined && object.view !== null) { - message.view = getServiceConfigRequest_ConfigViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetServiceConfigRequest): GetServiceConfigRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.config_id = message.configId; - obj.view = message.view; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.config_id = message.configId === "" ? undefined : message.configId; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetServiceConfigRequestAminoMsg): GetServiceConfigRequest { @@ -1366,9 +1366,9 @@ export const ListServiceConfigsRequest = { }, toAmino(message: ListServiceConfigsRequest): ListServiceConfigsRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListServiceConfigsRequestAminoMsg): ListServiceConfigsRequest { @@ -1481,9 +1481,9 @@ export const ListServiceConfigsResponse = { if (message.serviceConfigs) { obj.service_configs = message.serviceConfigs.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.service_configs = []; + obj.service_configs = message.serviceConfigs; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServiceConfigsResponseAminoMsg): ListServiceConfigsResponse { @@ -1589,7 +1589,7 @@ export const CreateServiceConfigRequest = { }, toAmino(message: CreateServiceConfigRequest): CreateServiceConfigRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.service_config = message.serviceConfig ? Service.toAmino(message.serviceConfig) : undefined; return obj; }, @@ -1712,9 +1712,9 @@ export const SubmitConfigSourceRequest = { }, toAmino(message: SubmitConfigSourceRequest): SubmitConfigSourceRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.config_source = message.configSource ? ConfigSource.toAmino(message.configSource) : undefined; - obj.validate_only = message.validateOnly; + obj.validate_only = message.validateOnly === false ? undefined : message.validateOnly; return obj; }, fromAminoMsg(object: SubmitConfigSourceRequestAminoMsg): SubmitConfigSourceRequest { @@ -1910,7 +1910,7 @@ export const CreateServiceRolloutRequest = { }, toAmino(message: CreateServiceRolloutRequest): CreateServiceRolloutRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; obj.rollout = message.rollout ? Rollout.toAmino(message.rollout) : undefined; return obj; }, @@ -2047,10 +2047,10 @@ export const ListServiceRolloutsRequest = { }, 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; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServiceRolloutsRequestAminoMsg): ListServiceRolloutsRequest { @@ -2163,9 +2163,9 @@ export const ListServiceRolloutsResponse = { if (message.rollouts) { obj.rollouts = message.rollouts.map(e => e ? Rollout.toAmino(e) : undefined); } else { - obj.rollouts = []; + obj.rollouts = message.rollouts; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServiceRolloutsResponseAminoMsg): ListServiceRolloutsResponse { @@ -2269,8 +2269,8 @@ export const GetServiceRolloutRequest = { }, toAmino(message: GetServiceRolloutRequest): GetServiceRolloutRequestAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.rollout_id = message.rolloutId; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.rollout_id = message.rolloutId === "" ? undefined : message.rolloutId; return obj; }, fromAminoMsg(object: GetServiceRolloutRequestAminoMsg): GetServiceRolloutRequest { @@ -2527,17 +2527,17 @@ export const GenerateConfigReportResponse = { }, toAmino(message: GenerateConfigReportResponse): GenerateConfigReportResponseAmino { const obj: any = {}; - obj.service_name = message.serviceName; - obj.id = message.id; + obj.service_name = message.serviceName === "" ? undefined : message.serviceName; + obj.id = message.id === "" ? undefined : message.id; if (message.changeReports) { obj.change_reports = message.changeReports.map(e => e ? ChangeReport.toAmino(e) : undefined); } else { - obj.change_reports = []; + obj.change_reports = message.changeReports; } if (message.diagnostics) { obj.diagnostics = message.diagnostics.map(e => e ? Diagnostic.toAmino(e) : undefined); } else { - obj.diagnostics = []; + obj.diagnostics = message.diagnostics; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/serviceusage/v1/resources.ts b/__fixtures__/v-next/outputv4/google/api/serviceusage/v1/resources.ts index 2ceb0f402b..024c546cb1 100644 --- a/__fixtures__/v-next/outputv4/google/api/serviceusage/v1/resources.ts +++ b/__fixtures__/v-next/outputv4/google/api/serviceusage/v1/resources.ts @@ -283,16 +283,16 @@ export const Service = { message.config = ServiceConfig.fromAmino(object.config); } if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: Service): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.parent = message.parent; + obj.name = message.name === "" ? undefined : message.name; + obj.parent = message.parent === "" ? undefined : message.parent; obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: ServiceAminoMsg): Service { @@ -552,12 +552,12 @@ export const ServiceConfig = { }, toAmino(message: ServiceConfig): ServiceConfigAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; @@ -566,12 +566,12 @@ export const ServiceConfig = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; return obj; @@ -670,7 +670,7 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/serviceusage/v1/serviceusage.ts b/__fixtures__/v-next/outputv4/google/api/serviceusage/v1/serviceusage.ts index 2c92e2c7c0..2d43ff4fd6 100644 --- a/__fixtures__/v-next/outputv4/google/api/serviceusage/v1/serviceusage.ts +++ b/__fixtures__/v-next/outputv4/google/api/serviceusage/v1/serviceusage.ts @@ -414,7 +414,7 @@ export const EnableServiceRequest = { }, toAmino(message: EnableServiceRequest): EnableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest { @@ -618,15 +618,15 @@ export const DisableServiceRequest = { message.disableDependentServices = object.disable_dependent_services; } if (object.check_if_service_has_usage !== undefined && object.check_if_service_has_usage !== null) { - message.checkIfServiceHasUsage = disableServiceRequest_CheckIfServiceHasUsageFromJSON(object.check_if_service_has_usage); + message.checkIfServiceHasUsage = object.check_if_service_has_usage; } return message; }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.disable_dependent_services = message.disableDependentServices === false ? undefined : message.disableDependentServices; + obj.check_if_service_has_usage = message.checkIfServiceHasUsage === 0 ? undefined : message.checkIfServiceHasUsage; return obj; }, fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest { @@ -804,7 +804,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -940,10 +940,10 @@ export const ListServicesRequest = { }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -1056,9 +1056,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -1168,11 +1168,11 @@ export const BatchEnableServicesRequest = { }, toAmino(message: BatchEnableServicesRequest): BatchEnableServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.serviceIds) { obj.service_ids = message.serviceIds.map(e => e); } else { - obj.service_ids = []; + obj.service_ids = message.serviceIds; } return obj; }, @@ -1292,12 +1292,12 @@ export const BatchEnableServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } if (message.failures) { obj.failures = message.failures.map(e => e ? BatchEnableServicesResponse_EnableFailure.toAmino(e) : undefined); } else { - obj.failures = []; + obj.failures = message.failures; } return obj; }, @@ -1402,8 +1402,8 @@ export const BatchEnableServicesResponse_EnableFailure = { }, toAmino(message: BatchEnableServicesResponse_EnableFailure): BatchEnableServicesResponse_EnableFailureAmino { const obj: any = {}; - obj.service_id = message.serviceId; - obj.error_message = message.errorMessage; + obj.service_id = message.serviceId === "" ? undefined : message.serviceId; + obj.error_message = message.errorMessage === "" ? undefined : message.errorMessage; return obj; }, fromAminoMsg(object: BatchEnableServicesResponse_EnableFailureAminoMsg): BatchEnableServicesResponse_EnableFailure { @@ -1513,11 +1513,11 @@ export const BatchGetServicesRequest = { }, toAmino(message: BatchGetServicesRequest): BatchGetServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.names) { obj.names = message.names.map(e => e); } else { - obj.names = []; + obj.names = message.names; } return obj; }, @@ -1615,7 +1615,7 @@ export const BatchGetServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/serviceusage/v1beta1/resources.ts b/__fixtures__/v-next/outputv4/google/api/serviceusage/v1beta1/resources.ts index 8021a8f462..c772a7d927 100644 --- a/__fixtures__/v-next/outputv4/google/api/serviceusage/v1beta1/resources.ts +++ b/__fixtures__/v-next/outputv4/google/api/serviceusage/v1beta1/resources.ts @@ -777,16 +777,16 @@ export const Service = { message.config = ServiceConfig.fromAmino(object.config); } if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: Service): ServiceAmino { const obj: any = {}; - obj.name = message.name; - obj.parent = message.parent; + obj.name = message.name === "" ? undefined : message.name; + obj.parent = message.parent === "" ? undefined : message.parent; obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: ServiceAminoMsg): Service { @@ -1046,12 +1046,12 @@ export const ServiceConfig = { }, toAmino(message: ServiceConfig): ServiceConfigAmino { const obj: any = {}; - obj.name = message.name; - obj.title = message.title; + obj.name = message.name === "" ? undefined : message.name; + obj.title = message.title === "" ? undefined : message.title; if (message.apis) { obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); } else { - obj.apis = []; + obj.apis = message.apis; } obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; @@ -1060,12 +1060,12 @@ export const ServiceConfig = { if (message.endpoints) { obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); } else { - obj.endpoints = []; + obj.endpoints = message.endpoints; } if (message.monitoredResources) { obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.monitored_resources = []; + obj.monitored_resources = message.monitoredResources; } obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; return obj; @@ -1164,7 +1164,7 @@ export const OperationMetadata = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, @@ -1345,20 +1345,20 @@ export const ConsumerQuotaMetric = { }, toAmino(message: ConsumerQuotaMetric): ConsumerQuotaMetricAmino { const obj: any = {}; - obj.name = message.name; - obj.metric = message.metric; - obj.display_name = message.displayName; + obj.name = message.name === "" ? undefined : message.name; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.display_name = message.displayName === "" ? undefined : message.displayName; if (message.consumerQuotaLimits) { obj.consumer_quota_limits = message.consumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e) : undefined); } else { - obj.consumer_quota_limits = []; + obj.consumer_quota_limits = message.consumerQuotaLimits; } if (message.descendantConsumerQuotaLimits) { obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e) : undefined); } else { - obj.descendant_consumer_quota_limits = []; + obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits; } - obj.unit = message.unit; + obj.unit = message.unit === "" ? undefined : message.unit; return obj; }, fromAminoMsg(object: ConsumerQuotaMetricAminoMsg): ConsumerQuotaMetric { @@ -1532,15 +1532,15 @@ export const ConsumerQuotaLimit = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.is_precise = message.isPrecise === false ? undefined : message.isPrecise; + obj.allows_admin_overrides = message.allowsAdminOverrides === false ? undefined : message.allowsAdminOverrides; if (message.quotaBuckets) { obj.quota_buckets = message.quotaBuckets.map(e => e ? QuotaBucket.toAmino(e) : undefined); } else { - obj.quota_buckets = []; + obj.quota_buckets = message.quotaBuckets; } return obj; }, @@ -1644,8 +1644,8 @@ export const QuotaBucket_DimensionsEntry = { }, toAmino(message: QuotaBucket_DimensionsEntry): QuotaBucket_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaBucket_DimensionsEntryAminoMsg): QuotaBucket_DimensionsEntry { @@ -1860,8 +1860,8 @@ export const QuotaBucket = { }, 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.effective_limit = message.effectiveLimit !== BigInt(0) ? message.effectiveLimit.toString() : undefined; + obj.default_limit = message.defaultLimit !== BigInt(0) ? 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; @@ -1973,8 +1973,8 @@ export const QuotaOverride_DimensionsEntry = { }, toAmino(message: QuotaOverride_DimensionsEntry): QuotaOverride_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: QuotaOverride_DimensionsEntryAminoMsg): QuotaOverride_DimensionsEntry { @@ -2181,17 +2181,17 @@ export const QuotaOverride = { }, toAmino(message: QuotaOverride): QuotaOverrideAmino { const obj: any = {}; - obj.name = message.name; - obj.override_value = message.overrideValue ? message.overrideValue.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.override_value = message.overrideValue !== BigInt(0) ? 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; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.admin_override_ancestor = message.adminOverrideAncestor === "" ? undefined : message.adminOverrideAncestor; return obj; }, fromAminoMsg(object: QuotaOverrideAminoMsg): QuotaOverride { @@ -2288,7 +2288,7 @@ export const OverrideInlineSource = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -2392,8 +2392,8 @@ export const AdminQuotaPolicy_DimensionsEntry = { }, toAmino(message: AdminQuotaPolicy_DimensionsEntry): AdminQuotaPolicy_DimensionsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AdminQuotaPolicy_DimensionsEntryAminoMsg): AdminQuotaPolicy_DimensionsEntry { @@ -2600,17 +2600,17 @@ export const AdminQuotaPolicy = { }, toAmino(message: AdminQuotaPolicy): AdminQuotaPolicyAmino { const obj: any = {}; - obj.name = message.name; - obj.policy_value = message.policyValue ? message.policyValue.toString() : undefined; + obj.name = message.name === "" ? undefined : message.name; + obj.policy_value = message.policyValue !== BigInt(0) ? 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; + obj.metric = message.metric === "" ? undefined : message.metric; + obj.unit = message.unit === "" ? undefined : message.unit; + obj.container = message.container === "" ? undefined : message.container; return obj; }, fromAminoMsg(object: AdminQuotaPolicyAminoMsg): AdminQuotaPolicy { @@ -2714,8 +2714,8 @@ export const ServiceIdentity = { }, toAmino(message: ServiceIdentity): ServiceIdentityAmino { const obj: any = {}; - obj.email = message.email; - obj.unique_id = message.uniqueId; + obj.email = message.email === "" ? undefined : message.email; + obj.unique_id = message.uniqueId === "" ? undefined : message.uniqueId; return obj; }, fromAminoMsg(object: ServiceIdentityAminoMsg): ServiceIdentity { diff --git a/__fixtures__/v-next/outputv4/google/api/serviceusage/v1beta1/serviceusage.ts b/__fixtures__/v-next/outputv4/google/api/serviceusage/v1beta1/serviceusage.ts index 8b26c0cee0..3ce3566f5d 100644 --- a/__fixtures__/v-next/outputv4/google/api/serviceusage/v1beta1/serviceusage.ts +++ b/__fixtures__/v-next/outputv4/google/api/serviceusage/v1beta1/serviceusage.ts @@ -969,7 +969,7 @@ export const EnableServiceRequest = { }, toAmino(message: EnableServiceRequest): EnableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest { @@ -1057,7 +1057,7 @@ export const DisableServiceRequest = { }, toAmino(message: DisableServiceRequest): DisableServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest { @@ -1145,7 +1145,7 @@ export const GetServiceRequest = { }, toAmino(message: GetServiceRequest): GetServiceRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { @@ -1281,10 +1281,10 @@ export const ListServicesRequest = { }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { @@ -1397,9 +1397,9 @@ export const ListServicesResponse = { if (message.services) { obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); } else { - obj.services = []; + obj.services = message.services; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { @@ -1509,11 +1509,11 @@ export const BatchEnableServicesRequest = { }, toAmino(message: BatchEnableServicesRequest): BatchEnableServicesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; if (message.serviceIds) { obj.service_ids = message.serviceIds.map(e => e); } else { - obj.service_ids = []; + obj.service_ids = message.serviceIds; } return obj; }, @@ -1644,16 +1644,16 @@ export const ListConsumerQuotaMetricsRequest = { message.pageToken = object.page_token; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, 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; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: ListConsumerQuotaMetricsRequestAminoMsg): ListConsumerQuotaMetricsRequest { @@ -1766,9 +1766,9 @@ export const ListConsumerQuotaMetricsResponse = { if (message.metrics) { obj.metrics = message.metrics.map(e => e ? ConsumerQuotaMetric.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListConsumerQuotaMetricsResponseAminoMsg): ListConsumerQuotaMetricsResponse { @@ -1866,14 +1866,14 @@ export const GetConsumerQuotaMetricRequest = { message.name = object.name; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetConsumerQuotaMetricRequest): GetConsumerQuotaMetricRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.view = message.view; + obj.name = message.name === "" ? undefined : message.name; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetConsumerQuotaMetricRequestAminoMsg): GetConsumerQuotaMetricRequest { @@ -1971,14 +1971,14 @@ export const GetConsumerQuotaLimitRequest = { message.name = object.name; } if (object.view !== undefined && object.view !== null) { - message.view = quotaViewFromJSON(object.view); + message.view = object.view; } return message; }, toAmino(message: GetConsumerQuotaLimitRequest): GetConsumerQuotaLimitRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.view = message.view; + obj.name = message.name === "" ? undefined : message.name; + obj.view = message.view === 0 ? undefined : message.view; return obj; }, fromAminoMsg(object: GetConsumerQuotaLimitRequestAminoMsg): GetConsumerQuotaLimitRequest { @@ -2126,18 +2126,18 @@ export const CreateAdminOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: CreateAdminOverrideRequest): CreateAdminOverrideRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2304,19 +2304,19 @@ export const UpdateAdminOverrideRequest = { if (object.update_mask !== undefined && object.update_mask !== null) { message.updateMask = FieldMask.fromAmino(object.update_mask); } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: UpdateAdminOverrideRequest): UpdateAdminOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2447,17 +2447,17 @@ export const DeleteAdminOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: DeleteAdminOverrideRequest): DeleteAdminOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.force = message.force; + obj.name = message.name === "" ? undefined : message.name; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -2578,9 +2578,9 @@ export const ListAdminOverridesRequest = { }, toAmino(message: ListAdminOverridesRequest): ListAdminOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListAdminOverridesRequestAminoMsg): ListAdminOverridesRequest { @@ -2693,9 +2693,9 @@ export const ListAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListAdminOverridesResponseAminoMsg): ListAdminOverridesResponse { @@ -2792,7 +2792,7 @@ export const BatchCreateAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -2941,18 +2941,18 @@ export const ImportAdminOverridesRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: ImportAdminOverridesRequest): ImportAdminOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3050,7 +3050,7 @@ export const ImportAdminOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -3267,18 +3267,18 @@ export const CreateConsumerOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: CreateConsumerOverrideRequest): CreateConsumerOverrideRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3445,19 +3445,19 @@ export const UpdateConsumerOverrideRequest = { if (object.update_mask !== undefined && object.update_mask !== null) { message.updateMask = FieldMask.fromAmino(object.update_mask); } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: UpdateConsumerOverrideRequest): UpdateConsumerOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3588,17 +3588,17 @@ export const DeleteConsumerOverrideRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: DeleteConsumerOverrideRequest): DeleteConsumerOverrideRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.force = message.force; + obj.name = message.name === "" ? undefined : message.name; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -3719,9 +3719,9 @@ export const ListConsumerOverridesRequest = { }, toAmino(message: ListConsumerOverridesRequest): ListConsumerOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListConsumerOverridesRequestAminoMsg): ListConsumerOverridesRequest { @@ -3834,9 +3834,9 @@ export const ListConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListConsumerOverridesResponseAminoMsg): ListConsumerOverridesResponse { @@ -3933,7 +3933,7 @@ export const BatchCreateConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -4082,18 +4082,18 @@ export const ImportConsumerOverridesRequest = { if (object.force !== undefined && object.force !== null) { message.force = object.force; } - message.forceOnly = object.force_only?.map(e => quotaSafetyCheckFromJSON(e)) || []; + message.forceOnly = object.force_only?.map(e => e) || []; return message; }, toAmino(message: ImportConsumerOverridesRequest): ImportConsumerOverridesRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource) : undefined; - obj.force = message.force; + obj.force = message.force === false ? undefined : message.force; if (message.forceOnly) { obj.force_only = message.forceOnly.map(e => e); } else { - obj.force_only = []; + obj.force_only = message.forceOnly; } return obj; }, @@ -4191,7 +4191,7 @@ export const ImportConsumerOverridesResponse = { if (message.overrides) { obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); } else { - obj.overrides = []; + obj.overrides = message.overrides; } return obj; }, @@ -4357,7 +4357,7 @@ export const ImportAdminQuotaPoliciesResponse = { if (message.policies) { obj.policies = message.policies.map(e => e ? AdminQuotaPolicy.toAmino(e) : undefined); } else { - obj.policies = []; + obj.policies = message.policies; } return obj; }, @@ -4718,7 +4718,7 @@ export const GenerateServiceIdentityRequest = { }, toAmino(message: GenerateServiceIdentityRequest): GenerateServiceIdentityRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; return obj; }, fromAminoMsg(object: GenerateServiceIdentityRequestAminoMsg): GenerateServiceIdentityRequest { @@ -4818,14 +4818,14 @@ export const GetServiceIdentityResponse = { message.identity = ServiceIdentity.fromAmino(object.identity); } if (object.state !== undefined && object.state !== null) { - message.state = getServiceIdentityResponse_IdentityStateFromJSON(object.state); + message.state = object.state; } return message; }, toAmino(message: GetServiceIdentityResponse): GetServiceIdentityResponseAmino { const obj: any = {}; obj.identity = message.identity ? ServiceIdentity.toAmino(message.identity) : undefined; - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; return obj; }, fromAminoMsg(object: GetServiceIdentityResponseAminoMsg): GetServiceIdentityResponse { diff --git a/__fixtures__/v-next/outputv4/google/api/source_info.ts b/__fixtures__/v-next/outputv4/google/api/source_info.ts index 6744c567c6..9e0ba28110 100644 --- a/__fixtures__/v-next/outputv4/google/api/source_info.ts +++ b/__fixtures__/v-next/outputv4/google/api/source_info.ts @@ -93,7 +93,7 @@ export const SourceInfo = { if (message.sourceFiles) { obj.source_files = message.sourceFiles.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.source_files = []; + obj.source_files = message.sourceFiles; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/api/system_parameter.ts b/__fixtures__/v-next/outputv4/google/api/system_parameter.ts index 1809103059..27679cfc2d 100644 --- a/__fixtures__/v-next/outputv4/google/api/system_parameter.ts +++ b/__fixtures__/v-next/outputv4/google/api/system_parameter.ts @@ -202,7 +202,7 @@ export const SystemParameters = { if (message.rules) { obj.rules = message.rules.map(e => e ? SystemParameterRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -313,11 +313,11 @@ export const SystemParameterRule = { }, toAmino(message: SystemParameterRule): SystemParameterRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; if (message.parameters) { obj.parameters = message.parameters.map(e => e ? SystemParameter.toAmino(e) : undefined); } else { - obj.parameters = []; + obj.parameters = message.parameters; } return obj; }, @@ -438,9 +438,9 @@ export const SystemParameter = { }, toAmino(message: SystemParameter): SystemParameterAmino { const obj: any = {}; - obj.name = message.name; - obj.http_header = message.httpHeader; - obj.url_query_parameter = message.urlQueryParameter; + obj.name = message.name === "" ? undefined : message.name; + obj.http_header = message.httpHeader === "" ? undefined : message.httpHeader; + obj.url_query_parameter = message.urlQueryParameter === "" ? undefined : message.urlQueryParameter; return obj; }, fromAminoMsg(object: SystemParameterAminoMsg): SystemParameter { diff --git a/__fixtures__/v-next/outputv4/google/api/usage.ts b/__fixtures__/v-next/outputv4/google/api/usage.ts index fb98bc774b..d855f107fa 100644 --- a/__fixtures__/v-next/outputv4/google/api/usage.ts +++ b/__fixtures__/v-next/outputv4/google/api/usage.ts @@ -243,14 +243,14 @@ export const Usage = { if (message.requirements) { obj.requirements = message.requirements.map(e => e); } else { - obj.requirements = []; + obj.requirements = message.requirements; } if (message.rules) { obj.rules = message.rules.map(e => e ? UsageRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } - obj.producer_notification_channel = message.producerNotificationChannel; + obj.producer_notification_channel = message.producerNotificationChannel === "" ? undefined : message.producerNotificationChannel; return obj; }, fromAminoMsg(object: UsageAminoMsg): Usage { @@ -370,9 +370,9 @@ export const UsageRule = { }, toAmino(message: UsageRule): UsageRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.allow_unregistered_calls = message.allowUnregisteredCalls; - obj.skip_service_control = message.skipServiceControl; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.allow_unregistered_calls = message.allowUnregisteredCalls === false ? undefined : message.allowUnregisteredCalls; + obj.skip_service_control = message.skipServiceControl === false ? undefined : message.skipServiceControl; return obj; }, fromAminoMsg(object: UsageRuleAminoMsg): UsageRule { diff --git a/__fixtures__/v-next/outputv4/google/api/visibility.ts b/__fixtures__/v-next/outputv4/google/api/visibility.ts index 9fcf20f062..c1b47c4efe 100644 --- a/__fixtures__/v-next/outputv4/google/api/visibility.ts +++ b/__fixtures__/v-next/outputv4/google/api/visibility.ts @@ -184,7 +184,7 @@ export const Visibility = { if (message.rules) { obj.rules = message.rules.map(e => e ? VisibilityRule.toAmino(e) : undefined); } else { - obj.rules = []; + obj.rules = message.rules; } return obj; }, @@ -289,8 +289,8 @@ export const VisibilityRule = { }, toAmino(message: VisibilityRule): VisibilityRuleAmino { const obj: any = {}; - obj.selector = message.selector; - obj.restriction = message.restriction; + obj.selector = message.selector === "" ? undefined : message.selector; + obj.restriction = message.restriction === "" ? undefined : message.restriction; return obj; }, fromAminoMsg(object: VisibilityRuleAminoMsg): VisibilityRule { diff --git a/__fixtures__/v-next/outputv4/google/logging/type/http_request.ts b/__fixtures__/v-next/outputv4/google/logging/type/http_request.ts index 2eabff49d4..0a812f230f 100644 --- a/__fixtures__/v-next/outputv4/google/logging/type/http_request.ts +++ b/__fixtures__/v-next/outputv4/google/logging/type/http_request.ts @@ -408,21 +408,21 @@ export const HttpRequest = { }, 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.request_method = message.requestMethod === "" ? undefined : message.requestMethod; + obj.request_url = message.requestUrl === "" ? undefined : message.requestUrl; + obj.request_size = message.requestSize !== BigInt(0) ? message.requestSize.toString() : undefined; + obj.status = message.status === 0 ? undefined : message.status; + obj.response_size = message.responseSize !== BigInt(0) ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent === "" ? undefined : message.userAgent; + obj.remote_ip = message.remoteIp === "" ? undefined : message.remoteIp; + obj.server_ip = message.serverIp === "" ? undefined : message.serverIp; + obj.referer = message.referer === "" ? undefined : 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; + obj.cache_lookup = message.cacheLookup === false ? undefined : message.cacheLookup; + obj.cache_hit = message.cacheHit === false ? undefined : message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer === false ? undefined : message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes !== BigInt(0) ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; return obj; }, fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest { diff --git a/__fixtures__/v-next/outputv4/google/logging/v2/log_entry.ts b/__fixtures__/v-next/outputv4/google/logging/v2/log_entry.ts index 8cbbe20485..8d788c0a02 100644 --- a/__fixtures__/v-next/outputv4/google/logging/v2/log_entry.ts +++ b/__fixtures__/v-next/outputv4/google/logging/v2/log_entry.ts @@ -385,8 +385,8 @@ export const LogEntry_LabelsEntry = { }, toAmino(message: LogEntry_LabelsEntry): LogEntry_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry { @@ -743,7 +743,7 @@ export const LogEntry = { message.receiveTimestamp = fromTimestamp(Timestamp.fromAmino(object.receive_timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.insert_id !== undefined && object.insert_id !== null) { message.insertId = object.insert_id; @@ -781,15 +781,15 @@ export const LogEntry = { }, toAmino(message: LogEntry): LogEntryAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : 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.text_payload = message.textPayload === null ? undefined : message.textPayload; obj.json_payload = message.jsonPayload ? Struct.toAmino(message.jsonPayload) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.receive_timestamp = message.receiveTimestamp ? Timestamp.toAmino(toTimestamp(message.receiveTimestamp)) : undefined; - obj.severity = message.severity; - obj.insert_id = message.insertId; + obj.severity = message.severity === 0 ? undefined : message.severity; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; obj.labels = {}; if (message.labels) { @@ -798,9 +798,9 @@ export const LogEntry = { }); } obj.operation = message.operation ? LogEntryOperation.toAmino(message.operation) : undefined; - obj.trace = message.trace; - obj.span_id = message.spanId; - obj.trace_sampled = message.traceSampled; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.span_id = message.spanId === "" ? undefined : message.spanId; + obj.trace_sampled = message.traceSampled === false ? undefined : message.traceSampled; obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toAmino(message.sourceLocation) : undefined; obj.split = message.split ? LogSplit.toAmino(message.split) : undefined; return obj; @@ -938,10 +938,10 @@ export const LogEntryOperation = { }, toAmino(message: LogEntryOperation): LogEntryOperationAmino { const obj: any = {}; - obj.id = message.id; - obj.producer = message.producer; - obj.first = message.first; - obj.last = message.last; + obj.id = message.id === "" ? undefined : message.id; + obj.producer = message.producer === "" ? undefined : message.producer; + obj.first = message.first === false ? undefined : message.first; + obj.last = message.last === false ? undefined : message.last; return obj; }, fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation { @@ -1063,9 +1063,9 @@ export const LogEntrySourceLocation = { }, toAmino(message: LogEntrySourceLocation): LogEntrySourceLocationAmino { const obj: any = {}; - obj.file = message.file; - obj.line = message.line ? message.line.toString() : undefined; - obj.function = message.function; + obj.file = message.file === "" ? undefined : message.file; + obj.line = message.line !== BigInt(0) ? message.line.toString() : undefined; + obj.function = message.function === "" ? undefined : message.function; return obj; }, fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation { @@ -1185,9 +1185,9 @@ export const LogSplit = { }, toAmino(message: LogSplit): LogSplitAmino { const obj: any = {}; - obj.uid = message.uid; - obj.index = message.index; - obj.total_splits = message.totalSplits; + obj.uid = message.uid === "" ? undefined : message.uid; + obj.index = message.index === 0 ? undefined : message.index; + obj.total_splits = message.totalSplits === 0 ? undefined : message.totalSplits; return obj; }, fromAminoMsg(object: LogSplitAminoMsg): LogSplit { diff --git a/__fixtures__/v-next/outputv4/google/logging/v2/logging.ts b/__fixtures__/v-next/outputv4/google/logging/v2/logging.ts index ba3ba50128..fb3584aab8 100644 --- a/__fixtures__/v-next/outputv4/google/logging/v2/logging.ts +++ b/__fixtures__/v-next/outputv4/google/logging/v2/logging.ts @@ -612,7 +612,7 @@ export const DeleteLogRequest = { }, toAmino(message: DeleteLogRequest): DeleteLogRequestAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; return obj; }, fromAminoMsg(object: DeleteLogRequestAminoMsg): DeleteLogRequest { @@ -715,8 +715,8 @@ export const WriteLogEntriesRequest_LabelsEntry = { }, toAmino(message: WriteLogEntriesRequest_LabelsEntry): WriteLogEntriesRequest_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: WriteLogEntriesRequest_LabelsEntryAminoMsg): WriteLogEntriesRequest_LabelsEntry { @@ -929,7 +929,7 @@ export const WriteLogEntriesRequest = { }, toAmino(message: WriteLogEntriesRequest): WriteLogEntriesRequestAmino { const obj: any = {}; - obj.log_name = message.logName; + obj.log_name = message.logName === "" ? undefined : message.logName; obj.resource = message.resource ? MonitoredResource.toAmino(message.resource) : undefined; obj.labels = {}; if (message.labels) { @@ -940,10 +940,10 @@ export const WriteLogEntriesRequest = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } - obj.partial_success = message.partialSuccess; - obj.dry_run = message.dryRun; + obj.partial_success = message.partialSuccess === false ? undefined : message.partialSuccess; + obj.dry_run = message.dryRun === false ? undefined : message.dryRun; return obj; }, fromAminoMsg(object: WriteLogEntriesRequestAminoMsg): WriteLogEntriesRequest { @@ -1116,7 +1116,7 @@ export const WriteLogEntriesPartialErrors_LogEntryErrorsEntry = { }, toAmino(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntry): WriteLogEntriesPartialErrors_LogEntryErrorsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === 0 ? undefined : message.key; obj.value = message.value ? Status.toAmino(message.value) : undefined; return obj; }, @@ -1408,12 +1408,12 @@ export const ListLogEntriesRequest = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } - obj.filter = message.filter; - obj.order_by = message.orderBy; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.order_by = message.orderBy === "" ? undefined : message.orderBy; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListLogEntriesRequestAminoMsg): ListLogEntriesRequest { @@ -1526,9 +1526,9 @@ export const ListLogEntriesResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogEntriesResponseAminoMsg): ListLogEntriesResponse { @@ -1632,8 +1632,8 @@ export const ListMonitoredResourceDescriptorsRequest = { }, toAmino(message: ListMonitoredResourceDescriptorsRequest): ListMonitoredResourceDescriptorsRequestAmino { const obj: any = {}; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListMonitoredResourceDescriptorsRequestAminoMsg): ListMonitoredResourceDescriptorsRequest { @@ -1746,9 +1746,9 @@ export const ListMonitoredResourceDescriptorsResponse = { if (message.resourceDescriptors) { obj.resource_descriptors = message.resourceDescriptors.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); } else { - obj.resource_descriptors = []; + obj.resource_descriptors = message.resourceDescriptors; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListMonitoredResourceDescriptorsResponseAminoMsg): ListMonitoredResourceDescriptorsResponse { @@ -1890,13 +1890,13 @@ export const ListLogsRequest = { }, toAmino(message: ListLogsRequest): ListLogsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_size = message.pageSize; - obj.page_token = message.pageToken; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } return obj; }, @@ -2010,9 +2010,9 @@ export const ListLogsResponse = { if (message.logNames) { obj.log_names = message.logNames.map(e => e); } else { - obj.log_names = []; + obj.log_names = message.logNames; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogsResponseAminoMsg): ListLogsResponse { @@ -2143,9 +2143,9 @@ export const TailLogEntriesRequest = { if (message.resourceNames) { obj.resource_names = message.resourceNames.map(e => e); } else { - obj.resource_names = []; + obj.resource_names = message.resourceNames; } - obj.filter = message.filter; + obj.filter = message.filter === "" ? undefined : message.filter; obj.buffer_window = message.bufferWindow ? Duration.toAmino(message.bufferWindow) : undefined; return obj; }, @@ -2265,12 +2265,12 @@ export const TailLogEntriesResponse = { if (message.entries) { obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } if (message.suppressionInfo) { obj.suppression_info = message.suppressionInfo.map(e => e ? TailLogEntriesResponse_SuppressionInfo.toAmino(e) : undefined); } else { - obj.suppression_info = []; + obj.suppression_info = message.suppressionInfo; } return obj; }, @@ -2366,7 +2366,7 @@ export const TailLogEntriesResponse_SuppressionInfo = { fromAmino(object: TailLogEntriesResponse_SuppressionInfoAmino): TailLogEntriesResponse_SuppressionInfo { const message = createBaseTailLogEntriesResponse_SuppressionInfo(); if (object.reason !== undefined && object.reason !== null) { - message.reason = tailLogEntriesResponse_SuppressionInfo_ReasonFromJSON(object.reason); + message.reason = object.reason; } if (object.suppressed_count !== undefined && object.suppressed_count !== null) { message.suppressedCount = object.suppressed_count; @@ -2375,8 +2375,8 @@ export const TailLogEntriesResponse_SuppressionInfo = { }, toAmino(message: TailLogEntriesResponse_SuppressionInfo): TailLogEntriesResponse_SuppressionInfoAmino { const obj: any = {}; - obj.reason = message.reason; - obj.suppressed_count = message.suppressedCount; + obj.reason = message.reason === 0 ? undefined : message.reason; + obj.suppressed_count = message.suppressedCount === 0 ? undefined : message.suppressedCount; return obj; }, fromAminoMsg(object: TailLogEntriesResponse_SuppressionInfoAminoMsg): TailLogEntriesResponse_SuppressionInfo { diff --git a/__fixtures__/v-next/outputv4/google/logging/v2/logging_config.ts b/__fixtures__/v-next/outputv4/google/logging/v2/logging_config.ts index 38e82517cc..c69b11ff68 100644 --- a/__fixtures__/v-next/outputv4/google/logging/v2/logging_config.ts +++ b/__fixtures__/v-next/outputv4/google/logging/v2/logging_config.ts @@ -1936,7 +1936,7 @@ export const LogBucket = { message.locked = object.locked; } if (object.lifecycle_state !== undefined && object.lifecycle_state !== null) { - message.lifecycleState = lifecycleStateFromJSON(object.lifecycle_state); + message.lifecycleState = object.lifecycle_state; } message.restrictedFields = object.restricted_fields?.map(e => e) || []; if (object.cmek_settings !== undefined && object.cmek_settings !== null) { @@ -1946,17 +1946,17 @@ export const LogBucket = { }, toAmino(message: LogBucket): LogBucketAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.retention_days = message.retentionDays; - obj.locked = message.locked; - obj.lifecycle_state = message.lifecycleState; + obj.retention_days = message.retentionDays === 0 ? undefined : message.retentionDays; + obj.locked = message.locked === false ? undefined : message.locked; + obj.lifecycle_state = message.lifecycleState === 0 ? undefined : message.lifecycleState; if (message.restrictedFields) { obj.restricted_fields = message.restrictedFields.map(e => e); } else { - obj.restricted_fields = []; + obj.restricted_fields = message.restrictedFields; } obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined; return obj; @@ -2110,11 +2110,11 @@ export const LogView = { }, toAmino(message: LogView): LogViewAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.filter = message.filter; + obj.filter = message.filter === "" ? undefined : message.filter; return obj; }, fromAminoMsg(object: LogViewAminoMsg): LogView { @@ -2365,7 +2365,7 @@ export const LogSink = { } message.exclusions = object.exclusions?.map(e => LogExclusion.fromAmino(e)) || []; if (object.output_version_format !== undefined && object.output_version_format !== null) { - message.outputVersionFormat = logSink_VersionFormatFromJSON(object.output_version_format); + message.outputVersionFormat = object.output_version_format; } if (object.writer_identity !== undefined && object.writer_identity !== null) { message.writerIdentity = object.writer_identity; @@ -2386,19 +2386,19 @@ export const LogSink = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.destination = message.destination === "" ? undefined : message.destination; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.description = message.description === "" ? undefined : message.description; + obj.disabled = message.disabled === false ? undefined : message.disabled; if (message.exclusions) { obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e) : undefined); } else { - obj.exclusions = []; + obj.exclusions = message.exclusions; } - obj.output_version_format = message.outputVersionFormat; - obj.writer_identity = message.writerIdentity; - obj.include_children = message.includeChildren; + obj.output_version_format = message.outputVersionFormat === 0 ? undefined : message.outputVersionFormat; + obj.writer_identity = message.writerIdentity === "" ? undefined : message.writerIdentity; + obj.include_children = message.includeChildren === false ? undefined : message.includeChildren; obj.bigquery_options = message.bigqueryOptions ? BigQueryOptions.toAmino(message.bigqueryOptions) : undefined; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; @@ -2505,8 +2505,8 @@ export const BigQueryOptions = { }, toAmino(message: BigQueryOptions): BigQueryOptionsAmino { const obj: any = {}; - obj.use_partitioned_tables = message.usePartitionedTables; - obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning; + obj.use_partitioned_tables = message.usePartitionedTables === false ? undefined : message.usePartitionedTables; + obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning === false ? undefined : message.usesTimestampColumnPartitioning; return obj; }, fromAminoMsg(object: BigQueryOptionsAminoMsg): BigQueryOptions { @@ -2626,9 +2626,9 @@ export const ListBucketsRequest = { }, toAmino(message: ListBucketsRequest): ListBucketsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListBucketsRequestAminoMsg): ListBucketsRequest { @@ -2741,9 +2741,9 @@ export const ListBucketsResponse = { if (message.buckets) { obj.buckets = message.buckets.map(e => e ? LogBucket.toAmino(e) : undefined); } else { - obj.buckets = []; + obj.buckets = message.buckets; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListBucketsResponseAminoMsg): ListBucketsResponse { @@ -2865,8 +2865,8 @@ export const CreateBucketRequest = { }, toAmino(message: CreateBucketRequest): CreateBucketRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.bucket_id = message.bucketId; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.bucket_id = message.bucketId === "" ? undefined : message.bucketId; obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined; return obj; }, @@ -2991,7 +2991,7 @@ export const UpdateBucketRequest = { }, toAmino(message: UpdateBucketRequest): UpdateBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -3081,7 +3081,7 @@ export const GetBucketRequest = { }, toAmino(message: GetBucketRequest): GetBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetBucketRequestAminoMsg): GetBucketRequest { @@ -3169,7 +3169,7 @@ export const DeleteBucketRequest = { }, toAmino(message: DeleteBucketRequest): DeleteBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteBucketRequestAminoMsg): DeleteBucketRequest { @@ -3257,7 +3257,7 @@ export const UndeleteBucketRequest = { }, toAmino(message: UndeleteBucketRequest): UndeleteBucketRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: UndeleteBucketRequestAminoMsg): UndeleteBucketRequest { @@ -3377,9 +3377,9 @@ export const ListViewsRequest = { }, toAmino(message: ListViewsRequest): ListViewsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListViewsRequestAminoMsg): ListViewsRequest { @@ -3492,9 +3492,9 @@ export const ListViewsResponse = { if (message.views) { obj.views = message.views.map(e => e ? LogView.toAmino(e) : undefined); } else { - obj.views = []; + obj.views = message.views; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListViewsResponseAminoMsg): ListViewsResponse { @@ -3616,8 +3616,8 @@ export const CreateViewRequest = { }, toAmino(message: CreateViewRequest): CreateViewRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.view_id = message.viewId; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.view_id = message.viewId === "" ? undefined : message.viewId; obj.view = message.view ? LogView.toAmino(message.view) : undefined; return obj; }, @@ -3742,7 +3742,7 @@ export const UpdateViewRequest = { }, toAmino(message: UpdateViewRequest): UpdateViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.view = message.view ? LogView.toAmino(message.view) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -3832,7 +3832,7 @@ export const GetViewRequest = { }, toAmino(message: GetViewRequest): GetViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetViewRequestAminoMsg): GetViewRequest { @@ -3920,7 +3920,7 @@ export const DeleteViewRequest = { }, toAmino(message: DeleteViewRequest): DeleteViewRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteViewRequestAminoMsg): DeleteViewRequest { @@ -4040,9 +4040,9 @@ export const ListSinksRequest = { }, toAmino(message: ListSinksRequest): ListSinksRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListSinksRequestAminoMsg): ListSinksRequest { @@ -4155,9 +4155,9 @@ export const ListSinksResponse = { if (message.sinks) { obj.sinks = message.sinks.map(e => e ? LogSink.toAmino(e) : undefined); } else { - obj.sinks = []; + obj.sinks = message.sinks; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListSinksResponseAminoMsg): ListSinksResponse { @@ -4245,7 +4245,7 @@ export const GetSinkRequest = { }, toAmino(message: GetSinkRequest): GetSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; return obj; }, fromAminoMsg(object: GetSinkRequestAminoMsg): GetSinkRequest { @@ -4367,9 +4367,9 @@ export const CreateSinkRequest = { }, toAmino(message: CreateSinkRequest): CreateSinkRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined; - obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.unique_writer_identity = message.uniqueWriterIdentity === false ? undefined : message.uniqueWriterIdentity; return obj; }, fromAminoMsg(object: CreateSinkRequestAminoMsg): CreateSinkRequest { @@ -4509,9 +4509,9 @@ export const UpdateSinkRequest = { }, toAmino(message: UpdateSinkRequest): UpdateSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined; - obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.unique_writer_identity = message.uniqueWriterIdentity === false ? undefined : message.uniqueWriterIdentity; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; }, @@ -4600,7 +4600,7 @@ export const DeleteSinkRequest = { }, toAmino(message: DeleteSinkRequest): DeleteSinkRequestAmino { const obj: any = {}; - obj.sink_name = message.sinkName; + obj.sink_name = message.sinkName === "" ? undefined : message.sinkName; return obj; }, fromAminoMsg(object: DeleteSinkRequestAminoMsg): DeleteSinkRequest { @@ -4768,10 +4768,10 @@ export const LogExclusion = { }, toAmino(message: LogExclusion): LogExclusionAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; - obj.filter = message.filter; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.disabled = message.disabled === false ? undefined : message.disabled; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; return obj; @@ -4893,9 +4893,9 @@ export const ListExclusionsRequest = { }, toAmino(message: ListExclusionsRequest): ListExclusionsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListExclusionsRequestAminoMsg): ListExclusionsRequest { @@ -5008,9 +5008,9 @@ export const ListExclusionsResponse = { if (message.exclusions) { obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e) : undefined); } else { - obj.exclusions = []; + obj.exclusions = message.exclusions; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListExclusionsResponseAminoMsg): ListExclusionsResponse { @@ -5098,7 +5098,7 @@ export const GetExclusionRequest = { }, toAmino(message: GetExclusionRequest): GetExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetExclusionRequestAminoMsg): GetExclusionRequest { @@ -5204,7 +5204,7 @@ export const CreateExclusionRequest = { }, toAmino(message: CreateExclusionRequest): CreateExclusionRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined; return obj; }, @@ -5329,7 +5329,7 @@ export const UpdateExclusionRequest = { }, toAmino(message: UpdateExclusionRequest): UpdateExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -5419,7 +5419,7 @@ export const DeleteExclusionRequest = { }, toAmino(message: DeleteExclusionRequest): DeleteExclusionRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteExclusionRequestAminoMsg): DeleteExclusionRequest { @@ -5507,7 +5507,7 @@ export const GetCmekSettingsRequest = { }, toAmino(message: GetCmekSettingsRequest): GetCmekSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetCmekSettingsRequestAminoMsg): GetCmekSettingsRequest { @@ -5631,7 +5631,7 @@ export const UpdateCmekSettingsRequest = { }, toAmino(message: UpdateCmekSettingsRequest): UpdateCmekSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -5753,9 +5753,9 @@ export const CmekSettings = { }, toAmino(message: CmekSettings): CmekSettingsAmino { const obj: any = {}; - obj.name = message.name; - obj.kms_key_name = message.kmsKeyName; - obj.service_account_id = message.serviceAccountId; + obj.name = message.name === "" ? undefined : message.name; + obj.kms_key_name = message.kmsKeyName === "" ? undefined : message.kmsKeyName; + obj.service_account_id = message.serviceAccountId === "" ? undefined : message.serviceAccountId; return obj; }, fromAminoMsg(object: CmekSettingsAminoMsg): CmekSettings { @@ -5843,7 +5843,7 @@ export const GetSettingsRequest = { }, toAmino(message: GetSettingsRequest): GetSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetSettingsRequestAminoMsg): GetSettingsRequest { @@ -5967,7 +5967,7 @@ export const UpdateSettingsRequest = { }, toAmino(message: UpdateSettingsRequest): UpdateSettingsRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.settings = message.settings ? Settings.toAmino(message.settings) : undefined; obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; return obj; @@ -6121,11 +6121,11 @@ export const Settings = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.kms_key_name = message.kmsKeyName === "" ? undefined : message.kmsKeyName; + obj.kms_service_account_id = message.kmsServiceAccountId === "" ? undefined : message.kmsServiceAccountId; + obj.storage_location = message.storageLocation === "" ? undefined : message.storageLocation; + obj.disable_default_sink = message.disableDefaultSink === false ? undefined : message.disableDefaultSink; return obj; }, fromAminoMsg(object: SettingsAminoMsg): Settings { @@ -6245,9 +6245,9 @@ export const CopyLogEntriesRequest = { }, toAmino(message: CopyLogEntriesRequest): CopyLogEntriesRequestAmino { const obj: any = {}; - obj.name = message.name; - obj.filter = message.filter; - obj.destination = message.destination; + obj.name = message.name === "" ? undefined : message.name; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.destination = message.destination === "" ? undefined : message.destination; return obj; }, fromAminoMsg(object: CopyLogEntriesRequestAminoMsg): CopyLogEntriesRequest { @@ -6415,7 +6415,7 @@ export const CopyLogEntriesMetadata = { message.endTime = fromTimestamp(Timestamp.fromAmino(object.end_time)); } if (object.state !== undefined && object.state !== null) { - message.state = operationStateFromJSON(object.state); + message.state = object.state; } if (object.cancellation_requested !== undefined && object.cancellation_requested !== null) { message.cancellationRequested = object.cancellation_requested; @@ -6435,11 +6435,11 @@ export const CopyLogEntriesMetadata = { const obj: any = {}; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; - obj.state = message.state; - obj.cancellation_requested = message.cancellationRequested; + obj.state = message.state === 0 ? undefined : message.state; + obj.cancellation_requested = message.cancellationRequested === false ? undefined : message.cancellationRequested; obj.request = message.request ? CopyLogEntriesRequest.toAmino(message.request) : undefined; - obj.progress = message.progress; - obj.writer_identity = message.writerIdentity; + obj.progress = message.progress === 0 ? undefined : message.progress; + obj.writer_identity = message.writerIdentity === "" ? undefined : message.writerIdentity; return obj; }, fromAminoMsg(object: CopyLogEntriesMetadataAminoMsg): CopyLogEntriesMetadata { @@ -6529,7 +6529,7 @@ export const CopyLogEntriesResponse = { }, toAmino(message: CopyLogEntriesResponse): CopyLogEntriesResponseAmino { const obj: any = {}; - obj.log_entries_copied_count = message.logEntriesCopiedCount ? message.logEntriesCopiedCount.toString() : undefined; + obj.log_entries_copied_count = message.logEntriesCopiedCount !== BigInt(0) ? message.logEntriesCopiedCount.toString() : undefined; return obj; }, fromAminoMsg(object: CopyLogEntriesResponseAminoMsg): CopyLogEntriesResponse { diff --git a/__fixtures__/v-next/outputv4/google/logging/v2/logging_metrics.ts b/__fixtures__/v-next/outputv4/google/logging/v2/logging_metrics.ts index 47dd67034b..740e2beef9 100644 --- a/__fixtures__/v-next/outputv4/google/logging/v2/logging_metrics.ts +++ b/__fixtures__/v-next/outputv4/google/logging/v2/logging_metrics.ts @@ -434,8 +434,8 @@ export const LogMetric_LabelExtractorsEntry = { }, toAmino(message: LogMetric_LabelExtractorsEntry): LogMetric_LabelExtractorsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: LogMetric_LabelExtractorsEntryAminoMsg): LogMetric_LabelExtractorsEntry { @@ -718,18 +718,18 @@ export const LogMetric = { message.updateTime = fromTimestamp(Timestamp.fromAmino(object.update_time)); } if (object.version !== undefined && object.version !== null) { - message.version = logMetric_ApiVersionFromJSON(object.version); + message.version = object.version; } return message; }, toAmino(message: LogMetric): LogMetricAmino { const obj: any = {}; - obj.name = message.name; - obj.description = message.description; - obj.filter = message.filter; - obj.disabled = message.disabled; + obj.name = message.name === "" ? undefined : message.name; + obj.description = message.description === "" ? undefined : message.description; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.disabled = message.disabled === false ? undefined : message.disabled; obj.metric_descriptor = message.metricDescriptor ? MetricDescriptor.toAmino(message.metricDescriptor) : undefined; - obj.value_extractor = message.valueExtractor; + obj.value_extractor = message.valueExtractor === "" ? undefined : message.valueExtractor; obj.label_extractors = {}; if (message.labelExtractors) { Object.entries(message.labelExtractors).forEach(([k, v]) => { @@ -739,7 +739,7 @@ export const LogMetric = { obj.bucket_options = message.bucketOptions ? Distribution_BucketOptions.toAmino(message.bucketOptions) : undefined; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; - obj.version = message.version; + obj.version = message.version === 0 ? undefined : message.version; return obj; }, fromAminoMsg(object: LogMetricAminoMsg): LogMetric { @@ -859,9 +859,9 @@ export const ListLogMetricsRequest = { }, toAmino(message: ListLogMetricsRequest): ListLogMetricsRequestAmino { const obj: any = {}; - obj.parent = message.parent; - obj.page_token = message.pageToken; - obj.page_size = message.pageSize; + obj.parent = message.parent === "" ? undefined : message.parent; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; return obj; }, fromAminoMsg(object: ListLogMetricsRequestAminoMsg): ListLogMetricsRequest { @@ -974,9 +974,9 @@ export const ListLogMetricsResponse = { if (message.metrics) { obj.metrics = message.metrics.map(e => e ? LogMetric.toAmino(e) : undefined); } else { - obj.metrics = []; + obj.metrics = message.metrics; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListLogMetricsResponseAminoMsg): ListLogMetricsResponse { @@ -1064,7 +1064,7 @@ export const GetLogMetricRequest = { }, toAmino(message: GetLogMetricRequest): GetLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; return obj; }, fromAminoMsg(object: GetLogMetricRequestAminoMsg): GetLogMetricRequest { @@ -1170,7 +1170,7 @@ export const CreateLogMetricRequest = { }, toAmino(message: CreateLogMetricRequest): CreateLogMetricRequestAmino { const obj: any = {}; - obj.parent = message.parent; + obj.parent = message.parent === "" ? undefined : message.parent; obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined; return obj; }, @@ -1277,7 +1277,7 @@ export const UpdateLogMetricRequest = { }, toAmino(message: UpdateLogMetricRequest): UpdateLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined; return obj; }, @@ -1366,7 +1366,7 @@ export const DeleteLogMetricRequest = { }, toAmino(message: DeleteLogMetricRequest): DeleteLogMetricRequestAmino { const obj: any = {}; - obj.metric_name = message.metricName; + obj.metric_name = message.metricName === "" ? undefined : message.metricName; return obj; }, fromAminoMsg(object: DeleteLogMetricRequestAminoMsg): DeleteLogMetricRequest { diff --git a/__fixtures__/v-next/outputv4/google/longrunning/operations.ts b/__fixtures__/v-next/outputv4/google/longrunning/operations.ts index 20133f6772..92d219685d 100644 --- a/__fixtures__/v-next/outputv4/google/longrunning/operations.ts +++ b/__fixtures__/v-next/outputv4/google/longrunning/operations.ts @@ -350,9 +350,9 @@ export const Operation = { }, toAmino(message: Operation): OperationAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.metadata = message.metadata ? Any.toAmino(message.metadata) : undefined; - obj.done = message.done; + obj.done = message.done === false ? undefined : message.done; obj.error = message.error ? Status.toAmino(message.error) : undefined; obj.response = message.response ? Any.toAmino(message.response) : undefined; return obj; @@ -442,7 +442,7 @@ export const GetOperationRequest = { }, toAmino(message: GetOperationRequest): GetOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: GetOperationRequestAminoMsg): GetOperationRequest { @@ -578,10 +578,10 @@ export const ListOperationsRequest = { }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.filter = message.filter === "" ? undefined : message.filter; + obj.page_size = message.pageSize === 0 ? undefined : message.pageSize; + obj.page_token = message.pageToken === "" ? undefined : message.pageToken; return obj; }, fromAminoMsg(object: ListOperationsRequestAminoMsg): ListOperationsRequest { @@ -694,9 +694,9 @@ export const ListOperationsResponse = { if (message.operations) { obj.operations = message.operations.map(e => e ? Operation.toAmino(e) : undefined); } else { - obj.operations = []; + obj.operations = message.operations; } - obj.next_page_token = message.nextPageToken; + obj.next_page_token = message.nextPageToken === "" ? undefined : message.nextPageToken; return obj; }, fromAminoMsg(object: ListOperationsResponseAminoMsg): ListOperationsResponse { @@ -784,7 +784,7 @@ export const CancelOperationRequest = { }, toAmino(message: CancelOperationRequest): CancelOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: CancelOperationRequestAminoMsg): CancelOperationRequest { @@ -872,7 +872,7 @@ export const DeleteOperationRequest = { }, toAmino(message: DeleteOperationRequest): DeleteOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; return obj; }, fromAminoMsg(object: DeleteOperationRequestAminoMsg): DeleteOperationRequest { @@ -978,7 +978,7 @@ export const WaitOperationRequest = { }, toAmino(message: WaitOperationRequest): WaitOperationRequestAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timeout = message.timeout ? Duration.toAmino(message.timeout) : undefined; return obj; }, @@ -1083,8 +1083,8 @@ export const OperationInfo = { }, toAmino(message: OperationInfo): OperationInfoAmino { const obj: any = {}; - obj.response_type = message.responseType; - obj.metadata_type = message.metadataType; + obj.response_type = message.responseType === "" ? undefined : message.responseType; + obj.metadata_type = message.metadataType === "" ? undefined : message.metadataType; return obj; }, fromAminoMsg(object: OperationInfoAminoMsg): OperationInfo { diff --git a/__fixtures__/v-next/outputv4/google/protobuf/api.ts b/__fixtures__/v-next/outputv4/google/protobuf/api.ts index 6b4b885baa..f3fb5a648e 100644 --- a/__fixtures__/v-next/outputv4/google/protobuf/api.ts +++ b/__fixtures__/v-next/outputv4/google/protobuf/api.ts @@ -467,31 +467,31 @@ export const Api = { } message.mixins = object.mixins?.map(e => Mixin.fromAmino(e)) || []; if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Api): ApiAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.methods) { obj.methods = message.methods.map(e => e ? Method.toAmino(e) : undefined); } else { - obj.methods = []; + obj.methods = message.methods; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.version = message.version; + obj.version = message.version === "" ? undefined : 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.mixins = message.mixins; } - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: ApiAminoMsg): Api { @@ -675,23 +675,23 @@ export const Method = { } message.options = object.options?.map(e => Option.fromAmino(e)) || []; if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, 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; + obj.name = message.name === "" ? undefined : message.name; + obj.request_type_url = message.requestTypeUrl === "" ? undefined : message.requestTypeUrl; + obj.request_streaming = message.requestStreaming === false ? undefined : message.requestStreaming; + obj.response_type_url = message.responseTypeUrl === "" ? undefined : message.responseTypeUrl; + obj.response_streaming = message.responseStreaming === false ? undefined : message.responseStreaming; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: MethodAminoMsg): Method { @@ -795,8 +795,8 @@ export const Mixin = { }, toAmino(message: Mixin): MixinAmino { const obj: any = {}; - obj.name = message.name; - obj.root = message.root; + obj.name = message.name === "" ? undefined : message.name; + obj.root = message.root === "" ? undefined : message.root; return obj; }, fromAminoMsg(object: MixinAminoMsg): Mixin { diff --git a/__fixtures__/v-next/outputv4/google/protobuf/compiler/plugin.ts b/__fixtures__/v-next/outputv4/google/protobuf/compiler/plugin.ts index 2d6c02af1d..d9afa67558 100644 --- a/__fixtures__/v-next/outputv4/google/protobuf/compiler/plugin.ts +++ b/__fixtures__/v-next/outputv4/google/protobuf/compiler/plugin.ts @@ -275,10 +275,10 @@ export const Version = { }, toAmino(message: Version): VersionAmino { const obj: any = {}; - obj.major = message.major; - obj.minor = message.minor; - obj.patch = message.patch; - obj.suffix = message.suffix; + obj.major = message.major === 0 ? undefined : message.major; + obj.minor = message.minor === 0 ? undefined : message.minor; + obj.patch = message.patch === 0 ? undefined : message.patch; + obj.suffix = message.suffix === "" ? undefined : message.suffix; return obj; }, fromAminoMsg(object: VersionAminoMsg): Version { @@ -431,13 +431,13 @@ export const CodeGeneratorRequest = { if (message.fileToGenerate) { obj.file_to_generate = message.fileToGenerate.map(e => e); } else { - obj.file_to_generate = []; + obj.file_to_generate = message.fileToGenerate; } - obj.parameter = message.parameter; + obj.parameter = message.parameter === "" ? undefined : message.parameter; if (message.protoFile) { obj.proto_file = message.protoFile.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.proto_file = []; + obj.proto_file = message.protoFile; } obj.compiler_version = message.compilerVersion ? Version.toAmino(message.compilerVersion) : undefined; return obj; @@ -549,11 +549,11 @@ export const CodeGeneratorResponse = { }, toAmino(message: CodeGeneratorResponse): CodeGeneratorResponseAmino { const obj: any = {}; - obj.error = message.error; + obj.error = message.error === "" ? undefined : message.error; if (message.file) { obj.file = message.file.map(e => e ? CodeGeneratorResponse_File.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -674,9 +674,9 @@ export const CodeGeneratorResponse_File = { }, toAmino(message: CodeGeneratorResponse_File): CodeGeneratorResponse_FileAmino { const obj: any = {}; - obj.name = message.name; - obj.insertion_point = message.insertionPoint; - obj.content = message.content; + obj.name = message.name === "" ? undefined : message.name; + obj.insertion_point = message.insertionPoint === "" ? undefined : message.insertionPoint; + obj.content = message.content === "" ? undefined : message.content; return obj; }, fromAminoMsg(object: CodeGeneratorResponse_FileAminoMsg): CodeGeneratorResponse_File { diff --git a/__fixtures__/v-next/outputv4/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputv4/google/protobuf/descriptor.ts index 3963cde0e8..0e1d99dacf 100644 --- a/__fixtures__/v-next/outputv4/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputv4/google/protobuf/descriptor.ts @@ -1464,7 +1464,7 @@ export const FileDescriptorSet = { if (message.file) { obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); } else { - obj.file = []; + obj.file = message.file; } return obj; }, @@ -1793,46 +1793,46 @@ export const FileDescriptorProto = { }, toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.package = message.package; + obj.name = message.name === "" ? undefined : message.name; + obj.package = message.package === "" ? undefined : message.package; if (message.dependency) { obj.dependency = message.dependency.map(e => e); } else { - obj.dependency = []; + obj.dependency = message.dependency; } if (message.publicDependency) { obj.public_dependency = message.publicDependency.map(e => e); } else { - obj.public_dependency = []; + obj.public_dependency = message.publicDependency; } if (message.weakDependency) { obj.weak_dependency = message.weakDependency.map(e => e); } else { - obj.weak_dependency = []; + obj.weak_dependency = message.weakDependency; } if (message.messageType) { obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.message_type = []; + obj.message_type = message.messageType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.service) { obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); } else { - obj.service = []; + obj.service = message.service; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.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; + obj.syntax = message.syntax === "" ? undefined : message.syntax; return obj; }, fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { @@ -2114,47 +2114,47 @@ export const DescriptorProto = { }, toAmino(message: DescriptorProto): DescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.field) { obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.field = []; + obj.field = message.field; } if (message.extension) { obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); } else { - obj.extension = []; + obj.extension = message.extension; } if (message.nestedType) { obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); } else { - obj.nested_type = []; + obj.nested_type = message.nestedType; } if (message.enumType) { obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); } else { - obj.enum_type = []; + obj.enum_type = message.enumType; } if (message.extensionRange) { obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); } else { - obj.extension_range = []; + obj.extension_range = message.extensionRange; } if (message.oneofDecl) { obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); } else { - obj.oneof_decl = []; + obj.oneof_decl = message.oneofDecl; } 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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -2277,8 +2277,8 @@ export const DescriptorProto_ExtensionRange = { }, toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; return obj; }, @@ -2383,8 +2383,8 @@ export const DescriptorProto_ReservedRange = { }, toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { @@ -2481,7 +2481,7 @@ export const ExtensionRangeOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -2689,10 +2689,10 @@ export const FieldDescriptorProto = { message.number = object.number; } if (object.label !== undefined && object.label !== null) { - message.label = fieldDescriptorProto_LabelFromJSON(object.label); + message.label = object.label; } if (object.type !== undefined && object.type !== null) { - message.type = fieldDescriptorProto_TypeFromJSON(object.type); + message.type = object.type; } if (object.type_name !== undefined && object.type_name !== null) { message.typeName = object.type_name; @@ -2716,15 +2716,15 @@ export const FieldDescriptorProto = { }, 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.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; + obj.label = message.label === 1 ? undefined : message.label; + obj.type = message.type === 1 ? undefined : message.type; + obj.type_name = message.typeName === "" ? undefined : message.typeName; + obj.extendee = message.extendee === "" ? undefined : message.extendee; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; return obj; }, @@ -2831,7 +2831,7 @@ export const OneofDescriptorProto = { }, toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; return obj; }, @@ -3004,22 +3004,22 @@ export const EnumDescriptorProto = { }, toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.value) { obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); } else { - obj.value = []; + obj.value = message.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 = []; + obj.reserved_range = message.reservedRange; } if (message.reservedName) { obj.reserved_name = message.reservedName.map(e => e); } else { - obj.reserved_name = []; + obj.reserved_name = message.reservedName; } return obj; }, @@ -3124,8 +3124,8 @@ export const EnumDescriptorProto_EnumReservedRange = { }, toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { const obj: any = {}; - obj.start = message.start; - obj.end = message.end; + obj.start = message.start === 0 ? undefined : message.start; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { @@ -3247,8 +3247,8 @@ export const EnumValueDescriptorProto = { }, toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; return obj; }, @@ -3377,11 +3377,11 @@ export const ServiceDescriptorProto = { }, toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.method) { obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); } else { - obj.method = []; + obj.method = message.method; } obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; return obj; @@ -3553,12 +3553,12 @@ export const MethodDescriptorProto = { }, toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { const obj: any = {}; - obj.name = message.name; - obj.input_type = message.inputType; - obj.output_type = message.outputType; + obj.name = message.name === "" ? undefined : message.name; + obj.input_type = message.inputType === "" ? undefined : message.inputType; + obj.output_type = message.outputType === "" ? undefined : message.outputType; obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; - obj.client_streaming = message.clientStreaming; - obj.server_streaming = message.serverStreaming; + obj.client_streaming = message.clientStreaming === false ? undefined : message.clientStreaming; + obj.server_streaming = message.serverStreaming === false ? undefined : message.serverStreaming; return obj; }, fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { @@ -3923,7 +3923,7 @@ export const FileOptions = { message.javaStringCheckUtf8 = object.java_string_check_utf8; } if (object.optimize_for !== undefined && object.optimize_for !== null) { - message.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimize_for); + message.optimizeFor = object.optimize_for; } if (object.go_package !== undefined && object.go_package !== null) { message.goPackage = object.go_package; @@ -3972,30 +3972,30 @@ export const FileOptions = { }, 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; + obj.java_package = message.javaPackage === "" ? undefined : message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname === "" ? undefined : message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles === false ? undefined : message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash === false ? undefined : message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8 === false ? undefined : message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor === 1 ? undefined : message.optimizeFor; + obj.go_package = message.goPackage === "" ? undefined : message.goPackage; + obj.cc_generic_services = message.ccGenericServices === false ? undefined : message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices === false ? undefined : message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices === false ? undefined : message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices === false ? undefined : message.phpGenericServices; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas === false ? undefined : message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix === "" ? undefined : message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace === "" ? undefined : message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix === "" ? undefined : message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix === "" ? undefined : message.phpClassPrefix; + obj.php_namespace = message.phpNamespace === "" ? undefined : message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace === "" ? undefined : message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage === "" ? undefined : message.rubyPackage; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4154,14 +4154,14 @@ export const MessageOptions = { }, 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; + obj.message_set_wire_format = message.messageSetWireFormat === false ? undefined : message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor === false ? undefined : message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.map_entry = message.mapEntry === false ? undefined : message.mapEntry; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4330,13 +4330,13 @@ export const FieldOptions = { fromAmino(object: FieldOptionsAmino): FieldOptions { const message = createBaseFieldOptions(); if (object.ctype !== undefined && object.ctype !== null) { - message.ctype = fieldOptions_CTypeFromJSON(object.ctype); + message.ctype = object.ctype; } if (object.packed !== undefined && object.packed !== null) { message.packed = object.packed; } if (object.jstype !== undefined && object.jstype !== null) { - message.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + message.jstype = object.jstype; } if (object.lazy !== undefined && object.lazy !== null) { message.lazy = object.lazy; @@ -4352,16 +4352,16 @@ export const FieldOptions = { }, 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; + obj.ctype = message.ctype === 1 ? undefined : message.ctype; + obj.packed = message.packed === false ? undefined : message.packed; + obj.jstype = message.jstype === 1 ? undefined : message.jstype; + obj.lazy = message.lazy === false ? undefined : message.lazy; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.weak = message.weak === false ? undefined : message.weak; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4459,7 +4459,7 @@ export const OneofOptions = { if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4586,12 +4586,12 @@ export const EnumOptions = { }, toAmino(message: EnumOptions): EnumOptionsAmino { const obj: any = {}; - obj.allow_alias = message.allowAlias; - obj.deprecated = message.deprecated; + obj.allow_alias = message.allowAlias === false ? undefined : message.allowAlias; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4702,11 +4702,11 @@ export const EnumValueOptions = { }, toAmino(message: EnumValueOptions): EnumValueOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4817,11 +4817,11 @@ export const ServiceOptions = { }, toAmino(message: ServiceOptions): ServiceOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -4941,19 +4941,19 @@ export const MethodOptions = { message.deprecated = object.deprecated; } if (object.idempotency_level !== undefined && object.idempotency_level !== null) { - message.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotency_level); + message.idempotencyLevel = object.idempotency_level; } message.uninterpretedOption = object.uninterpreted_option?.map(e => UninterpretedOption.fromAmino(e)) || []; return message; }, toAmino(message: MethodOptions): MethodOptionsAmino { const obj: any = {}; - obj.deprecated = message.deprecated; - obj.idempotency_level = message.idempotencyLevel; + obj.deprecated = message.deprecated === false ? undefined : message.deprecated; + obj.idempotency_level = message.idempotencyLevel === 1 ? undefined : message.idempotencyLevel; if (message.uninterpretedOption) { obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); } else { - obj.uninterpreted_option = []; + obj.uninterpreted_option = message.uninterpretedOption; } return obj; }, @@ -5151,14 +5151,14 @@ export const UninterpretedOption = { if (message.name) { obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); } else { - obj.name = []; + obj.name = message.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.identifier_value = message.identifierValue === "" ? undefined : message.identifierValue; + obj.positive_int_value = message.positiveIntValue !== BigInt(0) ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue !== BigInt(0) ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue === 0 ? undefined : message.doubleValue; obj.string_value = message.stringValue ? base64FromBytes(message.stringValue) : undefined; - obj.aggregate_value = message.aggregateValue; + obj.aggregate_value = message.aggregateValue === "" ? undefined : message.aggregateValue; return obj; }, fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { @@ -5262,8 +5262,8 @@ export const UninterpretedOption_NamePart = { }, toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { const obj: any = {}; - obj.name_part = message.namePart; - obj.is_extension = message.isExtension; + obj.name_part = message.namePart === "" ? undefined : message.namePart; + obj.is_extension = message.isExtension === false ? undefined : message.isExtension; return obj; }, fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { @@ -5360,7 +5360,7 @@ export const SourceCodeInfo = { if (message.location) { obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); } else { - obj.location = []; + obj.location = message.location; } return obj; }, @@ -5552,19 +5552,19 @@ export const SourceCodeInfo_Location = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } if (message.span) { obj.span = message.span.map(e => e); } else { - obj.span = []; + obj.span = message.span; } - obj.leading_comments = message.leadingComments; - obj.trailing_comments = message.trailingComments; + obj.leading_comments = message.leadingComments === "" ? undefined : message.leadingComments; + obj.trailing_comments = message.trailingComments === "" ? undefined : message.trailingComments; if (message.leadingDetachedComments) { obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); } else { - obj.leading_detached_comments = []; + obj.leading_detached_comments = message.leadingDetachedComments; } return obj; }, @@ -5662,7 +5662,7 @@ export const GeneratedCodeInfo = { if (message.annotation) { obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); } else { - obj.annotation = []; + obj.annotation = message.annotation; } return obj; }, @@ -5817,11 +5817,11 @@ export const GeneratedCodeInfo_Annotation = { if (message.path) { obj.path = message.path.map(e => e); } else { - obj.path = []; + obj.path = message.path; } - obj.source_file = message.sourceFile; - obj.begin = message.begin; - obj.end = message.end; + obj.source_file = message.sourceFile === "" ? undefined : message.sourceFile; + obj.begin = message.begin === 0 ? undefined : message.begin; + obj.end = message.end === 0 ? undefined : message.end; return obj; }, fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { diff --git a/__fixtures__/v-next/outputv4/google/protobuf/field_mask.ts b/__fixtures__/v-next/outputv4/google/protobuf/field_mask.ts index 9b2c3c999a..1c21f0603a 100644 --- a/__fixtures__/v-next/outputv4/google/protobuf/field_mask.ts +++ b/__fixtures__/v-next/outputv4/google/protobuf/field_mask.ts @@ -492,7 +492,7 @@ export const FieldMask = { if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/protobuf/source_context.ts b/__fixtures__/v-next/outputv4/google/protobuf/source_context.ts index 82bcb1121b..88cf9c3e3b 100644 --- a/__fixtures__/v-next/outputv4/google/protobuf/source_context.ts +++ b/__fixtures__/v-next/outputv4/google/protobuf/source_context.ts @@ -92,7 +92,7 @@ export const SourceContext = { }, toAmino(message: SourceContext): SourceContextAmino { const obj: any = {}; - obj.file_name = message.fileName; + obj.file_name = message.fileName === "" ? undefined : message.fileName; return obj; }, fromAminoMsg(object: SourceContextAminoMsg): SourceContext { diff --git a/__fixtures__/v-next/outputv4/google/protobuf/struct.ts b/__fixtures__/v-next/outputv4/google/protobuf/struct.ts index 6b2bb07801..4a433eedd9 100644 --- a/__fixtures__/v-next/outputv4/google/protobuf/struct.ts +++ b/__fixtures__/v-next/outputv4/google/protobuf/struct.ts @@ -229,7 +229,7 @@ export const Struct_FieldsEntry = { }, toAmino(message: Struct_FieldsEntry): Struct_FieldsEntryAmino { const obj: any = {}; - obj.key = message.key; + obj.key = message.key === "" ? undefined : message.key; obj.value = message.value ? Value.toAmino(message.value) : undefined; return obj; }, @@ -511,7 +511,7 @@ export const Value = { fromAmino(object: ValueAmino): Value { const message = createBaseValue(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.number_value !== undefined && object.number_value !== null) { message.numberValue = object.number_value; @@ -532,10 +532,10 @@ export const Value = { }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.number_value = message.numberValue === null ? undefined : message.numberValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; obj.struct_value = message.structValue ? Struct.toAmino(message.structValue) : undefined; obj.list_value = message.listValue ? ListValue.toAmino(message.listValue) : undefined; return obj; @@ -634,7 +634,7 @@ export const ListValue = { if (message.values) { obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); } else { - obj.values = []; + obj.values = message.values; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/protobuf/type.ts b/__fixtures__/v-next/outputv4/google/protobuf/type.ts index 8839221c95..2d773bfb19 100644 --- a/__fixtures__/v-next/outputv4/google/protobuf/type.ts +++ b/__fixtures__/v-next/outputv4/google/protobuf/type.ts @@ -551,30 +551,30 @@ export const Type = { message.sourceContext = SourceContext.fromAmino(object.source_context); } if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Type): TypeAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.fields) { obj.fields = message.fields.map(e => e ? Field.toAmino(e) : undefined); } else { - obj.fields = []; + obj.fields = message.fields; } if (message.oneofs) { obj.oneofs = message.oneofs.map(e => e); } else { - obj.oneofs = []; + obj.oneofs = message.oneofs; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: TypeAminoMsg): Type { @@ -781,10 +781,10 @@ export const Field = { fromAmino(object: FieldAmino): Field { const message = createBaseField(); if (object.kind !== undefined && object.kind !== null) { - message.kind = field_KindFromJSON(object.kind); + message.kind = object.kind; } if (object.cardinality !== undefined && object.cardinality !== null) { - message.cardinality = field_CardinalityFromJSON(object.cardinality); + message.cardinality = object.cardinality; } if (object.number !== undefined && object.number !== null) { message.number = object.number; @@ -812,20 +812,20 @@ export const Field = { }, 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; + obj.kind = message.kind === 0 ? undefined : message.kind; + obj.cardinality = message.cardinality === 0 ? undefined : message.cardinality; + obj.number = message.number === 0 ? undefined : message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.type_url = message.typeUrl === "" ? undefined : message.typeUrl; + obj.oneof_index = message.oneofIndex === 0 ? undefined : message.oneofIndex; + obj.packed = message.packed === false ? undefined : message.packed; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } - obj.json_name = message.jsonName; - obj.default_value = message.defaultValue; + obj.json_name = message.jsonName === "" ? undefined : message.jsonName; + obj.default_value = message.defaultValue === "" ? undefined : message.defaultValue; return obj; }, fromAminoMsg(object: FieldAminoMsg): Field { @@ -985,25 +985,25 @@ export const Enum = { message.sourceContext = SourceContext.fromAmino(object.source_context); } if (object.syntax !== undefined && object.syntax !== null) { - message.syntax = syntaxFromJSON(object.syntax); + message.syntax = object.syntax; } return message; }, toAmino(message: Enum): EnumAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; if (message.enumvalue) { obj.enumvalue = message.enumvalue.map(e => e ? EnumValue.toAmino(e) : undefined); } else { - obj.enumvalue = []; + obj.enumvalue = message.enumvalue; } if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; - obj.syntax = message.syntax; + obj.syntax = message.syntax === 0 ? undefined : message.syntax; return obj; }, fromAminoMsg(object: EnumAminoMsg): Enum { @@ -1129,12 +1129,12 @@ export const EnumValue = { }, toAmino(message: EnumValue): EnumValueAmino { const obj: any = {}; - obj.name = message.name; - obj.number = message.number; + obj.name = message.name === "" ? undefined : message.name; + obj.number = message.number === 0 ? undefined : message.number; if (message.options) { obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); } else { - obj.options = []; + obj.options = message.options; } return obj; }, @@ -1241,7 +1241,7 @@ export const Option = { }, toAmino(message: Option): OptionAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.value = message.value ? Any.toAmino(message.value) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/google/protobuf/wrappers.ts b/__fixtures__/v-next/outputv4/google/protobuf/wrappers.ts index 7a09facc61..e22e95be06 100644 --- a/__fixtures__/v-next/outputv4/google/protobuf/wrappers.ts +++ b/__fixtures__/v-next/outputv4/google/protobuf/wrappers.ts @@ -259,7 +259,7 @@ export const DoubleValue = { }, toAmino(message: DoubleValue): DoubleValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: DoubleValueAminoMsg): DoubleValue { @@ -347,7 +347,7 @@ export const FloatValue = { }, toAmino(message: FloatValue): FloatValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: FloatValueAminoMsg): FloatValue { @@ -437,7 +437,7 @@ export const Int64Value = { }, toAmino(message: Int64Value): Int64ValueAmino { const obj: any = {}; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: Int64ValueAminoMsg): Int64Value { @@ -527,7 +527,7 @@ export const UInt64Value = { }, toAmino(message: UInt64Value): UInt64ValueAmino { const obj: any = {}; - obj.value = message.value ? message.value.toString() : undefined; + obj.value = message.value !== BigInt(0) ? message.value.toString() : undefined; return obj; }, fromAminoMsg(object: UInt64ValueAminoMsg): UInt64Value { @@ -615,7 +615,7 @@ export const Int32Value = { }, toAmino(message: Int32Value): Int32ValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: Int32ValueAminoMsg): Int32Value { @@ -703,7 +703,7 @@ export const UInt32Value = { }, toAmino(message: UInt32Value): UInt32ValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === 0 ? undefined : message.value; return obj; }, fromAminoMsg(object: UInt32ValueAminoMsg): UInt32Value { @@ -791,7 +791,7 @@ export const BoolValue = { }, toAmino(message: BoolValue): BoolValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === false ? undefined : message.value; return obj; }, fromAminoMsg(object: BoolValueAminoMsg): BoolValue { @@ -879,7 +879,7 @@ export const StringValue = { }, toAmino(message: StringValue): StringValueAmino { const obj: any = {}; - obj.value = message.value; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: StringValueAminoMsg): StringValue { diff --git a/__fixtures__/v-next/outputv4/google/rpc/context/attribute_context.ts b/__fixtures__/v-next/outputv4/google/rpc/context/attribute_context.ts index 4be65bc155..4ec47edc48 100644 --- a/__fixtures__/v-next/outputv4/google/rpc/context/attribute_context.ts +++ b/__fixtures__/v-next/outputv4/google/rpc/context/attribute_context.ts @@ -788,7 +788,7 @@ export const AttributeContext = { if (message.extensions) { obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.extensions = []; + obj.extensions = message.extensions; } return obj; }, @@ -892,8 +892,8 @@ export const AttributeContext_Peer_LabelsEntry = { }, toAmino(message: AttributeContext_Peer_LabelsEntry): AttributeContext_Peer_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Peer_LabelsEntryAminoMsg): AttributeContext_Peer_LabelsEntry { @@ -1084,16 +1084,16 @@ export const AttributeContext_Peer = { }, toAmino(message: AttributeContext_Peer): AttributeContext_PeerAmino { const obj: any = {}; - obj.ip = message.ip; - obj.port = message.port ? message.port.toString() : undefined; + obj.ip = message.ip === "" ? undefined : message.ip; + obj.port = message.port !== BigInt(0) ? 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; + obj.principal = message.principal === "" ? undefined : message.principal; + obj.region_code = message.regionCode === "" ? undefined : message.regionCode; return obj; }, fromAminoMsg(object: AttributeContext_PeerAminoMsg): AttributeContext_Peer { @@ -1229,10 +1229,10 @@ export const AttributeContext_Api = { }, 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; + obj.service = message.service === "" ? undefined : message.service; + obj.operation = message.operation === "" ? undefined : message.operation; + obj.protocol = message.protocol === "" ? undefined : message.protocol; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: AttributeContext_ApiAminoMsg): AttributeContext_Api { @@ -1398,18 +1398,18 @@ export const AttributeContext_Auth = { }, toAmino(message: AttributeContext_Auth): AttributeContext_AuthAmino { const obj: any = {}; - obj.principal = message.principal; + obj.principal = message.principal === "" ? undefined : message.principal; if (message.audiences) { obj.audiences = message.audiences.map(e => e); } else { - obj.audiences = []; + obj.audiences = message.audiences; } - obj.presenter = message.presenter; + obj.presenter = message.presenter === "" ? undefined : 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 = []; + obj.access_levels = message.accessLevels; } return obj; }, @@ -1513,8 +1513,8 @@ export const AttributeContext_Request_HeadersEntry = { }, toAmino(message: AttributeContext_Request_HeadersEntry): AttributeContext_Request_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Request_HeadersEntryAminoMsg): AttributeContext_Request_HeadersEntry { @@ -1819,22 +1819,22 @@ export const AttributeContext_Request = { }, toAmino(message: AttributeContext_Request): AttributeContext_RequestAmino { const obj: any = {}; - obj.id = message.id; - obj.method = message.method; + obj.id = message.id === "" ? undefined : message.id; + obj.method = message.method === "" ? undefined : 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.path = message.path === "" ? undefined : message.path; + obj.host = message.host === "" ? undefined : message.host; + obj.scheme = message.scheme === "" ? undefined : message.scheme; + obj.query = message.query === "" ? undefined : message.query; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.size = message.size ? message.size.toString() : undefined; - obj.protocol = message.protocol; - obj.reason = message.reason; + obj.size = message.size !== BigInt(0) ? message.size.toString() : undefined; + obj.protocol = message.protocol === "" ? undefined : message.protocol; + obj.reason = message.reason === "" ? undefined : message.reason; obj.auth = message.auth ? AttributeContext_Auth.toAmino(message.auth) : undefined; return obj; }, @@ -1938,8 +1938,8 @@ export const AttributeContext_Response_HeadersEntry = { }, toAmino(message: AttributeContext_Response_HeadersEntry): AttributeContext_Response_HeadersEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Response_HeadersEntryAminoMsg): AttributeContext_Response_HeadersEntry { @@ -2134,8 +2134,8 @@ export const AttributeContext_Response = { }, 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.code = message.code !== BigInt(0) ? message.code.toString() : undefined; + obj.size = message.size !== BigInt(0) ? message.size.toString() : undefined; obj.headers = {}; if (message.headers) { Object.entries(message.headers).forEach(([k, v]) => { @@ -2246,8 +2246,8 @@ export const AttributeContext_Resource_LabelsEntry = { }, toAmino(message: AttributeContext_Resource_LabelsEntry): AttributeContext_Resource_LabelsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Resource_LabelsEntryAminoMsg): AttributeContext_Resource_LabelsEntry { @@ -2344,8 +2344,8 @@ export const AttributeContext_Resource_AnnotationsEntry = { }, toAmino(message: AttributeContext_Resource_AnnotationsEntry): AttributeContext_Resource_AnnotationsEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: AttributeContext_Resource_AnnotationsEntryAminoMsg): AttributeContext_Resource_AnnotationsEntry { @@ -2689,28 +2689,28 @@ export const AttributeContext_Resource = { }, toAmino(message: AttributeContext_Resource): AttributeContext_ResourceAmino { const obj: any = {}; - obj.service = message.service; - obj.name = message.name; - obj.type = message.type; + obj.service = message.service === "" ? undefined : message.service; + obj.name = message.name === "" ? undefined : message.name; + obj.type = message.type === "" ? undefined : message.type; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { obj.labels[k] = v; }); } - obj.uid = message.uid; + obj.uid = message.uid === "" ? undefined : message.uid; obj.annotations = {}; if (message.annotations) { Object.entries(message.annotations).forEach(([k, v]) => { obj.annotations[k] = v; }); } - obj.display_name = message.displayName; + obj.display_name = message.displayName === "" ? undefined : message.displayName; obj.create_time = message.createTime ? Timestamp.toAmino(toTimestamp(message.createTime)) : undefined; obj.update_time = message.updateTime ? Timestamp.toAmino(toTimestamp(message.updateTime)) : undefined; obj.delete_time = message.deleteTime ? Timestamp.toAmino(toTimestamp(message.deleteTime)) : undefined; - obj.etag = message.etag; - obj.location = message.location; + obj.etag = message.etag === "" ? undefined : message.etag; + obj.location = message.location === "" ? undefined : message.location; return obj; }, fromAminoMsg(object: AttributeContext_ResourceAminoMsg): AttributeContext_Resource { diff --git a/__fixtures__/v-next/outputv4/google/rpc/error_details.ts b/__fixtures__/v-next/outputv4/google/rpc/error_details.ts index b8c41aeb78..e0f767f60a 100644 --- a/__fixtures__/v-next/outputv4/google/rpc/error_details.ts +++ b/__fixtures__/v-next/outputv4/google/rpc/error_details.ts @@ -649,9 +649,9 @@ export const DebugInfo = { if (message.stackEntries) { obj.stack_entries = message.stackEntries.map(e => e); } else { - obj.stack_entries = []; + obj.stack_entries = message.stackEntries; } - obj.detail = message.detail; + obj.detail = message.detail === "" ? undefined : message.detail; return obj; }, fromAminoMsg(object: DebugInfoAminoMsg): DebugInfo { @@ -748,7 +748,7 @@ export const QuotaFailure = { if (message.violations) { obj.violations = message.violations.map(e => e ? QuotaFailure_Violation.toAmino(e) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -853,8 +853,8 @@ export const QuotaFailure_Violation = { }, toAmino(message: QuotaFailure_Violation): QuotaFailure_ViolationAmino { const obj: any = {}; - obj.subject = message.subject; - obj.description = message.description; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: QuotaFailure_ViolationAminoMsg): QuotaFailure_Violation { @@ -957,8 +957,8 @@ export const ErrorInfo_MetadataEntry = { }, toAmino(message: ErrorInfo_MetadataEntry): ErrorInfo_MetadataEntryAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: ErrorInfo_MetadataEntryAminoMsg): ErrorInfo_MetadataEntry { @@ -1115,8 +1115,8 @@ export const ErrorInfo = { }, toAmino(message: ErrorInfo): ErrorInfoAmino { const obj: any = {}; - obj.reason = message.reason; - obj.domain = message.domain; + obj.reason = message.reason === "" ? undefined : message.reason; + obj.domain = message.domain === "" ? undefined : message.domain; obj.metadata = {}; if (message.metadata) { Object.entries(message.metadata).forEach(([k, v]) => { @@ -1219,7 +1219,7 @@ export const PreconditionFailure = { if (message.violations) { obj.violations = message.violations.map(e => e ? PreconditionFailure_Violation.toAmino(e) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -1340,9 +1340,9 @@ export const PreconditionFailure_Violation = { }, toAmino(message: PreconditionFailure_Violation): PreconditionFailure_ViolationAmino { const obj: any = {}; - obj.type = message.type; - obj.subject = message.subject; - obj.description = message.description; + obj.type = message.type === "" ? undefined : message.type; + obj.subject = message.subject === "" ? undefined : message.subject; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: PreconditionFailure_ViolationAminoMsg): PreconditionFailure_Violation { @@ -1439,7 +1439,7 @@ export const BadRequest = { if (message.fieldViolations) { obj.field_violations = message.fieldViolations.map(e => e ? BadRequest_FieldViolation.toAmino(e) : undefined); } else { - obj.field_violations = []; + obj.field_violations = message.fieldViolations; } return obj; }, @@ -1544,8 +1544,8 @@ export const BadRequest_FieldViolation = { }, toAmino(message: BadRequest_FieldViolation): BadRequest_FieldViolationAmino { const obj: any = {}; - obj.field = message.field; - obj.description = message.description; + obj.field = message.field === "" ? undefined : message.field; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: BadRequest_FieldViolationAminoMsg): BadRequest_FieldViolation { @@ -1649,8 +1649,8 @@ export const RequestInfo = { }, toAmino(message: RequestInfo): RequestInfoAmino { const obj: any = {}; - obj.request_id = message.requestId; - obj.serving_data = message.servingData; + obj.request_id = message.requestId === "" ? undefined : message.requestId; + obj.serving_data = message.servingData === "" ? undefined : message.servingData; return obj; }, fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo { @@ -1786,10 +1786,10 @@ export const ResourceInfo = { }, 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; + obj.resource_type = message.resourceType === "" ? undefined : message.resourceType; + obj.resource_name = message.resourceName === "" ? undefined : message.resourceName; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.description = message.description === "" ? undefined : message.description; return obj; }, fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo { @@ -1886,7 +1886,7 @@ export const Help = { if (message.links) { obj.links = message.links.map(e => e ? Help_Link.toAmino(e) : undefined); } else { - obj.links = []; + obj.links = message.links; } return obj; }, @@ -1991,8 +1991,8 @@ export const Help_Link = { }, toAmino(message: Help_Link): Help_LinkAmino { const obj: any = {}; - obj.description = message.description; - obj.url = message.url; + obj.description = message.description === "" ? undefined : message.description; + obj.url = message.url === "" ? undefined : message.url; return obj; }, fromAminoMsg(object: Help_LinkAminoMsg): Help_Link { @@ -2096,8 +2096,8 @@ export const LocalizedMessage = { }, toAmino(message: LocalizedMessage): LocalizedMessageAmino { const obj: any = {}; - obj.locale = message.locale; - obj.message = message.message; + obj.locale = message.locale === "" ? undefined : message.locale; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: LocalizedMessageAminoMsg): LocalizedMessage { diff --git a/__fixtures__/v-next/outputv4/google/rpc/status.ts b/__fixtures__/v-next/outputv4/google/rpc/status.ts index eab4f0f35c..bab5c2f9c8 100644 --- a/__fixtures__/v-next/outputv4/google/rpc/status.ts +++ b/__fixtures__/v-next/outputv4/google/rpc/status.ts @@ -151,12 +151,12 @@ export const Status = { }, toAmino(message: Status): StatusAmino { const obj: any = {}; - obj.code = message.code; - obj.message = message.message; + obj.code = message.code === 0 ? undefined : message.code; + obj.message = message.message === "" ? undefined : message.message; if (message.details) { obj.details = message.details.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.details = []; + obj.details = message.details; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/helpers.ts b/__fixtures__/v-next/outputv4/helpers.ts index 1b7392d85c..6d7be3b517 100644 --- a/__fixtures__/v-next/outputv4/helpers.ts +++ b/__fixtures__/v-next/outputv4/helpers.ts @@ -46,7 +46,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -57,6 +57,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/genesis.ts b/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/genesis.ts index a1aeb24f13..5b0b9efa32 100644 --- a/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/genesis.ts @@ -127,11 +127,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.port_id = message.portId; + obj.port_id = message.portId === "" ? undefined : message.portId; if (message.denomTraces) { obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e) : undefined); } else { - obj.denom_traces = []; + obj.denom_traces = message.denomTraces; } obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/query.ts b/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/query.ts index 8f9252e490..96cd23516d 100644 --- a/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/query.ts +++ b/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/query.ts @@ -172,7 +172,7 @@ export const QueryDenomTraceRequest = { }, toAmino(message: QueryDenomTraceRequest): QueryDenomTraceRequestAmino { const obj: any = {}; - obj.hash = message.hash; + obj.hash = message.hash === "" ? undefined : message.hash; return obj; }, fromAminoMsg(object: QueryDenomTraceRequestAminoMsg): QueryDenomTraceRequest { @@ -485,7 +485,7 @@ export const QueryDenomTracesResponse = { if (message.denomTraces) { obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e) : undefined); } else { - obj.denom_traces = []; + obj.denom_traces = message.denomTraces; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/transfer.ts b/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/transfer.ts index ec8c7fd069..8a098f7429 100644 --- a/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/transfer.ts +++ b/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/transfer.ts @@ -143,8 +143,8 @@ export const DenomTrace = { }, toAmino(message: DenomTrace): DenomTraceAmino { const obj: any = {}; - obj.path = message.path; - obj.base_denom = message.baseDenom; + obj.path = message.path === "" ? undefined : message.path; + obj.base_denom = message.baseDenom === "" ? undefined : message.baseDenom; return obj; }, fromAminoMsg(object: DenomTraceAminoMsg): DenomTrace { @@ -254,8 +254,8 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.send_enabled = message.sendEnabled; - obj.receive_enabled = message.receiveEnabled; + obj.send_enabled = message.sendEnabled === false ? undefined : message.sendEnabled; + obj.receive_enabled = message.receiveEnabled === false ? undefined : message.receiveEnabled; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/tx.ts b/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/tx.ts index a6e3bd1dd0..cef091965d 100644 --- a/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/tx.ts +++ b/__fixtures__/v-next/outputv4/ibc/applications/transfer/v1/tx.ts @@ -227,13 +227,13 @@ export const MsgTransfer = { }, toAmino(message: MsgTransfer): MsgTransferAmino { const obj: any = {}; - obj.source_port = message.sourcePort; - obj.source_channel = message.sourceChannel; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; obj.token = message.token ? Coin.toAmino(message.token) : undefined; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromAminoMsg(object: MsgTransferAminoMsg): MsgTransfer { diff --git a/__fixtures__/v-next/outputv4/ibc/applications/transfer/v2/packet.ts b/__fixtures__/v-next/outputv4/ibc/applications/transfer/v2/packet.ts index 88a453a77e..2a1111cf41 100644 --- a/__fixtures__/v-next/outputv4/ibc/applications/transfer/v2/packet.ts +++ b/__fixtures__/v-next/outputv4/ibc/applications/transfer/v2/packet.ts @@ -148,10 +148,10 @@ export const FungibleTokenPacketData = { }, toAmino(message: FungibleTokenPacketData): FungibleTokenPacketDataAmino { const obj: any = {}; - obj.denom = message.denom; - obj.amount = message.amount; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.amount = message.amount === "" ? undefined : message.amount; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; return obj; }, fromAminoMsg(object: FungibleTokenPacketDataAminoMsg): FungibleTokenPacketData { diff --git a/__fixtures__/v-next/outputv4/ibc/core/channel/v1/channel.ts b/__fixtures__/v-next/outputv4/ibc/core/channel/v1/channel.ts index c22df4787f..02430de508 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/channel/v1/channel.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/channel/v1/channel.ts @@ -427,10 +427,10 @@ export const Channel = { fromAmino(object: ChannelAmino): Channel { const message = createBaseChannel(); if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -443,15 +443,15 @@ export const Channel = { }, toAmino(message: Channel): ChannelAmino { const obj: any = {}; - obj.state = message.state; - obj.ordering = message.ordering; + obj.state = message.state === 0 ? undefined : message.state; + obj.ordering = message.ordering === 0 ? undefined : 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.connection_hops = message.connectionHops; } - obj.version = message.version; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: ChannelAminoMsg): Channel { @@ -627,10 +627,10 @@ export const IdentifiedChannel = { fromAmino(object: IdentifiedChannelAmino): IdentifiedChannel { const message = createBaseIdentifiedChannel(); if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -649,17 +649,17 @@ export const IdentifiedChannel = { }, toAmino(message: IdentifiedChannel): IdentifiedChannelAmino { const obj: any = {}; - obj.state = message.state; - obj.ordering = message.ordering; + obj.state = message.state === 0 ? undefined : message.state; + obj.ordering = message.ordering === 0 ? undefined : 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.connection_hops = message.connectionHops; } - obj.version = message.version; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.version = message.version === "" ? undefined : message.version; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: IdentifiedChannelAminoMsg): IdentifiedChannel { @@ -769,8 +769,8 @@ export const Counterparty = { }, toAmino(message: Counterparty): CounterpartyAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: CounterpartyAminoMsg): Counterparty { @@ -982,14 +982,14 @@ export const Packet = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; + obj.destination_port = message.destinationPort === "" ? undefined : message.destinationPort; + obj.destination_channel = message.destinationChannel === "" ? undefined : message.destinationChannel; obj.data = message.data ? base64FromBytes(message.data) : undefined; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromAminoMsg(object: PacketAminoMsg): Packet { @@ -1133,9 +1133,9 @@ export const PacketState = { }, 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.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1247,7 +1247,7 @@ export const Acknowledgement = { toAmino(message: Acknowledgement): AcknowledgementAmino { const obj: any = {}; obj.result = message.result ? base64FromBytes(message.result) : undefined; - obj.error = message.error; + obj.error = message.error === null ? undefined : message.error; return obj; }, fromAminoMsg(object: AcknowledgementAminoMsg): Acknowledgement { diff --git a/__fixtures__/v-next/outputv4/ibc/core/channel/v1/genesis.ts b/__fixtures__/v-next/outputv4/ibc/core/channel/v1/genesis.ts index 4af54092e2..c91ee16cc9 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/channel/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/channel/v1/genesis.ts @@ -279,39 +279,39 @@ export const GenesisState = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } if (message.acknowledgements) { obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.acknowledgements = []; + obj.acknowledgements = message.acknowledgements; } if (message.commitments) { obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.commitments = []; + obj.commitments = message.commitments; } if (message.receipts) { obj.receipts = message.receipts.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.receipts = []; + obj.receipts = message.receipts; } if (message.sendSequences) { obj.send_sequences = message.sendSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.send_sequences = []; + obj.send_sequences = message.sendSequences; } if (message.recvSequences) { obj.recv_sequences = message.recvSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.recv_sequences = []; + obj.recv_sequences = message.recvSequences; } if (message.ackSequences) { obj.ack_sequences = message.ackSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); } else { - obj.ack_sequences = []; + obj.ack_sequences = message.ackSequences; } - obj.next_channel_sequence = message.nextChannelSequence ? message.nextChannelSequence.toString() : undefined; + obj.next_channel_sequence = message.nextChannelSequence !== BigInt(0) ? message.nextChannelSequence.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -439,9 +439,9 @@ export const PacketSequence = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: PacketSequenceAminoMsg): PacketSequence { diff --git a/__fixtures__/v-next/outputv4/ibc/core/channel/v1/query.ts b/__fixtures__/v-next/outputv4/ibc/core/channel/v1/query.ts index b4a5916f73..4f7af83913 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/channel/v1/query.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/channel/v1/query.ts @@ -713,8 +713,8 @@ export const QueryChannelRequest = { }, toAmino(message: QueryChannelRequest): QueryChannelRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryChannelRequestAminoMsg): QueryChannelRequest { @@ -1081,7 +1081,7 @@ export const QueryChannelsResponse = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -1196,7 +1196,7 @@ export const QueryConnectionChannelsRequest = { }, toAmino(message: QueryConnectionChannelsRequest): QueryConnectionChannelsRequestAmino { const obj: any = {}; - obj.connection = message.connection; + obj.connection = message.connection === "" ? undefined : message.connection; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1336,7 +1336,7 @@ export const QueryConnectionChannelsResponse = { if (message.channels) { obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); } else { - obj.channels = []; + obj.channels = message.channels; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -1449,8 +1449,8 @@ export const QueryChannelClientStateRequest = { }, toAmino(message: QueryChannelClientStateRequest): QueryChannelClientStateRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryChannelClientStateRequestAminoMsg): QueryChannelClientStateRequest { @@ -1728,10 +1728,10 @@ export const QueryChannelConsensusStateRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryChannelConsensusStateRequestAminoMsg): QueryChannelConsensusStateRequest { @@ -1878,7 +1878,7 @@ export const QueryChannelConsensusStateResponse = { toAmino(message: QueryChannelConsensusStateResponse): QueryChannelConsensusStateResponseAmino { const obj: any = {}; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; @@ -2008,9 +2008,9 @@ export const QueryPacketCommitmentRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketCommitmentRequestAminoMsg): QueryPacketCommitmentRequest { @@ -2268,8 +2268,8 @@ export const QueryPacketCommitmentsRequest = { }, toAmino(message: QueryPacketCommitmentsRequest): QueryPacketCommitmentsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2409,7 +2409,7 @@ export const QueryPacketCommitmentsResponse = { if (message.commitments) { obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.commitments = []; + obj.commitments = message.commitments; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -2540,9 +2540,9 @@ export const QueryPacketReceiptRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketReceiptRequestAminoMsg): QueryPacketReceiptRequest { @@ -2670,7 +2670,7 @@ export const QueryPacketReceiptResponse = { }, toAmino(message: QueryPacketReceiptResponse): QueryPacketReceiptResponseAmino { const obj: any = {}; - obj.received = message.received; + obj.received = message.received === false ? undefined : message.received; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; @@ -2800,9 +2800,9 @@ export const QueryPacketAcknowledgementRequest = { }, 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; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPacketAcknowledgementRequestAminoMsg): QueryPacketAcknowledgementRequest { @@ -3091,13 +3091,13 @@ export const QueryPacketAcknowledgementsRequest = { }, toAmino(message: QueryPacketAcknowledgementsRequest): QueryPacketAcknowledgementsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : 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 = []; + obj.packet_commitment_sequences = message.packetCommitmentSequences; } return obj; }, @@ -3237,7 +3237,7 @@ export const QueryPacketAcknowledgementsResponse = { if (message.acknowledgements) { obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e) : undefined); } else { - obj.acknowledgements = []; + obj.acknowledgements = message.acknowledgements; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -3381,12 +3381,12 @@ export const QueryUnreceivedPacketsRequest = { }, toAmino(message: QueryUnreceivedPacketsRequest): QueryUnreceivedPacketsRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; if (message.packetCommitmentSequences) { obj.packet_commitment_sequences = message.packetCommitmentSequences.map(e => e.toString()); } else { - obj.packet_commitment_sequences = []; + obj.packet_commitment_sequences = message.packetCommitmentSequences; } return obj; }, @@ -3517,7 +3517,7 @@ export const QueryUnreceivedPacketsResponse = { if (message.sequences) { obj.sequences = message.sequences.map(e => e.toString()); } else { - obj.sequences = []; + obj.sequences = message.sequences; } obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; @@ -3660,12 +3660,12 @@ export const QueryUnreceivedAcksRequest = { }, toAmino(message: QueryUnreceivedAcksRequest): QueryUnreceivedAcksRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; if (message.packetAckSequences) { obj.packet_ack_sequences = message.packetAckSequences.map(e => e.toString()); } else { - obj.packet_ack_sequences = []; + obj.packet_ack_sequences = message.packetAckSequences; } return obj; }, @@ -3796,7 +3796,7 @@ export const QueryUnreceivedAcksResponse = { if (message.sequences) { obj.sequences = message.sequences.map(e => e.toString()); } else { - obj.sequences = []; + obj.sequences = message.sequences; } obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; @@ -3908,8 +3908,8 @@ export const QueryNextSequenceReceiveRequest = { }, toAmino(message: QueryNextSequenceReceiveRequest): QueryNextSequenceReceiveRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; return obj; }, fromAminoMsg(object: QueryNextSequenceReceiveRequestAminoMsg): QueryNextSequenceReceiveRequest { @@ -4039,7 +4039,7 @@ export const QueryNextSequenceReceiveResponse = { }, toAmino(message: QueryNextSequenceReceiveResponse): QueryNextSequenceReceiveResponseAmino { const obj: any = {}; - obj.next_sequence_receive = message.nextSequenceReceive ? message.nextSequenceReceive.toString() : undefined; + obj.next_sequence_receive = message.nextSequenceReceive !== BigInt(0) ? message.nextSequenceReceive.toString() : undefined; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; diff --git a/__fixtures__/v-next/outputv4/ibc/core/channel/v1/tx.ts b/__fixtures__/v-next/outputv4/ibc/core/channel/v1/tx.ts index 1ccc6579e9..b9be74e602 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/channel/v1/tx.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/channel/v1/tx.ts @@ -438,9 +438,9 @@ export const MsgChannelOpenInit = { }, toAmino(message: MsgChannelOpenInit): MsgChannelOpenInitAmino { const obj: any = {}; - obj.port_id = message.portId; + obj.port_id = message.portId === "" ? undefined : message.portId; obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenInitAminoMsg): MsgChannelOpenInit { @@ -708,13 +708,13 @@ export const MsgChannelOpenTry = { }, toAmino(message: MsgChannelOpenTry): MsgChannelOpenTryAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.previous_channel_id = message.previousChannelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.previous_channel_id = message.previousChannelId === "" ? undefined : message.previousChannelId; obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; - obj.counterparty_version = message.counterpartyVersion; + obj.counterparty_version = message.counterpartyVersion === "" ? undefined : message.counterpartyVersion; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenTryAminoMsg): MsgChannelOpenTry { @@ -980,13 +980,13 @@ export const MsgChannelOpenAck = { }, 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.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.counterparty_channel_id = message.counterpartyChannelId === "" ? undefined : message.counterpartyChannelId; + obj.counterparty_version = message.counterpartyVersion === "" ? undefined : message.counterpartyVersion; obj.proof_try = message.proofTry ? base64FromBytes(message.proofTry) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenAckAminoMsg): MsgChannelOpenAck { @@ -1220,11 +1220,11 @@ export const MsgChannelOpenConfirm = { }, toAmino(message: MsgChannelOpenConfirm): MsgChannelOpenConfirmAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.proof_ack = message.proofAck ? base64FromBytes(message.proofAck) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelOpenConfirmAminoMsg): MsgChannelOpenConfirm { @@ -1424,9 +1424,9 @@ export const MsgChannelCloseInit = { }, toAmino(message: MsgChannelCloseInit): MsgChannelCloseInitAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; - obj.signer = message.signer; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelCloseInitAminoMsg): MsgChannelCloseInit { @@ -1660,11 +1660,11 @@ export const MsgChannelCloseConfirm = { }, toAmino(message: MsgChannelCloseConfirm): MsgChannelCloseConfirmAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.channel_id = message.channelId; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.channel_id = message.channelId === "" ? undefined : message.channelId; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgChannelCloseConfirmAminoMsg): MsgChannelCloseConfirm { @@ -1887,7 +1887,7 @@ export const MsgRecvPacket = { obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; obj.proof_commitment = message.proofCommitment ? base64FromBytes(message.proofCommitment) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgRecvPacketAminoMsg): MsgRecvPacket { @@ -2128,8 +2128,8 @@ export const MsgTimeout = { obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; obj.proof_unreceived = message.proofUnreceived ? base64FromBytes(message.proofUnreceived) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; - obj.signer = message.signer; + obj.next_sequence_recv = message.nextSequenceRecv !== BigInt(0) ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgTimeoutAminoMsg): MsgTimeout { @@ -2387,8 +2387,8 @@ export const MsgTimeoutOnClose = { obj.proof_unreceived = message.proofUnreceived ? base64FromBytes(message.proofUnreceived) : undefined; obj.proof_close = message.proofClose ? base64FromBytes(message.proofClose) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; - obj.signer = message.signer; + obj.next_sequence_recv = message.nextSequenceRecv !== BigInt(0) ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgTimeoutOnCloseAminoMsg): MsgTimeoutOnClose { @@ -2628,7 +2628,7 @@ export const MsgAcknowledgement = { obj.acknowledgement = message.acknowledgement ? base64FromBytes(message.acknowledgement) : undefined; obj.proof_acked = message.proofAcked ? base64FromBytes(message.proofAcked) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgAcknowledgementAminoMsg): MsgAcknowledgement { diff --git a/__fixtures__/v-next/outputv4/ibc/core/client/v1/client.ts b/__fixtures__/v-next/outputv4/ibc/core/client/v1/client.ts index 7df67ccdfb..a6e02d50d0 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/client/v1/client.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/client/v1/client.ts @@ -274,7 +274,7 @@ export const IdentifiedClientState = { }, toAmino(message: IdentifiedClientState): IdentifiedClientStateAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; return obj; }, @@ -506,11 +506,11 @@ export const ClientConsensusStates = { }, toAmino(message: ClientConsensusStates): ClientConsensusStatesAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.consensusStates) { obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e) : undefined); } else { - obj.consensus_states = []; + obj.consensus_states = message.consensusStates; } return obj; }, @@ -653,10 +653,10 @@ export const ClientUpdateProposal = { }, 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; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; + obj.subject_client_id = message.subjectClientId === "" ? undefined : message.subjectClientId; + obj.substitute_client_id = message.substituteClientId === "" ? undefined : message.substituteClientId; return obj; }, fromAminoMsg(object: ClientUpdateProposalAminoMsg): ClientUpdateProposal { @@ -802,8 +802,8 @@ export const UpgradeProposal = { }, toAmino(message: UpgradeProposal): UpgradeProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; return obj; @@ -915,8 +915,8 @@ export const Height = { }, 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; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: HeightAminoMsg): Height { @@ -1019,7 +1019,7 @@ export const Params = { if (message.allowedClients) { obj.allowed_clients = message.allowedClients.map(e => e); } else { - obj.allowed_clients = []; + obj.allowed_clients = message.allowedClients; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/ibc/core/client/v1/genesis.ts b/__fixtures__/v-next/outputv4/ibc/core/client/v1/genesis.ts index 78c6175ea0..d78d54a3fd 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/client/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/client/v1/genesis.ts @@ -245,21 +245,21 @@ export const GenesisState = { if (message.clients) { obj.clients = message.clients.map(e => e ? IdentifiedClientState.toAmino(e) : undefined); } else { - obj.clients = []; + obj.clients = message.clients; } if (message.clientsConsensus) { obj.clients_consensus = message.clientsConsensus.map(e => e ? ClientConsensusStates.toAmino(e) : undefined); } else { - obj.clients_consensus = []; + obj.clients_consensus = message.clientsConsensus; } if (message.clientsMetadata) { obj.clients_metadata = message.clientsMetadata.map(e => e ? IdentifiedGenesisMetadata.toAmino(e) : undefined); } else { - obj.clients_metadata = []; + obj.clients_metadata = message.clientsMetadata; } obj.params = message.params ? Params.toAmino(message.params) : undefined; - obj.create_localhost = message.createLocalhost; - obj.next_client_sequence = message.nextClientSequence ? message.nextClientSequence.toString() : undefined; + obj.create_localhost = message.createLocalhost === false ? undefined : message.createLocalhost; + obj.next_client_sequence = message.nextClientSequence !== BigInt(0) ? message.nextClientSequence.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { @@ -486,11 +486,11 @@ export const IdentifiedGenesisMetadata = { }, toAmino(message: IdentifiedGenesisMetadata): IdentifiedGenesisMetadataAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.clientMetadata) { obj.client_metadata = message.clientMetadata.map(e => e ? GenesisMetadata.toAmino(e) : undefined); } else { - obj.client_metadata = []; + obj.client_metadata = message.clientMetadata; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/ibc/core/client/v1/query.ts b/__fixtures__/v-next/outputv4/ibc/core/client/v1/query.ts index 8f1d60ec04..facf10a215 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/client/v1/query.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/client/v1/query.ts @@ -398,7 +398,7 @@ export const QueryClientStateRequest = { }, toAmino(message: QueryClientStateRequest): QueryClientStateRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientStateRequestAminoMsg): QueryClientStateRequest { @@ -747,7 +747,7 @@ export const QueryClientStatesResponse = { if (message.clientStates) { obj.client_states = message.clientStates.map(e => e ? IdentifiedClientState.toAmino(e) : undefined); } else { - obj.client_states = []; + obj.client_states = message.clientStates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -895,10 +895,10 @@ export const QueryConsensusStateRequest = { }, 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; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; + obj.latest_height = message.latestHeight === false ? undefined : message.latestHeight; return obj; }, fromAminoMsg(object: QueryConsensusStateRequestAminoMsg): QueryConsensusStateRequest { @@ -1142,7 +1142,7 @@ export const QueryConsensusStatesRequest = { }, toAmino(message: QueryConsensusStatesRequest): QueryConsensusStatesRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1264,7 +1264,7 @@ export const QueryConsensusStatesResponse = { if (message.consensusStates) { obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e) : undefined); } else { - obj.consensus_states = []; + obj.consensus_states = message.consensusStates; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1360,7 +1360,7 @@ export const QueryClientStatusRequest = { }, toAmino(message: QueryClientStatusRequest): QueryClientStatusRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientStatusRequestAminoMsg): QueryClientStatusRequest { @@ -1454,7 +1454,7 @@ export const QueryClientStatusResponse = { }, toAmino(message: QueryClientStatusResponse): QueryClientStatusResponseAmino { const obj: any = {}; - obj.status = message.status; + obj.status = message.status === "" ? undefined : message.status; return obj; }, fromAminoMsg(object: QueryClientStatusResponseAminoMsg): QueryClientStatusResponse { diff --git a/__fixtures__/v-next/outputv4/ibc/core/client/v1/tx.ts b/__fixtures__/v-next/outputv4/ibc/core/client/v1/tx.ts index 5dbf86d41e..37a65a4678 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/client/v1/tx.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/client/v1/tx.ts @@ -256,7 +256,7 @@ export const MsgCreateClient = { 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; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgCreateClientAminoMsg): MsgCreateClient { @@ -458,9 +458,9 @@ export const MsgUpdateClient = { }, toAmino(message: MsgUpdateClient): MsgUpdateClientAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.header = message.header ? Any.toAmino(message.header) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgUpdateClientAminoMsg): MsgUpdateClient { @@ -712,12 +712,12 @@ export const MsgUpgradeClient = { }, toAmino(message: MsgUpgradeClient): MsgUpgradeClientAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : 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 ? base64FromBytes(message.proofUpgradeClient) : undefined; obj.proof_upgrade_consensus_state = message.proofUpgradeConsensusState ? base64FromBytes(message.proofUpgradeConsensusState) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgUpgradeClientAminoMsg): MsgUpgradeClient { @@ -919,9 +919,9 @@ export const MsgSubmitMisbehaviour = { }, toAmino(message: MsgSubmitMisbehaviour): MsgSubmitMisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.misbehaviour = message.misbehaviour ? Any.toAmino(message.misbehaviour) : undefined; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgSubmitMisbehaviourAminoMsg): MsgSubmitMisbehaviour { diff --git a/__fixtures__/v-next/outputv4/ibc/core/commitment/v1/commitment.ts b/__fixtures__/v-next/outputv4/ibc/core/commitment/v1/commitment.ts index 8f41402d5f..6cb04bf163 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/commitment/v1/commitment.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/commitment/v1/commitment.ts @@ -350,7 +350,7 @@ export const MerklePath = { if (message.keyPath) { obj.key_path = message.keyPath.map(e => e); } else { - obj.key_path = []; + obj.key_path = message.keyPath; } return obj; }, @@ -454,7 +454,7 @@ export const MerkleProof = { if (message.proofs) { obj.proofs = message.proofs.map(e => e ? CommitmentProof.toAmino(e) : undefined); } else { - obj.proofs = []; + obj.proofs = message.proofs; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/ibc/core/connection/v1/connection.ts b/__fixtures__/v-next/outputv4/ibc/core/connection/v1/connection.ts index d314ff02da..a0ad2cdc6e 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/connection/v1/connection.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/connection/v1/connection.ts @@ -359,7 +359,7 @@ export const ConnectionEnd = { } message.versions = object.versions?.map(e => Version.fromAmino(e)) || []; if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -371,15 +371,15 @@ export const ConnectionEnd = { }, toAmino(message: ConnectionEnd): ConnectionEndAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.versions) { obj.versions = message.versions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.versions = []; + obj.versions = message.versions; } - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; return obj; }, fromAminoMsg(object: ConnectionEndAminoMsg): ConnectionEnd { @@ -551,7 +551,7 @@ export const IdentifiedConnection = { } message.versions = object.versions?.map(e => Version.fromAmino(e)) || []; if (object.state !== undefined && object.state !== null) { - message.state = stateFromJSON(object.state); + message.state = object.state; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -563,16 +563,16 @@ export const IdentifiedConnection = { }, toAmino(message: IdentifiedConnection): IdentifiedConnectionAmino { const obj: any = {}; - obj.id = message.id; - obj.client_id = message.clientId; + obj.id = message.id === "" ? undefined : message.id; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.versions) { obj.versions = message.versions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.versions = []; + obj.versions = message.versions; } - obj.state = message.state; + obj.state = message.state === 0 ? undefined : message.state; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; return obj; }, fromAminoMsg(object: IdentifiedConnectionAminoMsg): IdentifiedConnection { @@ -700,8 +700,8 @@ export const Counterparty = { }, toAmino(message: Counterparty): CounterpartyAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.connection_id = message.connectionId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.prefix = message.prefix ? MerklePrefix.toAmino(message.prefix) : undefined; return obj; }, @@ -805,7 +805,7 @@ export const ClientPaths = { if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, @@ -922,11 +922,11 @@ export const ConnectionPaths = { }, toAmino(message: ConnectionPaths): ConnectionPathsAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; if (message.paths) { obj.paths = message.paths.map(e => e); } else { - obj.paths = []; + obj.paths = message.paths; } return obj; }, @@ -1043,11 +1043,11 @@ export const Version = { }, toAmino(message: Version): VersionAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; if (message.features) { obj.features = message.features.map(e => e); } else { - obj.features = []; + obj.features = message.features; } return obj; }, @@ -1144,7 +1144,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.max_expected_time_per_block = message.maxExpectedTimePerBlock ? message.maxExpectedTimePerBlock.toString() : undefined; + obj.max_expected_time_per_block = message.maxExpectedTimePerBlock !== BigInt(0) ? message.maxExpectedTimePerBlock.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/ibc/core/connection/v1/genesis.ts b/__fixtures__/v-next/outputv4/ibc/core/connection/v1/genesis.ts index 7f6fc315bd..bdc3b303c7 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/connection/v1/genesis.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/connection/v1/genesis.ts @@ -157,14 +157,14 @@ export const GenesisState = { if (message.connections) { obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e) : undefined); } else { - obj.connections = []; + obj.connections = message.connections; } if (message.clientConnectionPaths) { obj.client_connection_paths = message.clientConnectionPaths.map(e => e ? ConnectionPaths.toAmino(e) : undefined); } else { - obj.client_connection_paths = []; + obj.client_connection_paths = message.clientConnectionPaths; } - obj.next_connection_sequence = message.nextConnectionSequence ? message.nextConnectionSequence.toString() : undefined; + obj.next_connection_sequence = message.nextConnectionSequence !== BigInt(0) ? message.nextConnectionSequence.toString() : undefined; obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/ibc/core/connection/v1/query.ts b/__fixtures__/v-next/outputv4/ibc/core/connection/v1/query.ts index 6d3534fc5b..b43d22b7ae 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/connection/v1/query.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/connection/v1/query.ts @@ -302,7 +302,7 @@ export const QueryConnectionRequest = { }, toAmino(message: QueryConnectionRequest): QueryConnectionRequestAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromAminoMsg(object: QueryConnectionRequestAminoMsg): QueryConnectionRequest { @@ -669,7 +669,7 @@ export const QueryConnectionsResponse = { if (message.connections) { obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e) : undefined); } else { - obj.connections = []; + obj.connections = message.connections; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; obj.height = message.height ? Height.toAmino(message.height) : {}; @@ -766,7 +766,7 @@ export const QueryClientConnectionsRequest = { }, toAmino(message: QueryClientConnectionsRequest): QueryClientConnectionsRequestAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; return obj; }, fromAminoMsg(object: QueryClientConnectionsRequestAminoMsg): QueryClientConnectionsRequest { @@ -903,7 +903,7 @@ export const QueryClientConnectionsResponse = { if (message.connectionPaths) { obj.connection_paths = message.connectionPaths.map(e => e); } else { - obj.connection_paths = []; + obj.connection_paths = message.connectionPaths; } obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; @@ -1000,7 +1000,7 @@ export const QueryConnectionClientStateRequest = { }, toAmino(message: QueryConnectionClientStateRequest): QueryConnectionClientStateRequestAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; return obj; }, fromAminoMsg(object: QueryConnectionClientStateRequestAminoMsg): QueryConnectionClientStateRequest { @@ -1262,9 +1262,9 @@ export const QueryConnectionConsensusStateRequest = { }, 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; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: QueryConnectionConsensusStateRequestAminoMsg): QueryConnectionConsensusStateRequest { @@ -1411,7 +1411,7 @@ export const QueryConnectionConsensusStateResponse = { toAmino(message: QueryConnectionConsensusStateResponse): QueryConnectionConsensusStateResponseAmino { const obj: any = {}; obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.proof = message.proof ? base64FromBytes(message.proof) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; return obj; diff --git a/__fixtures__/v-next/outputv4/ibc/core/connection/v1/tx.ts b/__fixtures__/v-next/outputv4/ibc/core/connection/v1/tx.ts index 76220be7c7..0448be92eb 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/connection/v1/tx.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/connection/v1/tx.ts @@ -330,11 +330,11 @@ export const MsgConnectionOpenInit = { }, toAmino(message: MsgConnectionOpenInit): MsgConnectionOpenInitAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : 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; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenInitAminoMsg): MsgConnectionOpenInit { @@ -694,22 +694,22 @@ export const MsgConnectionOpenTry = { }, toAmino(message: MsgConnectionOpenTry): MsgConnectionOpenTryAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.previous_connection_id = message.previousConnectionId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.previous_connection_id = message.previousConnectionId === "" ? undefined : 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; + obj.delay_period = message.delayPeriod !== BigInt(0) ? message.delayPeriod.toString() : undefined; if (message.counterpartyVersions) { obj.counterparty_versions = message.counterpartyVersions.map(e => e ? Version.toAmino(e) : undefined); } else { - obj.counterparty_versions = []; + obj.counterparty_versions = message.counterpartyVersions; } obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; obj.proof_init = message.proofInit ? base64FromBytes(message.proofInit) : undefined; obj.proof_client = message.proofClient ? base64FromBytes(message.proofClient) : undefined; obj.proof_consensus = message.proofConsensus ? base64FromBytes(message.proofConsensus) : undefined; obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenTryAminoMsg): MsgConnectionOpenTry { @@ -1029,8 +1029,8 @@ export const MsgConnectionOpenAck = { }, toAmino(message: MsgConnectionOpenAck): MsgConnectionOpenAckAmino { const obj: any = {}; - obj.connection_id = message.connectionId; - obj.counterparty_connection_id = message.counterpartyConnectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.counterparty_connection_id = message.counterpartyConnectionId === "" ? undefined : 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) : {}; @@ -1038,7 +1038,7 @@ export const MsgConnectionOpenAck = { obj.proof_client = message.proofClient ? base64FromBytes(message.proofClient) : undefined; obj.proof_consensus = message.proofConsensus ? base64FromBytes(message.proofConsensus) : undefined; obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenAckAminoMsg): MsgConnectionOpenAck { @@ -1256,10 +1256,10 @@ export const MsgConnectionOpenConfirm = { }, toAmino(message: MsgConnectionOpenConfirm): MsgConnectionOpenConfirmAmino { const obj: any = {}; - obj.connection_id = message.connectionId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; obj.proof_ack = message.proofAck ? base64FromBytes(message.proofAck) : undefined; obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; - obj.signer = message.signer; + obj.signer = message.signer === "" ? undefined : message.signer; return obj; }, fromAminoMsg(object: MsgConnectionOpenConfirmAminoMsg): MsgConnectionOpenConfirm { diff --git a/__fixtures__/v-next/outputv4/ibc/core/port/v1/query.ts b/__fixtures__/v-next/outputv4/ibc/core/port/v1/query.ts index a22a3bdec4..6c07efd0d6 100644 --- a/__fixtures__/v-next/outputv4/ibc/core/port/v1/query.ts +++ b/__fixtures__/v-next/outputv4/ibc/core/port/v1/query.ts @@ -166,7 +166,7 @@ export const QueryAppVersionRequest = { message.connectionId = object.connection_id; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -178,11 +178,11 @@ export const QueryAppVersionRequest = { }, toAmino(message: QueryAppVersionRequest): QueryAppVersionRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.connection_id = message.connectionId; - obj.ordering = message.ordering; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.ordering = message.ordering === 0 ? undefined : message.ordering; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.proposed_version = message.proposedVersion; + obj.proposed_version = message.proposedVersion === "" ? undefined : message.proposedVersion; return obj; }, fromAminoMsg(object: QueryAppVersionRequestAminoMsg): QueryAppVersionRequest { @@ -292,8 +292,8 @@ export const QueryAppVersionResponse = { }, toAmino(message: QueryAppVersionResponse): QueryAppVersionResponseAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.version = message.version; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.version = message.version === "" ? undefined : message.version; return obj; }, fromAminoMsg(object: QueryAppVersionResponseAminoMsg): QueryAppVersionResponse { diff --git a/__fixtures__/v-next/outputv4/ibc/lightclients/localhost/v1/localhost.ts b/__fixtures__/v-next/outputv4/ibc/lightclients/localhost/v1/localhost.ts index 373d322c0d..2fe9922ee8 100644 --- a/__fixtures__/v-next/outputv4/ibc/lightclients/localhost/v1/localhost.ts +++ b/__fixtures__/v-next/outputv4/ibc/lightclients/localhost/v1/localhost.ts @@ -111,7 +111,7 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : message.chainId; obj.height = message.height ? Height.toAmino(message.height) : {}; return obj; }, diff --git a/__fixtures__/v-next/outputv4/ibc/lightclients/solomachine/v1/solomachine.ts b/__fixtures__/v-next/outputv4/ibc/lightclients/solomachine/v1/solomachine.ts index 56bcc4333e..5248697115 100644 --- a/__fixtures__/v-next/outputv4/ibc/lightclients/solomachine/v1/solomachine.ts +++ b/__fixtures__/v-next/outputv4/ibc/lightclients/solomachine/v1/solomachine.ts @@ -559,10 +559,10 @@ export const ClientState = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.frozen_sequence = message.frozenSequence !== BigInt(0) ? message.frozenSequence.toString() : undefined; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; - obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal === false ? undefined : message.allowUpdateAfterProposal; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -693,8 +693,8 @@ export const ConsensusState = { 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; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { @@ -858,11 +858,11 @@ export const Header = { }, toAmino(message: Header): HeaderAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderAminoMsg): Header { @@ -1010,8 +1010,8 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.sequence = message.sequence !== BigInt(0) ? 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; @@ -1145,7 +1145,7 @@ export const SignatureAndData = { message.signature = bytesFromBase64(object.signature); } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1158,9 +1158,9 @@ export const SignatureAndData = { toAmino(message: SignatureAndData): SignatureAndDataAmino { const obj: any = {}; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; - obj.data_type = message.dataType; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { @@ -1273,7 +1273,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { @@ -1426,7 +1426,7 @@ export const SignBytes = { message.diversifier = object.diversifier; } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1435,10 +1435,10 @@ export const SignBytes = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1552,7 +1552,7 @@ export const HeaderData = { toAmino(message: HeaderData): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { @@ -2433,7 +2433,7 @@ export const NextSequenceRecvData = { toAmino(message: NextSequenceRecvData): NextSequenceRecvDataAmino { const obj: any = {}; obj.path = message.path ? base64FromBytes(message.path) : undefined; - obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + obj.next_seq_recv = message.nextSeqRecv !== BigInt(0) ? message.nextSeqRecv.toString() : undefined; return obj; }, fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData { diff --git a/__fixtures__/v-next/outputv4/ibc/lightclients/solomachine/v2/solomachine.ts b/__fixtures__/v-next/outputv4/ibc/lightclients/solomachine/v2/solomachine.ts index d960b768f2..87fe47bfc0 100644 --- a/__fixtures__/v-next/outputv4/ibc/lightclients/solomachine/v2/solomachine.ts +++ b/__fixtures__/v-next/outputv4/ibc/lightclients/solomachine/v2/solomachine.ts @@ -557,10 +557,10 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.is_frozen = message.isFrozen; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.is_frozen = message.isFrozen === false ? undefined : message.isFrozen; obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; - obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal === false ? undefined : message.allowUpdateAfterProposal; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -691,8 +691,8 @@ export const ConsensusState = { 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; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { @@ -856,11 +856,11 @@ export const Header = { }, toAmino(message: Header): HeaderAmino { const obj: any = {}; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderAminoMsg): Header { @@ -1008,8 +1008,8 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; - obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.client_id = message.clientId === "" ? undefined : message.clientId; + obj.sequence = message.sequence !== BigInt(0) ? 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; @@ -1143,7 +1143,7 @@ export const SignatureAndData = { message.signature = bytesFromBase64(object.signature); } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1156,9 +1156,9 @@ export const SignatureAndData = { toAmino(message: SignatureAndData): SignatureAndDataAmino { const obj: any = {}; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; - obj.data_type = message.dataType; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { @@ -1271,7 +1271,7 @@ export const TimestampedSignatureData = { toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { const obj: any = {}; obj.signature_data = message.signatureData ? base64FromBytes(message.signatureData) : undefined; - obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; return obj; }, fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { @@ -1424,7 +1424,7 @@ export const SignBytes = { message.diversifier = object.diversifier; } if (object.data_type !== undefined && object.data_type !== null) { - message.dataType = dataTypeFromJSON(object.data_type); + message.dataType = object.data_type; } if (object.data !== undefined && object.data !== null) { message.data = bytesFromBase64(object.data); @@ -1433,10 +1433,10 @@ export const SignBytes = { }, 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.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp !== BigInt(0) ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier === "" ? undefined : message.diversifier; + obj.data_type = message.dataType === 0 ? undefined : message.dataType; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; }, @@ -1550,7 +1550,7 @@ export const HeaderData = { toAmino(message: HeaderData): HeaderDataAmino { const obj: any = {}; obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; - obj.new_diversifier = message.newDiversifier; + obj.new_diversifier = message.newDiversifier === "" ? undefined : message.newDiversifier; return obj; }, fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { @@ -2431,7 +2431,7 @@ export const NextSequenceRecvData = { toAmino(message: NextSequenceRecvData): NextSequenceRecvDataAmino { const obj: any = {}; obj.path = message.path ? base64FromBytes(message.path) : undefined; - obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + obj.next_seq_recv = message.nextSeqRecv !== BigInt(0) ? message.nextSeqRecv.toString() : undefined; return obj; }, fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData { diff --git a/__fixtures__/v-next/outputv4/ibc/lightclients/tendermint/v1/tendermint.ts b/__fixtures__/v-next/outputv4/ibc/lightclients/tendermint/v1/tendermint.ts index c9f9afcefe..d6152bc9fa 100644 --- a/__fixtures__/v-next/outputv4/ibc/lightclients/tendermint/v1/tendermint.ts +++ b/__fixtures__/v-next/outputv4/ibc/lightclients/tendermint/v1/tendermint.ts @@ -432,7 +432,7 @@ export const ClientState = { }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : 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; @@ -442,15 +442,15 @@ export const ClientState = { if (message.proofSpecs) { obj.proof_specs = message.proofSpecs.map(e => e ? ProofSpec.toAmino(e) : undefined); } else { - obj.proof_specs = []; + obj.proof_specs = message.proofSpecs; } if (message.upgradePath) { obj.upgrade_path = message.upgradePath.map(e => e); } else { - obj.upgrade_path = []; + obj.upgrade_path = message.upgradePath; } - obj.allow_update_after_expiry = message.allowUpdateAfterExpiry; - obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour; + obj.allow_update_after_expiry = message.allowUpdateAfterExpiry === false ? undefined : message.allowUpdateAfterExpiry; + obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour === false ? undefined : message.allowUpdateAfterMisbehaviour; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -710,7 +710,7 @@ export const Misbehaviour = { }, toAmino(message: Misbehaviour): MisbehaviourAmino { const obj: any = {}; - obj.client_id = message.clientId; + obj.client_id = message.clientId === "" ? undefined : message.clientId; obj.header_1 = message.header1 ? Header.toAmino(message.header1) : undefined; obj.header_2 = message.header2 ? Header.toAmino(message.header2) : undefined; return obj; @@ -979,8 +979,8 @@ export const Fraction = { }, toAmino(message: Fraction): FractionAmino { const obj: any = {}; - obj.numerator = message.numerator ? message.numerator.toString() : undefined; - obj.denominator = message.denominator ? message.denominator.toString() : undefined; + obj.numerator = message.numerator !== BigInt(0) ? message.numerator.toString() : undefined; + obj.denominator = message.denominator !== BigInt(0) ? message.denominator.toString() : undefined; return obj; }, fromAminoMsg(object: FractionAminoMsg): Fraction { diff --git a/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/claim.ts b/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/claim.ts index c7eae447ed..5bc987ed93 100644 --- a/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/claim.ts +++ b/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/claim.ts @@ -189,16 +189,16 @@ export const ClaimRecord = { }, toAmino(message: ClaimRecord): ClaimRecordAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; if (message.initialClaimableAmount) { obj.initial_claimable_amount = message.initialClaimableAmount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_claimable_amount = []; + obj.initial_claimable_amount = message.initialClaimableAmount; } if (message.actionCompleted) { obj.action_completed = message.actionCompleted.map(e => e); } else { - obj.action_completed = []; + obj.action_completed = message.actionCompleted; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/genesis.ts index 0046900270..5a1a0a2411 100644 --- a/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/genesis.ts @@ -139,7 +139,7 @@ export const GenesisState = { if (message.claimRecords) { obj.claim_records = message.claimRecords.map(e => e ? ClaimRecord.toAmino(e) : undefined); } else { - obj.claim_records = []; + obj.claim_records = message.claimRecords; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/params.ts b/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/params.ts index d3a558fa67..71c8eb7b1d 100644 --- a/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/params.ts @@ -146,7 +146,7 @@ export const Params = { obj.airdrop_start_time = message.airdropStartTime ? Timestamp.toAmino(toTimestamp(message.airdropStartTime)) : undefined; 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; + obj.claim_denom = message.claimDenom === "" ? undefined : message.claimDenom; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/query.ts b/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/query.ts index 59c72dbc53..760b9bf353 100644 --- a/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/osmosis/claim/v1beta1/query.ts @@ -260,7 +260,7 @@ export const QueryModuleAccountBalanceResponse = { if (message.moduleAccountBalance) { obj.moduleAccountBalance = message.moduleAccountBalance.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.moduleAccountBalance = []; + obj.moduleAccountBalance = message.moduleAccountBalance; } return obj; }, @@ -525,7 +525,7 @@ export const QueryClaimRecordRequest = { }, toAmino(message: QueryClaimRecordRequest): QueryClaimRecordRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryClaimRecordRequestAminoMsg): QueryClaimRecordRequest { @@ -725,14 +725,14 @@ export const QueryClaimableForActionRequest = { message.address = object.address; } if (object.action !== undefined && object.action !== null) { - message.action = actionFromJSON(object.action); + message.action = object.action; } return message; }, toAmino(message: QueryClaimableForActionRequest): QueryClaimableForActionRequestAmino { const obj: any = {}; - obj.address = message.address; - obj.action = message.action; + obj.address = message.address === "" ? undefined : message.address; + obj.action = message.action === 0 ? undefined : message.action; return obj; }, fromAminoMsg(object: QueryClaimableForActionRequestAminoMsg): QueryClaimableForActionRequest { @@ -835,7 +835,7 @@ export const QueryClaimableForActionResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -930,7 +930,7 @@ export const QueryTotalClaimableRequest = { }, toAmino(message: QueryTotalClaimableRequest): QueryTotalClaimableRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: QueryTotalClaimableRequestAminoMsg): QueryTotalClaimableRequest { @@ -1033,7 +1033,7 @@ export const QueryTotalClaimableResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/epochs/genesis.ts b/__fixtures__/v-next/outputv4/osmosis/epochs/genesis.ts index e41039e504..b5a7cb4406 100644 --- a/__fixtures__/v-next/outputv4/osmosis/epochs/genesis.ts +++ b/__fixtures__/v-next/outputv4/osmosis/epochs/genesis.ts @@ -261,13 +261,13 @@ export const EpochInfo = { }, toAmino(message: EpochInfo): EpochInfoAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; obj.current_epoch_start_time = message.currentEpochStartTime ? Timestamp.toAmino(toTimestamp(message.currentEpochStartTime)) : undefined; - obj.epoch_counting_started = message.epochCountingStarted; - obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + obj.epoch_counting_started = message.epochCountingStarted === false ? undefined : message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight !== BigInt(0) ? message.currentEpochStartHeight.toString() : undefined; return obj; }, fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo { @@ -370,7 +370,7 @@ export const GenesisState = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/epochs/query.ts b/__fixtures__/v-next/outputv4/osmosis/epochs/query.ts index f082f28211..ea9d933e90 100644 --- a/__fixtures__/v-next/outputv4/osmosis/epochs/query.ts +++ b/__fixtures__/v-next/outputv4/osmosis/epochs/query.ts @@ -190,7 +190,7 @@ export const QueryEpochsInfoResponse = { if (message.epochs) { obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); } else { - obj.epochs = []; + obj.epochs = message.epochs; } return obj; }, @@ -285,7 +285,7 @@ export const QueryCurrentEpochRequest = { }, toAmino(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAmino { const obj: any = {}; - obj.identifier = message.identifier; + obj.identifier = message.identifier === "" ? undefined : message.identifier; return obj; }, fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest { @@ -381,7 +381,7 @@ export const QueryCurrentEpochResponse = { }, toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { const obj: any = {}; - obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch = message.currentEpoch !== BigInt(0) ? message.currentEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse { diff --git a/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/balancer/balancerPool.ts b/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/balancer/balancerPool.ts index d5df8c4c97..2343660f0f 100644 --- a/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/balancer/balancerPool.ts +++ b/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/balancer/balancerPool.ts @@ -296,12 +296,12 @@ export const SmoothWeightChangeParams = { if (message.initialPoolWeights) { obj.initial_pool_weights = message.initialPoolWeights.map(e => e ? PoolAsset.toAmino(e) : undefined); } else { - obj.initial_pool_weights = []; + obj.initial_pool_weights = message.initialPoolWeights; } if (message.targetPoolWeights) { obj.target_pool_weights = message.targetPoolWeights.map(e => e ? PoolAsset.toAmino(e) : undefined); } else { - obj.target_pool_weights = []; + obj.target_pool_weights = message.targetPoolWeights; } return obj; }, @@ -430,8 +430,8 @@ export const PoolParams = { }, toAmino(message: PoolParams): PoolParamsAmino { const obj: any = {}; - obj.swap_fee = message.swapFee; - obj.exit_fee = message.exitFee; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; + obj.exit_fee = message.exitFee === "" ? undefined : message.exitFee; obj.smooth_weight_change_params = message.smoothWeightChangeParams ? SmoothWeightChangeParams.toAmino(message.smoothWeightChangeParams) : undefined; return obj; }, @@ -545,7 +545,7 @@ export const PoolAsset = { toAmino(message: PoolAsset): PoolAssetAmino { const obj: any = {}; obj.token = message.token ? Coin.toAmino(message.token) : undefined; - obj.weight = message.weight; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: PoolAssetAminoMsg): PoolAsset { @@ -747,17 +747,17 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.address = message.address; - obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : 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.pool_assets = message.poolAssets; } - obj.total_weight = message.totalWeight; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { diff --git a/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/balancer/tx/tx.ts b/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/balancer/tx/tx.ts index a063e5c721..f7ac466bd8 100644 --- a/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/balancer/tx/tx.ts +++ b/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/balancer/tx/tx.ts @@ -157,14 +157,14 @@ export const MsgCreateBalancerPool = { }, toAmino(message: MsgCreateBalancerPool): MsgCreateBalancerPoolAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : 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.pool_assets = message.poolAssets; } - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; return obj; }, fromAminoMsg(object: MsgCreateBalancerPoolAminoMsg): MsgCreateBalancerPool { @@ -260,7 +260,7 @@ export const MsgCreateBalancerPoolResponse = { }, toAmino(message: MsgCreateBalancerPoolResponse): MsgCreateBalancerPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateBalancerPoolResponseAminoMsg): MsgCreateBalancerPoolResponse { diff --git a/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts b/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts index 4e992c0f61..52dd53a9d3 100644 --- a/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts +++ b/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts @@ -152,8 +152,8 @@ export const PoolParams = { }, toAmino(message: PoolParams): PoolParamsAmino { const obj: any = {}; - obj.swap_fee = message.swapFee; - obj.exit_fee = message.exitFee; + obj.swap_fee = message.swapFee === "" ? undefined : message.swapFee; + obj.exit_fee = message.exitFee === "" ? undefined : message.exitFee; return obj; }, fromAminoMsg(object: PoolParamsAminoMsg): PoolParams { @@ -386,22 +386,22 @@ export const Pool = { }, toAmino(message: Pool): PoolAmino { const obj: any = {}; - obj.address = message.address; - obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; - obj.future_pool_governor = message.futurePoolGovernor; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : 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 = []; + obj.pool_liquidity = message.poolLiquidity; } if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } - obj.scaling_factor_controller = message.scalingFactorController; + obj.scaling_factor_controller = message.scalingFactorController === "" ? undefined : message.scalingFactorController; return obj; }, fromAminoMsg(object: PoolAminoMsg): Pool { diff --git a/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/stableswap/tx.ts b/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/stableswap/tx.ts index 6bcbe85987..54cebe6395 100644 --- a/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/stableswap/tx.ts +++ b/__fixtures__/v-next/outputv4/osmosis/gamm/pool-models/stableswap/tx.ts @@ -237,20 +237,20 @@ export const MsgCreateStableswapPool = { }, toAmino(message: MsgCreateStableswapPool): MsgCreateStableswapPoolAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : 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 = []; + obj.initial_pool_liquidity = message.initialPoolLiquidity; } if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } - obj.future_pool_governor = message.futurePoolGovernor; - obj.scaling_factor_controller = message.scalingFactorController; + obj.future_pool_governor = message.futurePoolGovernor === "" ? undefined : message.futurePoolGovernor; + obj.scaling_factor_controller = message.scalingFactorController === "" ? undefined : message.scalingFactorController; return obj; }, fromAminoMsg(object: MsgCreateStableswapPoolAminoMsg): MsgCreateStableswapPool { @@ -346,7 +346,7 @@ export const MsgCreateStableswapPoolResponse = { }, toAmino(message: MsgCreateStableswapPoolResponse): MsgCreateStableswapPoolResponseAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateStableswapPoolResponseAminoMsg): MsgCreateStableswapPoolResponse { @@ -489,12 +489,12 @@ export const MsgStableSwapAdjustScalingFactors = { }, toAmino(message: MsgStableSwapAdjustScalingFactors): MsgStableSwapAdjustScalingFactorsAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.scalingFactors) { obj.scaling_factors = message.scalingFactors.map(e => e.toString()); } else { - obj.scaling_factors = []; + obj.scaling_factors = message.scalingFactors; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/gamm/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/osmosis/gamm/v1beta1/genesis.ts index e8c5b774a0..bf076f10b6 100644 --- a/__fixtures__/v-next/outputv4/osmosis/gamm/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/osmosis/gamm/v1beta1/genesis.ts @@ -110,7 +110,7 @@ export const Params = { if (message.poolCreationFee) { obj.pool_creation_fee = message.poolCreationFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.pool_creation_fee = []; + obj.pool_creation_fee = message.poolCreationFee; } return obj; }, @@ -250,9 +250,9 @@ export const GenesisState = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } - obj.next_pool_number = message.nextPoolNumber ? message.nextPoolNumber.toString() : undefined; + obj.next_pool_number = message.nextPoolNumber !== BigInt(0) ? message.nextPoolNumber.toString() : undefined; obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/gamm/v1beta1/query.ts b/__fixtures__/v-next/outputv4/osmosis/gamm/v1beta1/query.ts index d52f44c604..6157ab7910 100644 --- a/__fixtures__/v-next/outputv4/osmosis/gamm/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/osmosis/gamm/v1beta1/query.ts @@ -452,7 +452,7 @@ export const QueryPoolRequest = { }, toAmino(message: QueryPoolRequest): QueryPoolRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolRequestAminoMsg): QueryPoolRequest { @@ -765,7 +765,7 @@ export const QueryPoolsResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -937,7 +937,7 @@ export const QueryNumPoolsResponse = { }, toAmino(message: QueryNumPoolsResponse): QueryNumPoolsResponseAmino { const obj: any = {}; - obj.num_pools = message.numPools ? message.numPools.toString() : undefined; + obj.num_pools = message.numPools !== BigInt(0) ? message.numPools.toString() : undefined; return obj; }, fromAminoMsg(object: QueryNumPoolsResponseAminoMsg): QueryNumPoolsResponse { @@ -1033,7 +1033,7 @@ export const QueryPoolTypeRequest = { }, toAmino(message: QueryPoolTypeRequest): QueryPoolTypeRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolTypeRequestAminoMsg): QueryPoolTypeRequest { @@ -1127,7 +1127,7 @@ export const QueryPoolTypeResponse = { }, toAmino(message: QueryPoolTypeResponse): QueryPoolTypeResponseAmino { const obj: any = {}; - obj.pool_type = message.poolType; + obj.pool_type = message.poolType === "" ? undefined : message.poolType; return obj; }, fromAminoMsg(object: QueryPoolTypeResponseAminoMsg): QueryPoolTypeResponse { @@ -1245,11 +1245,11 @@ export const QueryCalcJoinPoolSharesRequest = { }, toAmino(message: QueryCalcJoinPoolSharesRequest): QueryCalcJoinPoolSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.tokensIn) { obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_in = []; + obj.tokens_in = message.tokensIn; } return obj; }, @@ -1366,11 +1366,11 @@ export const QueryCalcJoinPoolSharesResponse = { }, toAmino(message: QueryCalcJoinPoolSharesResponse): QueryCalcJoinPoolSharesResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } return obj; }, @@ -1483,8 +1483,8 @@ export const QueryCalcExitPoolCoinsFromSharesRequest = { }, toAmino(message: QueryCalcExitPoolCoinsFromSharesRequest): QueryCalcExitPoolCoinsFromSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.share_in_amount = message.shareInAmount; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; return obj; }, fromAminoMsg(object: QueryCalcExitPoolCoinsFromSharesRequestAminoMsg): QueryCalcExitPoolCoinsFromSharesRequest { @@ -1587,7 +1587,7 @@ export const QueryCalcExitPoolCoinsFromSharesResponse = { if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } return obj; }, @@ -1684,7 +1684,7 @@ export const QueryPoolParamsRequest = { }, toAmino(message: QueryPoolParamsRequest): QueryPoolParamsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryPoolParamsRequestAminoMsg): QueryPoolParamsRequest { @@ -1876,7 +1876,7 @@ export const QueryTotalPoolLiquidityRequest = { }, toAmino(message: QueryTotalPoolLiquidityRequest): QueryTotalPoolLiquidityRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTotalPoolLiquidityRequestAminoMsg): QueryTotalPoolLiquidityRequest { @@ -1979,7 +1979,7 @@ export const QueryTotalPoolLiquidityResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, @@ -2076,7 +2076,7 @@ export const QueryTotalSharesRequest = { }, toAmino(message: QueryTotalSharesRequest): QueryTotalSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryTotalSharesRequestAminoMsg): QueryTotalSharesRequest { @@ -2290,11 +2290,11 @@ export const QueryCalcJoinPoolNoSwapSharesRequest = { }, toAmino(message: QueryCalcJoinPoolNoSwapSharesRequest): QueryCalcJoinPoolNoSwapSharesRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.tokensIn) { obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_in = []; + obj.tokens_in = message.tokensIn; } return obj; }, @@ -2414,9 +2414,9 @@ export const QueryCalcJoinPoolNoSwapSharesResponse = { if (message.tokensOut) { obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.tokens_out = []; + obj.tokens_out = message.tokensOut; } - obj.shares_out = message.sharesOut; + obj.shares_out = message.sharesOut === "" ? undefined : message.sharesOut; return obj; }, fromAminoMsg(object: QueryCalcJoinPoolNoSwapSharesResponseAminoMsg): QueryCalcJoinPoolNoSwapSharesResponse { @@ -2544,9 +2544,9 @@ export const QuerySpotPriceRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest { @@ -2683,9 +2683,9 @@ export const QueryPoolsWithFilterRequest = { if (message.minLiquidity) { obj.min_liquidity = message.minLiquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_liquidity = []; + obj.min_liquidity = message.minLiquidity; } - obj.pool_type = message.poolType; + obj.pool_type = message.poolType === "" ? undefined : message.poolType; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -2807,7 +2807,7 @@ export const QueryPoolsWithFilterResponse = { if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -2903,7 +2903,7 @@ export const QuerySpotPriceResponse = { }, toAmino(message: QuerySpotPriceResponse): QuerySpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse { @@ -3053,13 +3053,13 @@ export const QuerySwapExactAmountInRequest = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn === "" ? undefined : message.tokenIn; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } return obj; }, @@ -3154,7 +3154,7 @@ export const QuerySwapExactAmountInResponse = { }, toAmino(message: QuerySwapExactAmountInResponse): QuerySwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: QuerySwapExactAmountInResponseAminoMsg): QuerySwapExactAmountInResponse { @@ -3304,14 +3304,14 @@ export const QuerySwapExactAmountOutRequest = { }, toAmino(message: QuerySwapExactAmountOutRequest): QuerySwapExactAmountOutRequestAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_out = message.tokenOut; + obj.token_out = message.tokenOut === "" ? undefined : message.tokenOut; return obj; }, fromAminoMsg(object: QuerySwapExactAmountOutRequestAminoMsg): QuerySwapExactAmountOutRequest { @@ -3405,7 +3405,7 @@ export const QuerySwapExactAmountOutResponse = { }, toAmino(message: QuerySwapExactAmountOutResponse): QuerySwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: QuerySwapExactAmountOutResponseAminoMsg): QuerySwapExactAmountOutResponse { @@ -3582,7 +3582,7 @@ export const QueryTotalLiquidityResponse = { if (message.liquidity) { obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.liquidity = []; + obj.liquidity = message.liquidity; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/gamm/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/osmosis/gamm/v1beta1/tx.ts index f22c1c47f7..cc37726c6d 100644 --- a/__fixtures__/v-next/outputv4/osmosis/gamm/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/osmosis/gamm/v1beta1/tx.ts @@ -393,13 +393,13 @@ export const MsgJoinPool = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenInMaxs) { obj.token_in_maxs = message.tokenInMaxs.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_in_maxs = []; + obj.token_in_maxs = message.tokenInMaxs; } return obj; }, @@ -516,11 +516,11 @@ export const MsgJoinPoolResponse = { }, toAmino(message: MsgJoinPoolResponse): MsgJoinPoolResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenIn) { obj.token_in = message.tokenIn.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_in = []; + obj.token_in = message.tokenIn; } return obj; }, @@ -671,13 +671,13 @@ export const MsgExitPool = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; if (message.tokenOutMins) { obj.token_out_mins = message.tokenOutMins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_out_mins = []; + obj.token_out_mins = message.tokenOutMins; } return obj; }, @@ -781,7 +781,7 @@ export const MsgExitPoolResponse = { if (message.tokenOut) { obj.token_out = message.tokenOut.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_out = []; + obj.token_out = message.tokenOut; } return obj; }, @@ -894,8 +894,8 @@ export const SwapAmountInRoute = { }, toAmino(message: SwapAmountInRoute): SwapAmountInRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_out_denom = message.tokenOutDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; return obj; }, fromAminoMsg(object: SwapAmountInRouteAminoMsg): SwapAmountInRoute { @@ -1045,14 +1045,14 @@ export const MsgSwapExactAmountIn = { }, toAmino(message: MsgSwapExactAmountIn): MsgSwapExactAmountInAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; - obj.token_out_min_amount = message.tokenOutMinAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInAminoMsg): MsgSwapExactAmountIn { @@ -1146,7 +1146,7 @@ export const MsgSwapExactAmountInResponse = { }, toAmino(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInResponseAminoMsg): MsgSwapExactAmountInResponse { @@ -1258,8 +1258,8 @@ export const SwapAmountOutRoute = { }, toAmino(message: SwapAmountOutRoute): SwapAmountOutRouteAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; - obj.token_in_denom = message.tokenInDenom; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; return obj; }, fromAminoMsg(object: SwapAmountOutRouteAminoMsg): SwapAmountOutRoute { @@ -1409,13 +1409,13 @@ export const MsgSwapExactAmountOut = { }, toAmino(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_in_max_amount = message.tokenInMaxAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; return obj; }, @@ -1510,7 +1510,7 @@ export const MsgSwapExactAmountOutResponse = { }, toAmino(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountOutResponseAminoMsg): MsgSwapExactAmountOutResponse { @@ -1656,10 +1656,10 @@ export const MsgJoinSwapExternAmountIn = { }, toAmino(message: MsgJoinSwapExternAmountIn): MsgJoinSwapExternAmountInAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; - obj.share_out_min_amount = message.shareOutMinAmount; + obj.share_out_min_amount = message.shareOutMinAmount === "" ? undefined : message.shareOutMinAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapExternAmountInAminoMsg): MsgJoinSwapExternAmountIn { @@ -1753,7 +1753,7 @@ export const MsgJoinSwapExternAmountInResponse = { }, toAmino(message: MsgJoinSwapExternAmountInResponse): MsgJoinSwapExternAmountInResponseAmino { const obj: any = {}; - obj.share_out_amount = message.shareOutAmount; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapExternAmountInResponseAminoMsg): MsgJoinSwapExternAmountInResponse { @@ -1913,11 +1913,11 @@ export const MsgJoinSwapShareAmountOut = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom === "" ? undefined : message.tokenInDenom; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapShareAmountOutAminoMsg): MsgJoinSwapShareAmountOut { @@ -2011,7 +2011,7 @@ export const MsgJoinSwapShareAmountOutResponse = { }, toAmino(message: MsgJoinSwapShareAmountOutResponse): MsgJoinSwapShareAmountOutResponseAmino { const obj: any = {}; - obj.token_in_amount = message.tokenInAmount; + obj.token_in_amount = message.tokenInAmount === "" ? undefined : message.tokenInAmount; return obj; }, fromAminoMsg(object: MsgJoinSwapShareAmountOutResponseAminoMsg): MsgJoinSwapShareAmountOutResponse { @@ -2171,11 +2171,11 @@ export const MsgExitSwapShareAmountIn = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom === "" ? undefined : message.tokenOutDenom; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromAminoMsg(object: MsgExitSwapShareAmountInAminoMsg): MsgExitSwapShareAmountIn { @@ -2269,7 +2269,7 @@ export const MsgExitSwapShareAmountInResponse = { }, toAmino(message: MsgExitSwapShareAmountInResponse): MsgExitSwapShareAmountInResponseAmino { const obj: any = {}; - obj.token_out_amount = message.tokenOutAmount; + obj.token_out_amount = message.tokenOutAmount === "" ? undefined : message.tokenOutAmount; return obj; }, fromAminoMsg(object: MsgExitSwapShareAmountInResponseAminoMsg): MsgExitSwapShareAmountInResponse { @@ -2415,10 +2415,10 @@ export const MsgExitSwapExternAmountOut = { }, toAmino(message: MsgExitSwapExternAmountOut): MsgExitSwapExternAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; - obj.share_in_max_amount = message.shareInMaxAmount; + obj.share_in_max_amount = message.shareInMaxAmount === "" ? undefined : message.shareInMaxAmount; return obj; }, fromAminoMsg(object: MsgExitSwapExternAmountOutAminoMsg): MsgExitSwapExternAmountOut { @@ -2512,7 +2512,7 @@ export const MsgExitSwapExternAmountOutResponse = { }, toAmino(message: MsgExitSwapExternAmountOutResponse): MsgExitSwapExternAmountOutResponseAmino { const obj: any = {}; - obj.share_in_amount = message.shareInAmount; + obj.share_in_amount = message.shareInAmount === "" ? undefined : message.shareInAmount; return obj; }, fromAminoMsg(object: MsgExitSwapExternAmountOutResponseAminoMsg): MsgExitSwapExternAmountOutResponse { diff --git a/__fixtures__/v-next/outputv4/osmosis/gamm/v2/query.ts b/__fixtures__/v-next/outputv4/osmosis/gamm/v2/query.ts index 1d0fdc8495..69c0eb93a8 100644 --- a/__fixtures__/v-next/outputv4/osmosis/gamm/v2/query.ts +++ b/__fixtures__/v-next/outputv4/osmosis/gamm/v2/query.ts @@ -145,9 +145,9 @@ export const QuerySpotPriceRequest = { }, 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; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom === "" ? undefined : message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom === "" ? undefined : message.quoteAssetDenom; return obj; }, fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest { @@ -241,7 +241,7 @@ export const QuerySpotPriceResponse = { }, toAmino(message: QuerySpotPriceResponse): QuerySpotPriceResponseAmino { const obj: any = {}; - obj.spot_price = message.spotPrice; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse { diff --git a/__fixtures__/v-next/outputv4/osmosis/ibc-rate-limit/v1beta1/params.ts b/__fixtures__/v-next/outputv4/osmosis/ibc-rate-limit/v1beta1/params.ts index c24264e4f9..0988ddc5f2 100644 --- a/__fixtures__/v-next/outputv4/osmosis/ibc-rate-limit/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv4/osmosis/ibc-rate-limit/v1beta1/params.ts @@ -82,7 +82,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/osmosis/incentives/gauge.ts b/__fixtures__/v-next/outputv4/osmosis/incentives/gauge.ts index baddae7a6b..9eb54c3651 100644 --- a/__fixtures__/v-next/outputv4/osmosis/incentives/gauge.ts +++ b/__fixtures__/v-next/outputv4/osmosis/incentives/gauge.ts @@ -277,21 +277,21 @@ export const Gauge = { }, toAmino(message: Gauge): GaugeAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; - obj.is_perpetual = message.isPerpetual; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; + obj.is_perpetual = message.isPerpetual === false ? undefined : 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.coins = message.coins; } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; - obj.filled_epochs = message.filledEpochs ? message.filledEpochs.toString() : undefined; + obj.num_epochs_paid_over = message.numEpochsPaidOver !== BigInt(0) ? message.numEpochsPaidOver.toString() : undefined; + obj.filled_epochs = message.filledEpochs !== BigInt(0) ? message.filledEpochs.toString() : undefined; if (message.distributedCoins) { obj.distributed_coins = message.distributedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.distributed_coins = []; + obj.distributed_coins = message.distributedCoins; } return obj; }, @@ -395,7 +395,7 @@ export const LockableDurationsInfo = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/incentives/genesis.ts b/__fixtures__/v-next/outputv4/osmosis/incentives/genesis.ts index f4c27851fc..8fca4595f6 100644 --- a/__fixtures__/v-next/outputv4/osmosis/incentives/genesis.ts +++ b/__fixtures__/v-next/outputv4/osmosis/incentives/genesis.ts @@ -175,14 +175,14 @@ export const GenesisState = { if (message.gauges) { obj.gauges = message.gauges.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.gauges = []; + obj.gauges = message.gauges; } if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } - obj.last_gauge_id = message.lastGaugeId ? message.lastGaugeId.toString() : undefined; + obj.last_gauge_id = message.lastGaugeId !== BigInt(0) ? message.lastGaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputv4/osmosis/incentives/params.ts b/__fixtures__/v-next/outputv4/osmosis/incentives/params.ts index 0f7917d5bd..8a9358b50c 100644 --- a/__fixtures__/v-next/outputv4/osmosis/incentives/params.ts +++ b/__fixtures__/v-next/outputv4/osmosis/incentives/params.ts @@ -86,7 +86,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.distr_epoch_identifier = message.distrEpochIdentifier; + obj.distr_epoch_identifier = message.distrEpochIdentifier === "" ? undefined : message.distrEpochIdentifier; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/osmosis/incentives/query.ts b/__fixtures__/v-next/outputv4/osmosis/incentives/query.ts index ba82d0e35c..c78c530b74 100644 --- a/__fixtures__/v-next/outputv4/osmosis/incentives/query.ts +++ b/__fixtures__/v-next/outputv4/osmosis/incentives/query.ts @@ -378,7 +378,7 @@ export const ModuleToDistributeCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -475,7 +475,7 @@ export const GaugeByIDRequest = { }, toAmino(message: GaugeByIDRequest): GaugeByIDRequestAmino { const obj: any = {}; - obj.id = message.id ? message.id.toString() : undefined; + obj.id = message.id !== BigInt(0) ? message.id.toString() : undefined; return obj; }, fromAminoMsg(object: GaugeByIDRequestAminoMsg): GaugeByIDRequest { @@ -788,7 +788,7 @@ export const GaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1007,7 +1007,7 @@ export const ActiveGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1121,7 +1121,7 @@ export const ActiveGaugesPerDenomRequest = { }, toAmino(message: ActiveGaugesPerDenomRequest): ActiveGaugesPerDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1243,7 +1243,7 @@ export const ActiveGaugesPerDenomResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1462,7 +1462,7 @@ export const UpcomingGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1576,7 +1576,7 @@ export const UpcomingGaugesPerDenomRequest = { }, toAmino(message: UpcomingGaugesPerDenomRequest): UpcomingGaugesPerDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; return obj; }, @@ -1698,7 +1698,7 @@ export const UpcomingGaugesPerDenomResponse = { if (message.upcomingGauges) { obj.upcoming_gauges = message.upcomingGauges.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.upcoming_gauges = []; + obj.upcoming_gauges = message.upcomingGauges; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1843,13 +1843,13 @@ export const RewardsEstRequest = { }, toAmino(message: RewardsEstRequest): RewardsEstRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; if (message.lockIds) { obj.lock_ids = message.lockIds.map(e => e.toString()); } else { - obj.lock_ids = []; + obj.lock_ids = message.lockIds; } - obj.end_epoch = message.endEpoch ? message.endEpoch.toString() : undefined; + obj.end_epoch = message.endEpoch !== BigInt(0) ? message.endEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: RewardsEstRequestAminoMsg): RewardsEstRequest { @@ -1952,7 +1952,7 @@ export const RewardsEstResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -2130,7 +2130,7 @@ export const QueryLockableDurationsResponse = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/incentives/tx.ts b/__fixtures__/v-next/outputv4/osmosis/incentives/tx.ts index 2413baf192..6fb60a8117 100644 --- a/__fixtures__/v-next/outputv4/osmosis/incentives/tx.ts +++ b/__fixtures__/v-next/outputv4/osmosis/incentives/tx.ts @@ -234,16 +234,16 @@ export const MsgCreateGauge = { }, toAmino(message: MsgCreateGauge): MsgCreateGaugeAmino { const obj: any = {}; - obj.is_perpetual = message.isPerpetual; - obj.owner = message.owner; + obj.is_perpetual = message.isPerpetual === false ? undefined : message.isPerpetual; + obj.owner = message.owner === "" ? undefined : 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.coins = message.coins; } obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; - obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; + obj.num_epochs_paid_over = message.numEpochsPaidOver !== BigInt(0) ? message.numEpochsPaidOver.toString() : undefined; return obj; }, fromAminoMsg(object: MsgCreateGaugeAminoMsg): MsgCreateGauge { @@ -451,12 +451,12 @@ export const MsgAddToGauge = { }, toAmino(message: MsgAddToGauge): MsgAddToGaugeAmino { const obj: any = {}; - obj.owner = message.owner; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; if (message.rewards) { obj.rewards = message.rewards.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.rewards = []; + obj.rewards = message.rewards; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/lockup/genesis.ts b/__fixtures__/v-next/outputv4/osmosis/lockup/genesis.ts index a5912d2253..fa76db0580 100644 --- a/__fixtures__/v-next/outputv4/osmosis/lockup/genesis.ts +++ b/__fixtures__/v-next/outputv4/osmosis/lockup/genesis.ts @@ -133,16 +133,16 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.last_lock_id = message.lastLockId ? message.lastLockId.toString() : undefined; + obj.last_lock_id = message.lastLockId !== BigInt(0) ? message.lastLockId.toString() : undefined; if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputv4/osmosis/lockup/lock.ts index bd0078925f..0b299f3be4 100644 --- a/__fixtures__/v-next/outputv4/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputv4/osmosis/lockup/lock.ts @@ -315,14 +315,14 @@ export const PeriodLock = { }, toAmino(message: PeriodLock): PeriodLockAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; - obj.owner = message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -452,7 +452,7 @@ export const QueryCondition = { fromAmino(object: QueryConditionAmino): QueryCondition { const message = createBaseQueryCondition(); if (object.lock_query_type !== undefined && object.lock_query_type !== null) { - message.lockQueryType = lockQueryTypeFromJSON(object.lock_query_type); + message.lockQueryType = object.lock_query_type; } if (object.denom !== undefined && object.denom !== null) { message.denom = object.denom; @@ -467,8 +467,8 @@ export const QueryCondition = { }, toAmino(message: QueryCondition): QueryConditionAmino { const obj: any = {}; - obj.lock_query_type = message.lockQueryType; - obj.denom = message.denom; + obj.lock_query_type = message.lockQueryType === 0 ? undefined : message.lockQueryType; + obj.denom = message.denom === "" ? undefined : message.denom; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; @@ -616,8 +616,8 @@ export const SyntheticLock = { }, toAmino(message: SyntheticLock): SyntheticLockAmino { const obj: any = {}; - obj.underlying_lock_id = message.underlyingLockId ? message.underlyingLockId.toString() : undefined; - obj.synth_denom = message.synthDenom; + obj.underlying_lock_id = message.underlyingLockId !== BigInt(0) ? message.underlyingLockId.toString() : undefined; + obj.synth_denom = message.synthDenom === "" ? undefined : message.synthDenom; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/osmosis/lockup/params.ts b/__fixtures__/v-next/outputv4/osmosis/lockup/params.ts index 6688646110..76927d2be8 100644 --- a/__fixtures__/v-next/outputv4/osmosis/lockup/params.ts +++ b/__fixtures__/v-next/outputv4/osmosis/lockup/params.ts @@ -89,7 +89,7 @@ export const Params = { if (message.forceUnlockAllowedAddresses) { obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses.map(e => e); } else { - obj.force_unlock_allowed_addresses = []; + obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/lockup/query.ts b/__fixtures__/v-next/outputv4/osmosis/lockup/query.ts index 8d5341ea32..610bbb6503 100644 --- a/__fixtures__/v-next/outputv4/osmosis/lockup/query.ts +++ b/__fixtures__/v-next/outputv4/osmosis/lockup/query.ts @@ -508,7 +508,7 @@ export const ModuleBalanceResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -686,7 +686,7 @@ export const ModuleLockedAmountResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -781,7 +781,7 @@ export const AccountUnlockableCoinsRequest = { }, toAmino(message: AccountUnlockableCoinsRequest): AccountUnlockableCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountUnlockableCoinsRequestAminoMsg): AccountUnlockableCoinsRequest { @@ -884,7 +884,7 @@ export const AccountUnlockableCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -979,7 +979,7 @@ export const AccountUnlockingCoinsRequest = { }, toAmino(message: AccountUnlockingCoinsRequest): AccountUnlockingCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountUnlockingCoinsRequestAminoMsg): AccountUnlockingCoinsRequest { @@ -1082,7 +1082,7 @@ export const AccountUnlockingCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1177,7 +1177,7 @@ export const AccountLockedCoinsRequest = { }, toAmino(message: AccountLockedCoinsRequest): AccountLockedCoinsRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: AccountLockedCoinsRequestAminoMsg): AccountLockedCoinsRequest { @@ -1280,7 +1280,7 @@ export const AccountLockedCoinsResponse = { if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1391,7 +1391,7 @@ export const AccountLockedPastTimeRequest = { }, toAmino(message: AccountLockedPastTimeRequest): AccountLockedPastTimeRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1495,7 +1495,7 @@ export const AccountLockedPastTimeResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1606,7 +1606,7 @@ export const AccountLockedPastTimeNotUnlockingOnlyRequest = { }, toAmino(message: AccountLockedPastTimeNotUnlockingOnlyRequest): AccountLockedPastTimeNotUnlockingOnlyRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1710,7 +1710,7 @@ export const AccountLockedPastTimeNotUnlockingOnlyResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -1821,7 +1821,7 @@ export const AccountUnlockedBeforeTimeRequest = { }, toAmino(message: AccountUnlockedBeforeTimeRequest): AccountUnlockedBeforeTimeRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -1925,7 +1925,7 @@ export const AccountUnlockedBeforeTimeResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2052,9 +2052,9 @@ export const AccountLockedPastTimeDenomRequest = { }, toAmino(message: AccountLockedPastTimeDenomRequest): AccountLockedPastTimeDenomRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AccountLockedPastTimeDenomRequestAminoMsg): AccountLockedPastTimeDenomRequest { @@ -2157,7 +2157,7 @@ export const AccountLockedPastTimeDenomResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -2270,7 +2270,7 @@ export const LockedDenomRequest = { }, toAmino(message: LockedDenomRequest): LockedDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -2365,7 +2365,7 @@ export const LockedDenomResponse = { }, toAmino(message: LockedDenomResponse): LockedDenomResponseAmino { const obj: any = {}; - obj.amount = message.amount; + obj.amount = message.amount === "" ? undefined : message.amount; return obj; }, fromAminoMsg(object: LockedDenomResponseAminoMsg): LockedDenomResponse { @@ -2461,7 +2461,7 @@ export const LockedRequest = { }, toAmino(message: LockedRequest): LockedRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: LockedRequestAminoMsg): LockedRequest { @@ -2653,7 +2653,7 @@ export const SyntheticLockupsByLockupIDRequest = { }, toAmino(message: SyntheticLockupsByLockupIDRequest): SyntheticLockupsByLockupIDRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: SyntheticLockupsByLockupIDRequestAminoMsg): SyntheticLockupsByLockupIDRequest { @@ -2756,7 +2756,7 @@ export const SyntheticLockupsByLockupIDResponse = { if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, @@ -2869,7 +2869,7 @@ export const AccountLockedLongerDurationRequest = { }, toAmino(message: AccountLockedLongerDurationRequest): AccountLockedLongerDurationRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -2973,7 +2973,7 @@ export const AccountLockedLongerDurationResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3086,7 +3086,7 @@ export const AccountLockedDurationRequest = { }, toAmino(message: AccountLockedDurationRequest): AccountLockedDurationRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -3190,7 +3190,7 @@ export const AccountLockedDurationResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3303,7 +3303,7 @@ export const AccountLockedLongerDurationNotUnlockingOnlyRequest = { }, toAmino(message: AccountLockedLongerDurationNotUnlockingOnlyRequest): AccountLockedLongerDurationNotUnlockingOnlyRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -3407,7 +3407,7 @@ export const AccountLockedLongerDurationNotUnlockingOnlyResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, @@ -3536,9 +3536,9 @@ export const AccountLockedLongerDurationDenomRequest = { }, toAmino(message: AccountLockedLongerDurationDenomRequest): AccountLockedLongerDurationDenomRequestAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AccountLockedLongerDurationDenomRequestAminoMsg): AccountLockedLongerDurationDenomRequest { @@ -3641,7 +3641,7 @@ export const AccountLockedLongerDurationDenomResponse = { if (message.locks) { obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.locks = []; + obj.locks = message.locks; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputv4/osmosis/lockup/tx.ts index 345bd2487e..12fe8486f3 100644 --- a/__fixtures__/v-next/outputv4/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputv4/osmosis/lockup/tx.ts @@ -251,12 +251,12 @@ export const MsgLockTokens = { }, toAmino(message: MsgLockTokens): MsgLockTokensAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : 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 = []; + obj.coins = message.coins; } return obj; }, @@ -353,7 +353,7 @@ export const MsgLockTokensResponse = { }, toAmino(message: MsgLockTokensResponse): MsgLockTokensResponseAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockTokensResponseAminoMsg): MsgLockTokensResponse { @@ -447,7 +447,7 @@ export const MsgBeginUnlockingAll = { }, toAmino(message: MsgBeginUnlockingAll): MsgBeginUnlockingAllAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : message.owner; return obj; }, fromAminoMsg(object: MsgBeginUnlockingAllAminoMsg): MsgBeginUnlockingAll { @@ -550,7 +550,7 @@ export const MsgBeginUnlockingAllResponse = { if (message.unlocks) { obj.unlocks = message.unlocks.map(e => e ? PeriodLock.toAmino(e) : undefined); } else { - obj.unlocks = []; + obj.unlocks = message.unlocks; } return obj; }, @@ -685,12 +685,12 @@ export const MsgBeginUnlocking = { }, toAmino(message: MsgBeginUnlocking): MsgBeginUnlockingAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -785,7 +785,7 @@ export const MsgBeginUnlockingResponse = { }, toAmino(message: MsgBeginUnlockingResponse): MsgBeginUnlockingResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgBeginUnlockingResponseAminoMsg): MsgBeginUnlockingResponse { @@ -915,8 +915,8 @@ export const MsgExtendLockup = { }, toAmino(message: MsgExtendLockup): MsgExtendLockupAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -1011,7 +1011,7 @@ export const MsgExtendLockupResponse = { }, toAmino(message: MsgExtendLockupResponse): MsgExtendLockupResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgExtendLockupResponseAminoMsg): MsgExtendLockupResponse { @@ -1145,12 +1145,12 @@ export const MsgForceUnlock = { }, toAmino(message: MsgForceUnlock): MsgForceUnlockAmino { const obj: any = {}; - obj.owner = message.owner; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner === "" ? undefined : message.owner; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } return obj; }, @@ -1245,7 +1245,7 @@ export const MsgForceUnlockResponse = { }, toAmino(message: MsgForceUnlockResponse): MsgForceUnlockResponseAmino { const obj: any = {}; - obj.success = message.success; + obj.success = message.success === false ? undefined : message.success; return obj; }, fromAminoMsg(object: MsgForceUnlockResponseAminoMsg): MsgForceUnlockResponse { diff --git a/__fixtures__/v-next/outputv4/osmosis/mint/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/osmosis/mint/v1beta1/genesis.ts index e2474a70b7..366c3b7419 100644 --- a/__fixtures__/v-next/outputv4/osmosis/mint/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/osmosis/mint/v1beta1/genesis.ts @@ -133,7 +133,7 @@ export const GenesisState = { 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; + obj.reduction_started_epoch = message.reductionStartedEpoch !== BigInt(0) ? message.reductionStartedEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/__fixtures__/v-next/outputv4/osmosis/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputv4/osmosis/mint/v1beta1/mint.ts index 34351fddb5..8b83124382 100644 --- a/__fixtures__/v-next/outputv4/osmosis/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputv4/osmosis/mint/v1beta1/mint.ts @@ -200,7 +200,7 @@ export const Minter = { }, toAmino(message: Minter): MinterAmino { const obj: any = {}; - obj.epoch_provisions = message.epochProvisions; + obj.epoch_provisions = message.epochProvisions === "" ? undefined : message.epochProvisions; return obj; }, fromAminoMsg(object: MinterAminoMsg): Minter { @@ -310,8 +310,8 @@ export const WeightedAddress = { }, toAmino(message: WeightedAddress): WeightedAddressAmino { const obj: any = {}; - obj.address = message.address; - obj.weight = message.weight; + obj.address = message.address === "" ? undefined : message.address; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: WeightedAddressAminoMsg): WeightedAddress { @@ -453,10 +453,10 @@ export const DistributionProportions = { }, 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; + obj.staking = message.staking === "" ? undefined : message.staking; + obj.pool_incentives = message.poolIncentives === "" ? undefined : message.poolIncentives; + obj.developer_rewards = message.developerRewards === "" ? undefined : message.developerRewards; + obj.community_pool = message.communityPool === "" ? undefined : message.communityPool; return obj; }, fromAminoMsg(object: DistributionProportionsAminoMsg): DistributionProportions { @@ -674,18 +674,18 @@ export const Params = { }, 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.mint_denom = message.mintDenom === "" ? undefined : message.mintDenom; + obj.genesis_epoch_provisions = message.genesisEpochProvisions === "" ? undefined : message.genesisEpochProvisions; + obj.epoch_identifier = message.epochIdentifier === "" ? undefined : message.epochIdentifier; + obj.reduction_period_in_epochs = message.reductionPeriodInEpochs !== BigInt(0) ? message.reductionPeriodInEpochs.toString() : undefined; + obj.reduction_factor = message.reductionFactor === "" ? undefined : 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.weighted_developer_rewards_receivers = message.weightedDeveloperRewardsReceivers; } - obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; + obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch !== BigInt(0) ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/genesis.ts index b29808c96d..0315f713e4 100644 --- a/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/genesis.ts @@ -155,7 +155,7 @@ export const GenesisState = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } obj.distr_info = message.distrInfo ? DistrInfo.toAmino(message.distrInfo) : undefined; obj.pool_to_gauges = message.poolToGauges ? PoolToGauges.toAmino(message.poolToGauges) : undefined; diff --git a/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/gov.ts b/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/gov.ts index 009320c035..ed45704525 100644 --- a/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/gov.ts @@ -173,12 +173,12 @@ export const ReplacePoolIncentivesProposal = { }, toAmino(message: ReplacePoolIncentivesProposal): ReplacePoolIncentivesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, @@ -311,12 +311,12 @@ export const UpdatePoolIncentivesProposal = { }, toAmino(message: UpdatePoolIncentivesProposal): UpdatePoolIncentivesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/incentives.ts b/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/incentives.ts index 66e9c871b4..437da4cd52 100644 --- a/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/incentives.ts +++ b/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/incentives.ts @@ -145,7 +145,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.minted_denom = message.mintedDenom; + obj.minted_denom = message.mintedDenom === "" ? undefined : message.mintedDenom; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -248,7 +248,7 @@ export const LockableDurationsInfo = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, @@ -365,11 +365,11 @@ export const DistrInfo = { }, toAmino(message: DistrInfo): DistrInfoAmino { const obj: any = {}; - obj.total_weight = message.totalWeight; + obj.total_weight = message.totalWeight === "" ? undefined : message.totalWeight; if (message.records) { obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); } else { - obj.records = []; + obj.records = message.records; } return obj; }, @@ -482,8 +482,8 @@ export const DistrRecord = { }, toAmino(message: DistrRecord): DistrRecordAmino { const obj: any = {}; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; - obj.weight = message.weight; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; + obj.weight = message.weight === "" ? undefined : message.weight; return obj; }, fromAminoMsg(object: DistrRecordAminoMsg): DistrRecord { @@ -615,8 +615,8 @@ export const PoolToGauge = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -720,7 +720,7 @@ export const PoolToGauges = { if (message.poolToGauge) { obj.pool_to_gauge = message.poolToGauge.map(e => e ? PoolToGauge.toAmino(e) : undefined); } else { - obj.pool_to_gauge = []; + obj.pool_to_gauge = message.poolToGauge; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/query.ts b/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/query.ts index e554c3684a..87d6b46376 100644 --- a/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/osmosis/pool-incentives/v1beta1/query.ts @@ -203,7 +203,7 @@ export const QueryGaugeIdsRequest = { }, toAmino(message: QueryGaugeIdsRequest): QueryGaugeIdsRequestAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: QueryGaugeIdsRequestAminoMsg): QueryGaugeIdsRequest { @@ -306,7 +306,7 @@ export const QueryGaugeIdsResponse = { if (message.gaugeIdsWithDuration) { obj.gauge_ids_with_duration = message.gaugeIdsWithDuration.map(e => e ? QueryGaugeIdsResponse_GaugeIdWithDuration.toAmino(e) : undefined); } else { - obj.gauge_ids_with_duration = []; + obj.gauge_ids_with_duration = message.gaugeIdsWithDuration; } return obj; }, @@ -437,9 +437,9 @@ export const QueryGaugeIdsResponse_GaugeIdWithDuration = { }, toAmino(message: QueryGaugeIdsResponse_GaugeIdWithDuration): QueryGaugeIdsResponse_GaugeIdWithDurationAmino { const obj: any = {}; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; - obj.gauge_incentive_percentage = message.gaugeIncentivePercentage; + obj.gauge_incentive_percentage = message.gaugeIncentivePercentage === "" ? undefined : message.gaugeIncentivePercentage; return obj; }, fromAminoMsg(object: QueryGaugeIdsResponse_GaugeIdWithDurationAminoMsg): QueryGaugeIdsResponse_GaugeIdWithDuration { @@ -956,7 +956,7 @@ export const QueryLockableDurationsResponse = { if (message.lockableDurations) { obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); } else { - obj.lockable_durations = []; + obj.lockable_durations = message.lockableDurations; } return obj; }, @@ -1163,9 +1163,9 @@ export const IncentivizedPool = { }, toAmino(message: IncentivizedPool): IncentivizedPoolAmino { const obj: any = {}; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; obj.lockable_duration = message.lockableDuration ? Duration.toAmino(message.lockableDuration) : undefined; - obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: IncentivizedPoolAminoMsg): IncentivizedPool { @@ -1268,7 +1268,7 @@ export const QueryIncentivizedPoolsResponse = { if (message.incentivizedPools) { obj.incentivized_pools = message.incentivizedPools.map(e => e ? IncentivizedPool.toAmino(e) : undefined); } else { - obj.incentivized_pools = []; + obj.incentivized_pools = message.incentivizedPools; } return obj; }, @@ -1446,7 +1446,7 @@ export const QueryExternalIncentiveGaugesResponse = { if (message.data) { obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); } else { - obj.data = []; + obj.data = message.data; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/sumtree/v1beta1/tree.ts b/__fixtures__/v-next/outputv4/osmosis/sumtree/v1beta1/tree.ts index a5d833729c..e87e04aa8f 100644 --- a/__fixtures__/v-next/outputv4/osmosis/sumtree/v1beta1/tree.ts +++ b/__fixtures__/v-next/outputv4/osmosis/sumtree/v1beta1/tree.ts @@ -111,7 +111,7 @@ export const Node = { if (message.children) { obj.children = message.children.map(e => e ? Child.toAmino(e) : undefined); } else { - obj.children = []; + obj.children = message.children; } return obj; }, @@ -223,7 +223,7 @@ export const Child = { toAmino(message: Child): ChildAmino { const obj: any = {}; obj.index = message.index ? base64FromBytes(message.index) : undefined; - obj.accumulation = message.accumulation; + obj.accumulation = message.accumulation === "" ? undefined : message.accumulation; return obj; }, fromAminoMsg(object: ChildAminoMsg): Child { diff --git a/__fixtures__/v-next/outputv4/osmosis/superfluid/genesis.ts b/__fixtures__/v-next/outputv4/osmosis/superfluid/genesis.ts index 6dfe23c838..1d4e6d244a 100644 --- a/__fixtures__/v-next/outputv4/osmosis/superfluid/genesis.ts +++ b/__fixtures__/v-next/outputv4/osmosis/superfluid/genesis.ts @@ -198,22 +198,22 @@ export const GenesisState = { if (message.superfluidAssets) { obj.superfluid_assets = message.superfluidAssets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.superfluid_assets = []; + obj.superfluid_assets = message.superfluidAssets; } if (message.osmoEquivalentMultipliers) { obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers.map(e => e ? OsmoEquivalentMultiplierRecord.toAmino(e) : undefined); } else { - obj.osmo_equivalent_multipliers = []; + obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers; } if (message.intermediaryAccounts) { obj.intermediary_accounts = message.intermediaryAccounts.map(e => e ? SuperfluidIntermediaryAccount.toAmino(e) : undefined); } else { - obj.intermediary_accounts = []; + obj.intermediary_accounts = message.intermediaryAccounts; } if (message.intemediaryAccountConnections) { obj.intemediary_account_connections = message.intemediaryAccountConnections.map(e => e ? LockIdIntermediaryAccountConnection.toAmino(e) : undefined); } else { - obj.intemediary_account_connections = []; + obj.intemediary_account_connections = message.intemediaryAccountConnections; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/superfluid/params.ts b/__fixtures__/v-next/outputv4/osmosis/superfluid/params.ts index 7b829e49cf..e81b77734c 100644 --- a/__fixtures__/v-next/outputv4/osmosis/superfluid/params.ts +++ b/__fixtures__/v-next/outputv4/osmosis/superfluid/params.ts @@ -89,7 +89,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.minimum_risk_factor = message.minimumRiskFactor; + obj.minimum_risk_factor = message.minimumRiskFactor === "" ? undefined : message.minimumRiskFactor; return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { diff --git a/__fixtures__/v-next/outputv4/osmosis/superfluid/query.ts b/__fixtures__/v-next/outputv4/osmosis/superfluid/query.ts index 87395eb2cc..d0655c731c 100644 --- a/__fixtures__/v-next/outputv4/osmosis/superfluid/query.ts +++ b/__fixtures__/v-next/outputv4/osmosis/superfluid/query.ts @@ -587,7 +587,7 @@ export const AssetTypeRequest = { }, toAmino(message: AssetTypeRequest): AssetTypeRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AssetTypeRequestAminoMsg): AssetTypeRequest { @@ -675,13 +675,13 @@ export const AssetTypeResponse = { fromAmino(object: AssetTypeResponseAmino): AssetTypeResponse { const message = createBaseAssetTypeResponse(); if (object.asset_type !== undefined && object.asset_type !== null) { - message.assetType = superfluidAssetTypeFromJSON(object.asset_type); + message.assetType = object.asset_type; } return message; }, toAmino(message: AssetTypeResponse): AssetTypeResponseAmino { const obj: any = {}; - obj.asset_type = message.assetType; + obj.asset_type = message.assetType === 0 ? undefined : message.assetType; return obj; }, fromAminoMsg(object: AssetTypeResponseAminoMsg): AssetTypeResponse { @@ -858,7 +858,7 @@ export const AllAssetsResponse = { if (message.assets) { obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -953,7 +953,7 @@ export const AssetMultiplierRequest = { }, toAmino(message: AssetMultiplierRequest): AssetMultiplierRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: AssetMultiplierRequestAminoMsg): AssetMultiplierRequest { @@ -1193,10 +1193,10 @@ export const SuperfluidIntermediaryAccountInfo = { }, 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; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; + obj.address = message.address === "" ? undefined : message.address; return obj; }, fromAminoMsg(object: SuperfluidIntermediaryAccountInfoAminoMsg): SuperfluidIntermediaryAccountInfo { @@ -1413,7 +1413,7 @@ export const AllIntermediaryAccountsResponse = { if (message.accounts) { obj.accounts = message.accounts.map(e => e ? SuperfluidIntermediaryAccountInfo.toAmino(e) : undefined); } else { - obj.accounts = []; + obj.accounts = message.accounts; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -1511,7 +1511,7 @@ export const ConnectedIntermediaryAccountRequest = { }, toAmino(message: ConnectedIntermediaryAccountRequest): ConnectedIntermediaryAccountRequestAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: ConnectedIntermediaryAccountRequestAminoMsg): ConnectedIntermediaryAccountRequest { @@ -1701,7 +1701,7 @@ export const QueryTotalDelegationByValidatorForDenomRequest = { }, toAmino(message: QueryTotalDelegationByValidatorForDenomRequest): QueryTotalDelegationByValidatorForDenomRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryTotalDelegationByValidatorForDenomRequestAminoMsg): QueryTotalDelegationByValidatorForDenomRequest { @@ -1804,7 +1804,7 @@ export const QueryTotalDelegationByValidatorForDenomResponse = { if (message.assets) { obj.assets = message.assets.map(e => e ? Delegations.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -1931,9 +1931,9 @@ export const Delegations = { }, toAmino(message: Delegations): DelegationsAmino { const obj: any = {}; - obj.val_addr = message.valAddr; - obj.amount_sfsd = message.amountSfsd; - obj.osmo_equivalent = message.osmoEquivalent; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.amount_sfsd = message.amountSfsd === "" ? undefined : message.amountSfsd; + obj.osmo_equivalent = message.osmoEquivalent === "" ? undefined : message.osmoEquivalent; return obj; }, fromAminoMsg(object: DelegationsAminoMsg): Delegations { @@ -2101,7 +2101,7 @@ export const TotalSuperfluidDelegationsResponse = { }, toAmino(message: TotalSuperfluidDelegationsResponse): TotalSuperfluidDelegationsResponseAmino { const obj: any = {}; - obj.total_delegations = message.totalDelegations; + obj.total_delegations = message.totalDelegations === "" ? undefined : message.totalDelegations; return obj; }, fromAminoMsg(object: TotalSuperfluidDelegationsResponseAminoMsg): TotalSuperfluidDelegationsResponse { @@ -2227,9 +2227,9 @@ export const SuperfluidDelegationAmountRequest = { }, toAmino(message: SuperfluidDelegationAmountRequest): SuperfluidDelegationAmountRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidDelegationAmountRequestAminoMsg): SuperfluidDelegationAmountRequest { @@ -2332,7 +2332,7 @@ export const SuperfluidDelegationAmountResponse = { if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.amount = []; + obj.amount = message.amount; } return obj; }, @@ -2427,7 +2427,7 @@ export const SuperfluidDelegationsByDelegatorRequest = { }, toAmino(message: SuperfluidDelegationsByDelegatorRequest): SuperfluidDelegationsByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: SuperfluidDelegationsByDelegatorRequestAminoMsg): SuperfluidDelegationsByDelegatorRequest { @@ -2570,12 +2570,12 @@ export const SuperfluidDelegationsByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined; return obj; @@ -2687,8 +2687,8 @@ export const SuperfluidUndelegationsByDelegatorRequest = { }, toAmino(message: SuperfluidUndelegationsByDelegatorRequest): SuperfluidUndelegationsByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.denom = message.denom; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidUndelegationsByDelegatorRequestAminoMsg): SuperfluidUndelegationsByDelegatorRequest { @@ -2835,17 +2835,17 @@ export const SuperfluidUndelegationsByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.totalUndelegatedCoins) { obj.total_undelegated_coins = message.totalUndelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_undelegated_coins = []; + obj.total_undelegated_coins = message.totalUndelegatedCoins; } if (message.syntheticLocks) { obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); } else { - obj.synthetic_locks = []; + obj.synthetic_locks = message.syntheticLocks; } return obj; }, @@ -2956,8 +2956,8 @@ export const SuperfluidDelegationsByValidatorDenomRequest = { }, toAmino(message: SuperfluidDelegationsByValidatorDenomRequest): SuperfluidDelegationsByValidatorDenomRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: SuperfluidDelegationsByValidatorDenomRequestAminoMsg): SuperfluidDelegationsByValidatorDenomRequest { @@ -3060,7 +3060,7 @@ export const SuperfluidDelegationsByValidatorDenomResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } return obj; }, @@ -3171,8 +3171,8 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomRequest = { }, toAmino(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest): EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAmino { const obj: any = {}; - obj.validator_address = message.validatorAddress; - obj.denom = message.denom; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAminoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomRequest { @@ -3275,7 +3275,7 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomResponse = { if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } return obj; }, @@ -3370,7 +3370,7 @@ export const QueryTotalDelegationByDelegatorRequest = { }, toAmino(message: QueryTotalDelegationByDelegatorRequest): QueryTotalDelegationByDelegatorRequestAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; return obj; }, fromAminoMsg(object: QueryTotalDelegationByDelegatorRequestAminoMsg): QueryTotalDelegationByDelegatorRequest { @@ -3535,17 +3535,17 @@ export const QueryTotalDelegationByDelegatorResponse = { if (message.superfluidDelegationRecords) { obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); } else { - obj.superfluid_delegation_records = []; + obj.superfluid_delegation_records = message.superfluidDelegationRecords; } if (message.delegationResponse) { obj.delegation_response = message.delegationResponse.map(e => e ? DelegationResponse.toAmino(e) : undefined); } else { - obj.delegation_response = []; + obj.delegation_response = message.delegationResponse; } if (message.totalDelegatedCoins) { obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.total_delegated_coins = []; + obj.total_delegated_coins = message.totalDelegatedCoins; } obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined; return obj; @@ -3733,7 +3733,7 @@ export const QueryUnpoolWhitelistResponse = { if (message.poolIds) { obj.pool_ids = message.poolIds.map(e => e.toString()); } else { - obj.pool_ids = []; + obj.pool_ids = message.poolIds; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/superfluid/superfluid.ts b/__fixtures__/v-next/outputv4/osmosis/superfluid/superfluid.ts index 16a32e5381..598fda8724 100644 --- a/__fixtures__/v-next/outputv4/osmosis/superfluid/superfluid.ts +++ b/__fixtures__/v-next/outputv4/osmosis/superfluid/superfluid.ts @@ -250,14 +250,14 @@ export const SuperfluidAsset = { message.denom = object.denom; } if (object.asset_type !== undefined && object.asset_type !== null) { - message.assetType = superfluidAssetTypeFromJSON(object.asset_type); + message.assetType = object.asset_type; } return message; }, toAmino(message: SuperfluidAsset): SuperfluidAssetAmino { const obj: any = {}; - obj.denom = message.denom; - obj.asset_type = message.assetType; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.asset_type = message.assetType === 0 ? undefined : message.assetType; return obj; }, fromAminoMsg(object: SuperfluidAssetAminoMsg): SuperfluidAsset { @@ -385,9 +385,9 @@ export const SuperfluidIntermediaryAccount = { }, 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; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; + obj.gauge_id = message.gaugeId !== BigInt(0) ? message.gaugeId.toString() : undefined; return obj; }, fromAminoMsg(object: SuperfluidIntermediaryAccountAminoMsg): SuperfluidIntermediaryAccount { @@ -515,9 +515,9 @@ export const OsmoEquivalentMultiplierRecord = { }, toAmino(message: OsmoEquivalentMultiplierRecord): OsmoEquivalentMultiplierRecordAmino { const obj: any = {}; - obj.epoch_number = message.epochNumber ? message.epochNumber.toString() : undefined; - obj.denom = message.denom; - obj.multiplier = message.multiplier; + obj.epoch_number = message.epochNumber !== BigInt(0) ? message.epochNumber.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.multiplier = message.multiplier === "" ? undefined : message.multiplier; return obj; }, fromAminoMsg(object: OsmoEquivalentMultiplierRecordAminoMsg): OsmoEquivalentMultiplierRecord { @@ -663,8 +663,8 @@ export const SuperfluidDelegationRecord = { }, toAmino(message: SuperfluidDelegationRecord): SuperfluidDelegationRecordAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : 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; @@ -778,8 +778,8 @@ export const LockIdIntermediaryAccountConnection = { }, toAmino(message: LockIdIntermediaryAccountConnection): LockIdIntermediaryAccountConnectionAmino { const obj: any = {}; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; - obj.intermediary_account = message.intermediaryAccount; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; + obj.intermediary_account = message.intermediaryAccount === "" ? undefined : message.intermediaryAccount; return obj; }, fromAminoMsg(object: LockIdIntermediaryAccountConnectionAminoMsg): LockIdIntermediaryAccountConnection { @@ -891,7 +891,7 @@ export const UnpoolWhitelistedPools = { if (message.ids) { obj.ids = message.ids.map(e => e.toString()); } else { - obj.ids = []; + obj.ids = message.ids; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputv4/osmosis/superfluid/tx.ts index d6c8ecdf48..0930d7ecab 100644 --- a/__fixtures__/v-next/outputv4/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputv4/osmosis/superfluid/tx.ts @@ -237,9 +237,9 @@ export const MsgSuperfluidDelegate = { }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; return obj; }, fromAminoMsg(object: MsgSuperfluidDelegateAminoMsg): MsgSuperfluidDelegate { @@ -425,8 +425,8 @@ export const MsgSuperfluidUndelegate = { }, toAmino(message: MsgSuperfluidUndelegate): MsgSuperfluidUndelegateAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSuperfluidUndelegateAminoMsg): MsgSuperfluidUndelegate { @@ -612,8 +612,8 @@ export const MsgSuperfluidUnbondLock = { }, toAmino(message: MsgSuperfluidUnbondLock): MsgSuperfluidUnbondLockAmino { const obj: any = {}; - obj.sender = message.sender; - obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.lock_id = message.lockId !== BigInt(0) ? message.lockId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgSuperfluidUnbondLockAminoMsg): MsgSuperfluidUnbondLock { @@ -819,13 +819,13 @@ export const MsgLockAndSuperfluidDelegate = { }, toAmino(message: MsgLockAndSuperfluidDelegate): MsgLockAndSuperfluidDelegateAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.coins = []; + obj.coins = message.coins; } - obj.val_addr = message.valAddr; + obj.val_addr = message.valAddr === "" ? undefined : message.valAddr; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateAminoMsg): MsgLockAndSuperfluidDelegate { @@ -921,7 +921,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, toAmino(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAmino { const obj: any = {}; - obj.ID = message.ID ? message.ID.toString() : undefined; + obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateResponseAminoMsg): MsgLockAndSuperfluidDelegateResponse { @@ -1033,8 +1033,8 @@ export const MsgUnPoolWhitelistedPool = { }, toAmino(message: MsgUnPoolWhitelistedPool): MsgUnPoolWhitelistedPoolAmino { const obj: any = {}; - obj.sender = message.sender; - obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; return obj; }, fromAminoMsg(object: MsgUnPoolWhitelistedPoolAminoMsg): MsgUnPoolWhitelistedPool { @@ -1146,7 +1146,7 @@ export const MsgUnPoolWhitelistedPoolResponse = { if (message.exitedLockIds) { obj.exited_lock_ids = message.exitedLockIds.map(e => e.toString()); } else { - obj.exited_lock_ids = []; + obj.exited_lock_ids = message.exitedLockIds; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/superfluid/v1beta1/gov.ts b/__fixtures__/v-next/outputv4/osmosis/superfluid/v1beta1/gov.ts index ef1303f875..bd15a1eac4 100644 --- a/__fixtures__/v-next/outputv4/osmosis/superfluid/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv4/osmosis/superfluid/v1beta1/gov.ts @@ -177,12 +177,12 @@ export const SetSuperfluidAssetsProposal = { }, toAmino(message: SetSuperfluidAssetsProposal): SetSuperfluidAssetsProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.assets) { obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); } else { - obj.assets = []; + obj.assets = message.assets; } return obj; }, @@ -315,12 +315,12 @@ export const RemoveSuperfluidAssetsProposal = { }, toAmino(message: RemoveSuperfluidAssetsProposal): RemoveSuperfluidAssetsProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.superfluidAssetDenoms) { obj.superfluid_asset_denoms = message.superfluidAssetDenoms.map(e => e); } else { - obj.superfluid_asset_denoms = []; + obj.superfluid_asset_denoms = message.superfluidAssetDenoms; } return obj; }, @@ -478,14 +478,14 @@ export const UpdateUnpoolWhiteListProposal = { }, toAmino(message: UpdateUnpoolWhiteListProposal): UpdateUnpoolWhiteListProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.ids) { obj.ids = message.ids.map(e => e.toString()); } else { - obj.ids = []; + obj.ids = message.ids; } - obj.is_overwrite = message.isOverwrite; + obj.is_overwrite = message.isOverwrite === false ? undefined : message.isOverwrite; return obj; }, fromAminoMsg(object: UpdateUnpoolWhiteListProposalAminoMsg): UpdateUnpoolWhiteListProposal { diff --git a/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/authorityMetadata.ts b/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/authorityMetadata.ts index d845692338..05d6c404d5 100644 --- a/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/authorityMetadata.ts +++ b/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/authorityMetadata.ts @@ -91,7 +91,7 @@ export const DenomAuthorityMetadata = { }, toAmino(message: DenomAuthorityMetadata): DenomAuthorityMetadataAmino { const obj: any = {}; - obj.admin = message.admin; + obj.admin = message.admin === "" ? undefined : message.admin; return obj; }, fromAminoMsg(object: DenomAuthorityMetadataAminoMsg): DenomAuthorityMetadata { diff --git a/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/genesis.ts index a32614c5f2..37b436e896 100644 --- a/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/genesis.ts @@ -137,7 +137,7 @@ export const GenesisState = { if (message.factoryDenoms) { obj.factory_denoms = message.factoryDenoms.map(e => e ? GenesisDenom.toAmino(e) : undefined); } else { - obj.factory_denoms = []; + obj.factory_denoms = message.factoryDenoms; } return obj; }, @@ -250,7 +250,7 @@ export const GenesisDenom = { }, toAmino(message: GenesisDenom): GenesisDenomAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; obj.authority_metadata = message.authorityMetadata ? DenomAuthorityMetadata.toAmino(message.authorityMetadata) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/params.ts b/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/params.ts index 7deb5a8423..ec74dead0e 100644 --- a/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/params.ts @@ -92,7 +92,7 @@ export const Params = { if (message.denomCreationFee) { obj.denom_creation_fee = message.denomCreationFee.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.denom_creation_fee = []; + obj.denom_creation_fee = message.denomCreationFee; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/query.ts b/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/query.ts index 0312760e4e..c1efa97f11 100644 --- a/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/query.ts @@ -335,7 +335,7 @@ export const QueryDenomAuthorityMetadataRequest = { }, toAmino(message: QueryDenomAuthorityMetadataRequest): QueryDenomAuthorityMetadataRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomAuthorityMetadataRequestAminoMsg): QueryDenomAuthorityMetadataRequest { @@ -525,7 +525,7 @@ export const QueryDenomsFromCreatorRequest = { }, toAmino(message: QueryDenomsFromCreatorRequest): QueryDenomsFromCreatorRequestAmino { const obj: any = {}; - obj.creator = message.creator; + obj.creator = message.creator === "" ? undefined : message.creator; return obj; }, fromAminoMsg(object: QueryDenomsFromCreatorRequestAminoMsg): QueryDenomsFromCreatorRequest { @@ -628,7 +628,7 @@ export const QueryDenomsFromCreatorResponse = { if (message.denoms) { obj.denoms = message.denoms.map(e => e); } else { - obj.denoms = []; + obj.denoms = message.denoms; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/tx.ts b/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/tx.ts index dafe17af1f..1d5e1ca9f6 100644 --- a/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv4/osmosis/tokenfactory/v1beta1/tx.ts @@ -263,8 +263,8 @@ export const MsgCreateDenom = { }, toAmino(message: MsgCreateDenom): MsgCreateDenomAmino { const obj: any = {}; - obj.sender = message.sender; - obj.subdenom = message.subdenom; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.subdenom = message.subdenom === "" ? undefined : message.subdenom; return obj; }, fromAminoMsg(object: MsgCreateDenomAminoMsg): MsgCreateDenom { @@ -358,7 +358,7 @@ export const MsgCreateDenomResponse = { }, toAmino(message: MsgCreateDenomResponse): MsgCreateDenomResponseAmino { const obj: any = {}; - obj.new_token_denom = message.newTokenDenom; + obj.new_token_denom = message.newTokenDenom === "" ? undefined : message.newTokenDenom; return obj; }, fromAminoMsg(object: MsgCreateDenomResponseAminoMsg): MsgCreateDenomResponse { @@ -470,7 +470,7 @@ export const MsgMint = { }, toAmino(message: MsgMint): MsgMintAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -657,7 +657,7 @@ export const MsgBurn = { }, toAmino(message: MsgBurn): MsgBurnAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; return obj; }, @@ -858,9 +858,9 @@ export const MsgChangeAdmin = { }, toAmino(message: MsgChangeAdmin): MsgChangeAdminAmino { const obj: any = {}; - obj.sender = message.sender; - obj.denom = message.denom; - obj.new_admin = message.newAdmin; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.new_admin = message.newAdmin === "" ? undefined : message.newAdmin; return obj; }, fromAminoMsg(object: MsgChangeAdminAminoMsg): MsgChangeAdmin { @@ -1046,7 +1046,7 @@ export const MsgSetDenomMetadata = { }, toAmino(message: MsgSetDenomMetadata): MsgSetDenomMetadataAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/twap/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/osmosis/twap/v1beta1/genesis.ts index 56fd519109..6a972ec472 100644 --- a/__fixtures__/v-next/outputv4/osmosis/twap/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/osmosis/twap/v1beta1/genesis.ts @@ -120,7 +120,7 @@ export const Params = { }, toAmino(message: Params): ParamsAmino { const obj: any = {}; - obj.prune_epoch_identifier = message.pruneEpochIdentifier; + obj.prune_epoch_identifier = message.pruneEpochIdentifier === "" ? undefined : message.pruneEpochIdentifier; obj.record_history_keep_period = message.recordHistoryKeepPeriod ? Duration.toAmino(message.recordHistoryKeepPeriod) : undefined; return obj; }, @@ -242,7 +242,7 @@ export const GenesisState = { if (message.twaps) { obj.twaps = message.twaps.map(e => e ? TwapRecord.toAmino(e) : undefined); } else { - obj.twaps = []; + obj.twaps = message.twaps; } obj.params = message.params ? Params.toAmino(message.params) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/osmosis/twap/v1beta1/query.ts b/__fixtures__/v-next/outputv4/osmosis/twap/v1beta1/query.ts index 2cce0d9899..16342b7412 100644 --- a/__fixtures__/v-next/outputv4/osmosis/twap/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/osmosis/twap/v1beta1/query.ts @@ -209,9 +209,9 @@ export const ArithmeticTwapRequest = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset === "" ? undefined : message.baseAsset; + obj.quote_asset = message.quoteAsset === "" ? undefined : message.quoteAsset; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; return obj; @@ -307,7 +307,7 @@ export const ArithmeticTwapResponse = { }, toAmino(message: ArithmeticTwapResponse): ArithmeticTwapResponseAmino { const obj: any = {}; - obj.arithmetic_twap = message.arithmeticTwap; + obj.arithmetic_twap = message.arithmeticTwap === "" ? undefined : message.arithmeticTwap; return obj; }, fromAminoMsg(object: ArithmeticTwapResponseAminoMsg): ArithmeticTwapResponse { @@ -451,9 +451,9 @@ export const ArithmeticTwapToNowRequest = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset === "" ? undefined : message.baseAsset; + obj.quote_asset = message.quoteAsset === "" ? undefined : message.quoteAsset; obj.start_time = message.startTime ? Timestamp.toAmino(toTimestamp(message.startTime)) : undefined; return obj; }, @@ -548,7 +548,7 @@ export const ArithmeticTwapToNowResponse = { }, toAmino(message: ArithmeticTwapToNowResponse): ArithmeticTwapToNowResponseAmino { const obj: any = {}; - obj.arithmetic_twap = message.arithmeticTwap; + obj.arithmetic_twap = message.arithmeticTwap === "" ? undefined : message.arithmeticTwap; return obj; }, fromAminoMsg(object: ArithmeticTwapToNowResponseAminoMsg): ArithmeticTwapToNowResponse { diff --git a/__fixtures__/v-next/outputv4/osmosis/twap/v1beta1/twap_record.ts b/__fixtures__/v-next/outputv4/osmosis/twap/v1beta1/twap_record.ts index 4ea22c0220..00fa424091 100644 --- a/__fixtures__/v-next/outputv4/osmosis/twap/v1beta1/twap_record.ts +++ b/__fixtures__/v-next/outputv4/osmosis/twap/v1beta1/twap_record.ts @@ -282,15 +282,15 @@ export const TwapRecord = { }, 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.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.asset0_denom = message.asset0Denom === "" ? undefined : message.asset0Denom; + obj.asset1_denom = message.asset1Denom === "" ? undefined : message.asset1Denom; + obj.height = message.height ? message.height.toString() : "0"; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - 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.p0_last_spot_price = message.p0LastSpotPrice === "" ? undefined : message.p0LastSpotPrice; + obj.p1_last_spot_price = message.p1LastSpotPrice === "" ? undefined : message.p1LastSpotPrice; + obj.p0_arithmetic_twap_accumulator = message.p0ArithmeticTwapAccumulator === "" ? undefined : message.p0ArithmeticTwapAccumulator; + obj.p1_arithmetic_twap_accumulator = message.p1ArithmeticTwapAccumulator === "" ? undefined : message.p1ArithmeticTwapAccumulator; obj.last_error_time = message.lastErrorTime ? Timestamp.toAmino(toTimestamp(message.lastErrorTime)) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/feetoken.ts b/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/feetoken.ts index 93458496b4..1bdf14c875 100644 --- a/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/feetoken.ts +++ b/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/feetoken.ts @@ -112,8 +112,8 @@ export const FeeToken = { }, toAmino(message: FeeToken): FeeTokenAmino { const obj: any = {}; - obj.denom = message.denom; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.denom = message.denom === "" ? undefined : message.denom; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; return obj; }, fromAminoMsg(object: FeeTokenAminoMsg): FeeToken { diff --git a/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/genesis.ts b/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/genesis.ts index 4769542628..871256595a 100644 --- a/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/genesis.ts @@ -107,11 +107,11 @@ export const GenesisState = { }, toAmino(message: GenesisState): GenesisStateAmino { const obj: any = {}; - obj.basedenom = message.basedenom; + obj.basedenom = message.basedenom === "" ? undefined : message.basedenom; if (message.feetokens) { obj.feetokens = message.feetokens.map(e => e ? FeeToken.toAmino(e) : undefined); } else { - obj.feetokens = []; + obj.feetokens = message.feetokens; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/gov.ts b/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/gov.ts index 4fc390a412..7dcaf01d98 100644 --- a/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/gov.ts @@ -133,8 +133,8 @@ export const UpdateFeeTokenProposal = { }, toAmino(message: UpdateFeeTokenProposal): UpdateFeeTokenProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; obj.feetoken = message.feetoken ? FeeToken.toAmino(message.feetoken) : undefined; return obj; }, diff --git a/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/query.ts b/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/query.ts index be26f613a7..610d234fc1 100644 --- a/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv4/osmosis/txfees/v1beta1/query.ts @@ -245,7 +245,7 @@ export const QueryFeeTokensResponse = { if (message.feeTokens) { obj.fee_tokens = message.feeTokens.map(e => e ? FeeToken.toAmino(e) : undefined); } else { - obj.fee_tokens = []; + obj.fee_tokens = message.feeTokens; } return obj; }, @@ -340,7 +340,7 @@ export const QueryDenomSpotPriceRequest = { }, toAmino(message: QueryDenomSpotPriceRequest): QueryDenomSpotPriceRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomSpotPriceRequestAminoMsg): QueryDenomSpotPriceRequest { @@ -452,8 +452,8 @@ export const QueryDenomSpotPriceResponse = { }, toAmino(message: QueryDenomSpotPriceResponse): QueryDenomSpotPriceResponseAmino { const obj: any = {}; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; - obj.spot_price = message.spotPrice; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; + obj.spot_price = message.spotPrice === "" ? undefined : message.spotPrice; return obj; }, fromAminoMsg(object: QueryDenomSpotPriceResponseAminoMsg): QueryDenomSpotPriceResponse { @@ -547,7 +547,7 @@ export const QueryDenomPoolIdRequest = { }, toAmino(message: QueryDenomPoolIdRequest): QueryDenomPoolIdRequestAmino { const obj: any = {}; - obj.denom = message.denom; + obj.denom = message.denom === "" ? undefined : message.denom; return obj; }, fromAminoMsg(object: QueryDenomPoolIdRequestAminoMsg): QueryDenomPoolIdRequest { @@ -643,7 +643,7 @@ export const QueryDenomPoolIdResponse = { }, toAmino(message: QueryDenomPoolIdResponse): QueryDenomPoolIdResponseAmino { const obj: any = {}; - obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.poolID = message.poolID !== BigInt(0) ? message.poolID.toString() : undefined; return obj; }, fromAminoMsg(object: QueryDenomPoolIdResponseAminoMsg): QueryDenomPoolIdResponse { @@ -811,7 +811,7 @@ export const QueryBaseDenomResponse = { }, toAmino(message: QueryBaseDenomResponse): QueryBaseDenomResponseAmino { const obj: any = {}; - obj.base_denom = message.baseDenom; + obj.base_denom = message.baseDenom === "" ? undefined : message.baseDenom; return obj; }, fromAminoMsg(object: QueryBaseDenomResponseAminoMsg): QueryBaseDenomResponse { diff --git a/__fixtures__/v-next/outputv4/tendermint/abci/types.ts b/__fixtures__/v-next/outputv4/tendermint/abci/types.ts index 6909c97119..bde3491e77 100644 --- a/__fixtures__/v-next/outputv4/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputv4/tendermint/abci/types.ts @@ -1342,7 +1342,7 @@ export const RequestEcho = { }, toAmino(message: RequestEcho): RequestEchoAmino { const obj: any = {}; - obj.message = message.message; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: RequestEchoAminoMsg): RequestEcho { @@ -1534,9 +1534,9 @@ export const RequestInfo = { }, 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; + obj.version = message.version === "" ? undefined : message.version; + obj.block_version = message.blockVersion !== BigInt(0) ? message.blockVersion.toString() : undefined; + obj.p2p_version = message.p2pVersion !== BigInt(0) ? message.p2pVersion.toString() : undefined; return obj; }, fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo { @@ -1640,8 +1640,8 @@ export const RequestSetOption = { }, toAmino(message: RequestSetOption): RequestSetOptionAmino { const obj: any = {}; - obj.key = message.key; - obj.value = message.value; + obj.key = message.key === "" ? undefined : message.key; + obj.value = message.value === "" ? undefined : message.value; return obj; }, fromAminoMsg(object: RequestSetOptionAminoMsg): RequestSetOption { @@ -1820,15 +1820,15 @@ export const RequestInitChain = { toAmino(message: RequestInitChain): RequestInitChainAmino { const obj: any = {}; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : 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.validators = message.validators; } obj.app_state_bytes = message.appStateBytes ? base64FromBytes(message.appStateBytes) : undefined; - obj.initial_height = message.initialHeight ? message.initialHeight.toString() : undefined; + obj.initial_height = message.initialHeight !== BigInt(0) ? message.initialHeight.toString() : undefined; return obj; }, fromAminoMsg(object: RequestInitChainAminoMsg): RequestInitChain { @@ -1967,9 +1967,9 @@ export const RequestQuery = { toAmino(message: RequestQuery): RequestQueryAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.path = message.path; - obj.height = message.height ? message.height.toString() : undefined; - obj.prove = message.prove; + obj.path = message.path === "" ? undefined : message.path; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.prove = message.prove === false ? undefined : message.prove; return obj; }, fromAminoMsg(object: RequestQueryAminoMsg): RequestQuery { @@ -2121,7 +2121,7 @@ export const RequestBeginBlock = { if (message.byzantineValidators) { obj.byzantine_validators = message.byzantineValidators.map(e => e ? Evidence.toAmino(e) : undefined); } else { - obj.byzantine_validators = []; + obj.byzantine_validators = message.byzantineValidators; } return obj; }, @@ -2220,14 +2220,14 @@ export const RequestCheckTx = { message.tx = bytesFromBase64(object.tx); } if (object.type !== undefined && object.type !== null) { - message.type = checkTxTypeFromJSON(object.type); + message.type = object.type; } return message; }, toAmino(message: RequestCheckTx): RequestCheckTxAmino { const obj: any = {}; obj.tx = message.tx ? base64FromBytes(message.tx) : undefined; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; return obj; }, fromAminoMsg(object: RequestCheckTxAminoMsg): RequestCheckTx { @@ -2405,7 +2405,7 @@ export const RequestEndBlock = { }, toAmino(message: RequestEndBlock): RequestEndBlockAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; return obj; }, fromAminoMsg(object: RequestEndBlockAminoMsg): RequestEndBlock { @@ -2770,9 +2770,9 @@ export const RequestLoadSnapshotChunk = { }, toAmino(message: RequestLoadSnapshotChunk): RequestLoadSnapshotChunkAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunk = message.chunk; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunk = message.chunk === 0 ? undefined : message.chunk; return obj; }, fromAminoMsg(object: RequestLoadSnapshotChunkAminoMsg): RequestLoadSnapshotChunk { @@ -2892,9 +2892,9 @@ export const RequestApplySnapshotChunk = { }, toAmino(message: RequestApplySnapshotChunk): RequestApplySnapshotChunkAmino { const obj: any = {}; - obj.index = message.index; + obj.index = message.index === 0 ? undefined : message.index; obj.chunk = message.chunk ? base64FromBytes(message.chunk) : undefined; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; return obj; }, fromAminoMsg(object: RequestApplySnapshotChunkAminoMsg): RequestApplySnapshotChunk { @@ -3357,7 +3357,7 @@ export const ResponseException = { }, toAmino(message: ResponseException): ResponseExceptionAmino { const obj: any = {}; - obj.error = message.error; + obj.error = message.error === "" ? undefined : message.error; return obj; }, fromAminoMsg(object: ResponseExceptionAminoMsg): ResponseException { @@ -3445,7 +3445,7 @@ export const ResponseEcho = { }, toAmino(message: ResponseEcho): ResponseEchoAmino { const obj: any = {}; - obj.message = message.message; + obj.message = message.message === "" ? undefined : message.message; return obj; }, fromAminoMsg(object: ResponseEchoAminoMsg): ResponseEcho { @@ -3669,10 +3669,10 @@ export const ResponseInfo = { }, 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.data = message.data === "" ? undefined : message.data; + obj.version = message.version === "" ? undefined : message.version; + obj.app_version = message.appVersion !== BigInt(0) ? message.appVersion.toString() : undefined; + obj.last_block_height = message.lastBlockHeight !== BigInt(0) ? message.lastBlockHeight.toString() : undefined; obj.last_block_app_hash = message.lastBlockAppHash ? base64FromBytes(message.lastBlockAppHash) : undefined; return obj; }, @@ -3793,9 +3793,9 @@ export const ResponseSetOption = { }, toAmino(message: ResponseSetOption): ResponseSetOptionAmino { const obj: any = {}; - obj.code = message.code; - obj.log = message.log; - obj.info = message.info; + obj.code = message.code === 0 ? undefined : message.code; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; return obj; }, fromAminoMsg(object: ResponseSetOptionAminoMsg): ResponseSetOption { @@ -3927,7 +3927,7 @@ export const ResponseInitChain = { if (message.validators) { obj.validators = message.validators.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.app_hash = message.appHash ? base64FromBytes(message.appHash) : undefined; return obj; @@ -4151,15 +4151,15 @@ export const ResponseQuery = { }, 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.code = message.code === 0 ? undefined : message.code; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; obj.proof_ops = message.proofOps ? ProofOps.toAmino(message.proofOps) : undefined; - obj.height = message.height ? message.height.toString() : undefined; - obj.codespace = message.codespace; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseQueryAminoMsg): ResponseQuery { @@ -4256,7 +4256,7 @@ export const ResponseBeginBlock = { if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } return obj; }, @@ -4467,18 +4467,18 @@ export const ResponseCheckTx = { }, toAmino(message: ResponseCheckTx): ResponseCheckTxAmino { const obj: any = {}; - obj.code = message.code; + obj.code = message.code === 0 ? undefined : message.code; obj.data = message.data ? base64FromBytes(message.data) : undefined; - 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; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } - obj.codespace = message.codespace; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseCheckTxAminoMsg): ResponseCheckTx { @@ -4688,18 +4688,18 @@ export const ResponseDeliverTx = { }, toAmino(message: ResponseDeliverTx): ResponseDeliverTxAmino { const obj: any = {}; - obj.code = message.code; + obj.code = message.code === 0 ? undefined : message.code; obj.data = message.data ? base64FromBytes(message.data) : undefined; - 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; + obj.log = message.log === "" ? undefined : message.log; + obj.info = message.info === "" ? undefined : message.info; + obj.gas_wanted = message.gasWanted !== BigInt(0) ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed !== BigInt(0) ? message.gasUsed.toString() : undefined; if (message.events) { obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); } else { - obj.events = []; + obj.events = message.events; } - obj.codespace = message.codespace; + obj.codespace = message.codespace === "" ? undefined : message.codespace; return obj; }, fromAminoMsg(object: ResponseDeliverTxAminoMsg): ResponseDeliverTx { @@ -4836,13 +4836,13 @@ export const ResponseEndBlock = { if (message.validatorUpdates) { obj.validator_updates = message.validatorUpdates.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); } else { - obj.validator_updates = []; + obj.validator_updates = message.validatorUpdates; } 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 = []; + obj.events = message.events; } return obj; }, @@ -4950,7 +4950,7 @@ export const ResponseCommit = { toAmino(message: ResponseCommit): ResponseCommitAmino { const obj: any = {}; obj.data = message.data ? base64FromBytes(message.data) : undefined; - obj.retain_height = message.retainHeight ? message.retainHeight.toString() : undefined; + obj.retain_height = message.retainHeight !== BigInt(0) ? message.retainHeight.toString() : undefined; return obj; }, fromAminoMsg(object: ResponseCommitAminoMsg): ResponseCommit { @@ -5047,7 +5047,7 @@ export const ResponseListSnapshots = { if (message.snapshots) { obj.snapshots = message.snapshots.map(e => e ? Snapshot.toAmino(e) : undefined); } else { - obj.snapshots = []; + obj.snapshots = message.snapshots; } return obj; }, @@ -5130,13 +5130,13 @@ export const ResponseOfferSnapshot = { fromAmino(object: ResponseOfferSnapshotAmino): ResponseOfferSnapshot { const message = createBaseResponseOfferSnapshot(); if (object.result !== undefined && object.result !== null) { - message.result = responseOfferSnapshot_ResultFromJSON(object.result); + message.result = object.result; } return message; }, toAmino(message: ResponseOfferSnapshot): ResponseOfferSnapshotAmino { const obj: any = {}; - obj.result = message.result; + obj.result = message.result === 0 ? undefined : message.result; return obj; }, fromAminoMsg(object: ResponseOfferSnapshotAminoMsg): ResponseOfferSnapshot { @@ -5357,7 +5357,7 @@ export const ResponseApplySnapshotChunk = { fromAmino(object: ResponseApplySnapshotChunkAmino): ResponseApplySnapshotChunk { const message = createBaseResponseApplySnapshotChunk(); if (object.result !== undefined && object.result !== null) { - message.result = responseApplySnapshotChunk_ResultFromJSON(object.result); + message.result = object.result; } message.refetchChunks = object.refetch_chunks?.map(e => e) || []; message.rejectSenders = object.reject_senders?.map(e => e) || []; @@ -5365,16 +5365,16 @@ export const ResponseApplySnapshotChunk = { }, toAmino(message: ResponseApplySnapshotChunk): ResponseApplySnapshotChunkAmino { const obj: any = {}; - obj.result = message.result; + obj.result = message.result === 0 ? undefined : message.result; if (message.refetchChunks) { obj.refetch_chunks = message.refetchChunks.map(e => e); } else { - obj.refetch_chunks = []; + obj.refetch_chunks = message.refetchChunks; } if (message.rejectSenders) { obj.reject_senders = message.rejectSenders.map(e => e); } else { - obj.reject_senders = []; + obj.reject_senders = message.rejectSenders; } return obj; }, @@ -5630,8 +5630,8 @@ export const BlockParams = { }, 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.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas !== BigInt(0) ? message.maxGas.toString() : undefined; return obj; }, fromAminoMsg(object: BlockParamsAminoMsg): BlockParams { @@ -5741,11 +5741,11 @@ export const LastCommitInfo = { }, toAmino(message: LastCommitInfo): LastCommitInfoAmino { const obj: any = {}; - obj.round = message.round; + obj.round = message.round === 0 ? undefined : message.round; if (message.votes) { obj.votes = message.votes.map(e => e ? VoteInfo.toAmino(e) : undefined); } else { - obj.votes = []; + obj.votes = message.votes; } return obj; }, @@ -5856,11 +5856,11 @@ export const Event = { }, toAmino(message: Event): EventAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; if (message.attributes) { obj.attributes = message.attributes.map(e => e ? EventAttribute.toAmino(e) : undefined); } else { - obj.attributes = []; + obj.attributes = message.attributes; } return obj; }, @@ -5983,7 +5983,7 @@ export const EventAttribute = { const obj: any = {}; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.value = message.value ? base64FromBytes(message.value) : undefined; - obj.index = message.index; + obj.index = message.index === false ? undefined : message.index; return obj; }, fromAminoMsg(object: EventAttributeAminoMsg): EventAttribute { @@ -6123,8 +6123,8 @@ export const TxResult = { }, toAmino(message: TxResult): TxResultAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.index = message.index; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.index = message.index === 0 ? undefined : message.index; obj.tx = message.tx ? base64FromBytes(message.tx) : undefined; obj.result = message.result ? ResponseDeliverTx.toAmino(message.result) : undefined; return obj; @@ -6233,7 +6233,7 @@ export const Validator = { toAmino(message: Validator): ValidatorAmino { const obj: any = {}; obj.address = message.address ? base64FromBytes(message.address) : undefined; - obj.power = message.power ? message.power.toString() : undefined; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -6342,7 +6342,7 @@ export const ValidatorUpdate = { 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; + obj.power = message.power !== BigInt(0) ? message.power.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorUpdateAminoMsg): ValidatorUpdate { @@ -6449,7 +6449,7 @@ export const VoteInfo = { toAmino(message: VoteInfo): VoteInfoAmino { const obj: any = {}; obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; - obj.signed_last_block = message.signedLastBlock; + obj.signed_last_block = message.signedLastBlock === false ? undefined : message.signedLastBlock; return obj; }, fromAminoMsg(object: VoteInfoAminoMsg): VoteInfo { @@ -6589,7 +6589,7 @@ export const Evidence = { fromAmino(object: EvidenceAmino): Evidence { const message = createBaseEvidence(); if (object.type !== undefined && object.type !== null) { - message.type = evidenceTypeFromJSON(object.type); + message.type = object.type; } if (object.validator !== undefined && object.validator !== null) { message.validator = Validator.fromAmino(object.validator); @@ -6607,11 +6607,11 @@ export const Evidence = { }, toAmino(message: Evidence): EvidenceAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === 0 ? undefined : message.type; obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; - obj.height = message.height ? message.height.toString() : undefined; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; return obj; }, fromAminoMsg(object: EvidenceAminoMsg): Evidence { @@ -6765,9 +6765,9 @@ export const Snapshot = { }, toAmino(message: Snapshot): SnapshotAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.format = message.format; - obj.chunks = message.chunks; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.format = message.format === 0 ? undefined : message.format; + obj.chunks = message.chunks === 0 ? undefined : message.chunks; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; obj.metadata = message.metadata ? base64FromBytes(message.metadata) : undefined; return obj; diff --git a/__fixtures__/v-next/outputv4/tendermint/crypto/proof.ts b/__fixtures__/v-next/outputv4/tendermint/crypto/proof.ts index 8cdc44a66c..eb3082cbcd 100644 --- a/__fixtures__/v-next/outputv4/tendermint/crypto/proof.ts +++ b/__fixtures__/v-next/outputv4/tendermint/crypto/proof.ts @@ -208,13 +208,13 @@ export const Proof = { }, toAmino(message: Proof): ProofAmino { const obj: any = {}; - obj.total = message.total ? message.total.toString() : undefined; - obj.index = message.index ? message.index.toString() : undefined; + obj.total = message.total !== BigInt(0) ? message.total.toString() : undefined; + obj.index = message.index !== BigInt(0) ? message.index.toString() : undefined; obj.leaf_hash = message.leafHash ? base64FromBytes(message.leafHash) : undefined; if (message.aunts) { obj.aunts = message.aunts.map(e => base64FromBytes(e)); } else { - obj.aunts = []; + obj.aunts = message.aunts; } return obj; }, @@ -442,9 +442,9 @@ export const DominoOp = { }, toAmino(message: DominoOp): DominoOpAmino { const obj: any = {}; - obj.key = message.key; - obj.input = message.input; - obj.output = message.output; + obj.key = message.key === "" ? undefined : message.key; + obj.input = message.input === "" ? undefined : message.input; + obj.output = message.output === "" ? undefined : message.output; return obj; }, fromAminoMsg(object: DominoOpAminoMsg): DominoOp { @@ -564,7 +564,7 @@ export const ProofOp = { }, toAmino(message: ProofOp): ProofOpAmino { const obj: any = {}; - obj.type = message.type; + obj.type = message.type === "" ? undefined : message.type; obj.key = message.key ? base64FromBytes(message.key) : undefined; obj.data = message.data ? base64FromBytes(message.data) : undefined; return obj; @@ -663,7 +663,7 @@ export const ProofOps = { if (message.ops) { obj.ops = message.ops.map(e => e ? ProofOp.toAmino(e) : undefined); } else { - obj.ops = []; + obj.ops = message.ops; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/tendermint/libs/bits/types.ts b/__fixtures__/v-next/outputv4/tendermint/libs/bits/types.ts index b54daacdb2..b824c36692 100644 --- a/__fixtures__/v-next/outputv4/tendermint/libs/bits/types.ts +++ b/__fixtures__/v-next/outputv4/tendermint/libs/bits/types.ts @@ -115,11 +115,11 @@ export const BitArray = { }, toAmino(message: BitArray): BitArrayAmino { const obj: any = {}; - obj.bits = message.bits ? message.bits.toString() : undefined; + obj.bits = message.bits !== BigInt(0) ? message.bits.toString() : undefined; if (message.elems) { obj.elems = message.elems.map(e => e.toString()); } else { - obj.elems = []; + obj.elems = message.elems; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/tendermint/p2p/types.ts b/__fixtures__/v-next/outputv4/tendermint/p2p/types.ts index 87704a15a3..1c24960afa 100644 --- a/__fixtures__/v-next/outputv4/tendermint/p2p/types.ts +++ b/__fixtures__/v-next/outputv4/tendermint/p2p/types.ts @@ -189,9 +189,9 @@ export const ProtocolVersion = { }, 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; + obj.p2p = message.p2p !== BigInt(0) ? message.p2p.toString() : undefined; + obj.block = message.block !== BigInt(0) ? message.block.toString() : undefined; + obj.app = message.app !== BigInt(0) ? message.app.toString() : undefined; return obj; }, fromAminoMsg(object: ProtocolVersionAminoMsg): ProtocolVersion { @@ -396,12 +396,12 @@ export const NodeInfo = { 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.node_id = message.nodeId === "" ? undefined : message.nodeId; + obj.listen_addr = message.listenAddr === "" ? undefined : message.listenAddr; + obj.network = message.network === "" ? undefined : message.network; + obj.version = message.version === "" ? undefined : message.version; obj.channels = message.channels ? base64FromBytes(message.channels) : undefined; - obj.moniker = message.moniker; + obj.moniker = message.moniker === "" ? undefined : message.moniker; obj.other = message.other ? NodeInfoOther.toAmino(message.other) : undefined; return obj; }, @@ -506,8 +506,8 @@ export const NodeInfoOther = { }, toAmino(message: NodeInfoOther): NodeInfoOtherAmino { const obj: any = {}; - obj.tx_index = message.txIndex; - obj.rpc_address = message.rpcAddress; + obj.tx_index = message.txIndex === "" ? undefined : message.txIndex; + obj.rpc_address = message.rpcAddress === "" ? undefined : message.rpcAddress; return obj; }, fromAminoMsg(object: NodeInfoOtherAminoMsg): NodeInfoOther { @@ -633,11 +633,11 @@ export const PeerInfo = { }, toAmino(message: PeerInfo): PeerInfoAmino { const obj: any = {}; - obj.id = message.id; + obj.id = message.id === "" ? undefined : message.id; if (message.addressInfo) { obj.address_info = message.addressInfo.map(e => e ? PeerAddressInfo.toAmino(e) : undefined); } else { - obj.address_info = []; + obj.address_info = message.addressInfo; } obj.last_connected = message.lastConnected ? Timestamp.toAmino(toTimestamp(message.lastConnected)) : undefined; return obj; @@ -775,10 +775,10 @@ export const PeerAddressInfo = { }, toAmino(message: PeerAddressInfo): PeerAddressInfoAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.last_dial_success = message.lastDialSuccess ? Timestamp.toAmino(toTimestamp(message.lastDialSuccess)) : undefined; obj.last_dial_failure = message.lastDialFailure ? Timestamp.toAmino(toTimestamp(message.lastDialFailure)) : undefined; - obj.dial_failures = message.dialFailures; + obj.dial_failures = message.dialFailures === 0 ? undefined : message.dialFailures; return obj; }, fromAminoMsg(object: PeerAddressInfoAminoMsg): PeerAddressInfo { diff --git a/__fixtures__/v-next/outputv4/tendermint/types/evidence.ts b/__fixtures__/v-next/outputv4/tendermint/types/evidence.ts index a9ad7c29eb..06bf9dba0a 100644 --- a/__fixtures__/v-next/outputv4/tendermint/types/evidence.ts +++ b/__fixtures__/v-next/outputv4/tendermint/types/evidence.ts @@ -318,8 +318,8 @@ export const DuplicateVoteEvidence = { 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.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; + obj.validator_power = message.validatorPower !== BigInt(0) ? message.validatorPower.toString() : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -485,13 +485,13 @@ export const LightClientAttackEvidence = { 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; + obj.common_height = message.commonHeight !== BigInt(0) ? message.commonHeight.toString() : undefined; if (message.byzantineValidators) { obj.byzantine_validators = message.byzantineValidators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.byzantine_validators = []; + obj.byzantine_validators = message.byzantineValidators; } - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; return obj; }, @@ -589,7 +589,7 @@ export const EvidenceList = { if (message.evidence) { obj.evidence = message.evidence.map(e => e ? Evidence.toAmino(e) : undefined); } else { - obj.evidence = []; + obj.evidence = message.evidence; } return obj; }, diff --git a/__fixtures__/v-next/outputv4/tendermint/types/params.ts b/__fixtures__/v-next/outputv4/tendermint/types/params.ts index 57564d97f6..5c31de35d1 100644 --- a/__fixtures__/v-next/outputv4/tendermint/types/params.ts +++ b/__fixtures__/v-next/outputv4/tendermint/types/params.ts @@ -396,9 +396,9 @@ export const BlockParams = { }, 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; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas !== BigInt(0) ? message.maxGas.toString() : undefined; + obj.time_iota_ms = message.timeIotaMs !== BigInt(0) ? message.timeIotaMs.toString() : undefined; return obj; }, fromAminoMsg(object: BlockParamsAminoMsg): BlockParams { @@ -524,9 +524,9 @@ export const EvidenceParams = { }, toAmino(message: EvidenceParams): EvidenceParamsAmino { const obj: any = {}; - obj.max_age_num_blocks = message.maxAgeNumBlocks ? message.maxAgeNumBlocks.toString() : undefined; + obj.max_age_num_blocks = message.maxAgeNumBlocks !== BigInt(0) ? message.maxAgeNumBlocks.toString() : undefined; obj.max_age_duration = message.maxAgeDuration ? Duration.toAmino(message.maxAgeDuration) : undefined; - obj.max_bytes = message.maxBytes ? message.maxBytes.toString() : undefined; + obj.max_bytes = message.maxBytes !== BigInt(0) ? message.maxBytes.toString() : undefined; return obj; }, fromAminoMsg(object: EvidenceParamsAminoMsg): EvidenceParams { @@ -623,7 +623,7 @@ export const ValidatorParams = { if (message.pubKeyTypes) { obj.pub_key_types = message.pubKeyTypes.map(e => e); } else { - obj.pub_key_types = []; + obj.pub_key_types = message.pubKeyTypes; } return obj; }, @@ -714,7 +714,7 @@ export const VersionParams = { }, toAmino(message: VersionParams): VersionParamsAmino { const obj: any = {}; - obj.app_version = message.appVersion ? message.appVersion.toString() : undefined; + obj.app_version = message.appVersion !== BigInt(0) ? message.appVersion.toString() : undefined; return obj; }, fromAminoMsg(object: VersionParamsAminoMsg): VersionParams { @@ -822,8 +822,8 @@ export const HashedParams = { }, 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; + obj.block_max_bytes = message.blockMaxBytes !== BigInt(0) ? message.blockMaxBytes.toString() : undefined; + obj.block_max_gas = message.blockMaxGas !== BigInt(0) ? message.blockMaxGas.toString() : undefined; return obj; }, fromAminoMsg(object: HashedParamsAminoMsg): HashedParams { diff --git a/__fixtures__/v-next/outputv4/tendermint/types/types.ts b/__fixtures__/v-next/outputv4/tendermint/types/types.ts index 2579f14e55..62180c51dc 100644 --- a/__fixtures__/v-next/outputv4/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputv4/tendermint/types/types.ts @@ -433,7 +433,7 @@ export const PartSetHeader = { }, toAmino(message: PartSetHeader): PartSetHeaderAmino { const obj: any = {}; - obj.total = message.total; + obj.total = message.total === 0 ? undefined : message.total; obj.hash = message.hash ? base64FromBytes(message.hash) : undefined; return obj; }, @@ -556,7 +556,7 @@ export const Part = { }, toAmino(message: Part): PartAmino { const obj: any = {}; - obj.index = message.index; + obj.index = message.index === 0 ? undefined : message.index; obj.bytes = message.bytes ? base64FromBytes(message.bytes) : undefined; obj.proof = message.proof ? Proof.toAmino(message.proof) : undefined; return obj; @@ -968,8 +968,8 @@ export const Header = { 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.chain_id = message.chainId === "" ? undefined : message.chainId; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined; obj.last_block_id = message.lastBlockId ? BlockID.toAmino(message.lastBlockId) : undefined; obj.last_commit_hash = message.lastCommitHash ? base64FromBytes(message.lastCommitHash) : undefined; @@ -1077,7 +1077,7 @@ export const Data = { if (message.txs) { obj.txs = message.txs.map(e => base64FromBytes(e)); } else { - obj.txs = []; + obj.txs = message.txs; } return obj; }, @@ -1255,7 +1255,7 @@ export const Vote = { fromAmino(object: VoteAmino): Vote { const message = createBaseVote(); if (object.type !== undefined && object.type !== null) { - message.type = signedMsgTypeFromJSON(object.type); + message.type = object.type; } if (object.height !== undefined && object.height !== null) { message.height = BigInt(object.height); @@ -1282,13 +1282,13 @@ export const Vote = { }, toAmino(message: Vote): VoteAmino { const obj: any = {}; - obj.type = message.type; - obj.height = message.height ? message.height.toString() : undefined; - obj.round = message.round; + obj.type = message.type === 0 ? undefined : message.type; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.validator_address = message.validatorAddress ? base64FromBytes(message.validatorAddress) : undefined; - obj.validator_index = message.validatorIndex; + obj.validator_index = message.validatorIndex === 0 ? undefined : message.validatorIndex; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; return obj; }, @@ -1435,13 +1435,13 @@ export const Commit = { }, toAmino(message: Commit): CommitAmino { const obj: any = {}; - obj.height = message.height ? message.height.toString() : undefined; - obj.round = message.round; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : 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 = []; + obj.signatures = message.signatures; } return obj; }, @@ -1563,7 +1563,7 @@ export const CommitSig = { fromAmino(object: CommitSigAmino): CommitSig { const message = createBaseCommitSig(); if (object.block_id_flag !== undefined && object.block_id_flag !== null) { - message.blockIdFlag = blockIDFlagFromJSON(object.block_id_flag); + message.blockIdFlag = object.block_id_flag; } if (object.validator_address !== undefined && object.validator_address !== null) { message.validatorAddress = bytesFromBase64(object.validator_address); @@ -1578,7 +1578,7 @@ export const CommitSig = { }, toAmino(message: CommitSig): CommitSigAmino { const obj: any = {}; - obj.block_id_flag = message.blockIdFlag; + obj.block_id_flag = message.blockIdFlag === 0 ? undefined : message.blockIdFlag; obj.validator_address = message.validatorAddress ? base64FromBytes(message.validatorAddress) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; @@ -1745,7 +1745,7 @@ export const Proposal = { fromAmino(object: ProposalAmino): Proposal { const message = createBaseProposal(); if (object.type !== undefined && object.type !== null) { - message.type = signedMsgTypeFromJSON(object.type); + message.type = object.type; } if (object.height !== undefined && object.height !== null) { message.height = BigInt(object.height); @@ -1769,10 +1769,10 @@ export const Proposal = { }, 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.type = message.type === 0 ? undefined : message.type; + obj.height = message.height !== BigInt(0) ? message.height.toString() : undefined; + obj.round = message.round === 0 ? undefined : message.round; + obj.pol_round = message.polRound === 0 ? undefined : message.polRound; obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; obj.signature = message.signature ? base64FromBytes(message.signature) : undefined; @@ -2138,9 +2138,9 @@ export const BlockMeta = { 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.block_size = message.blockSize !== BigInt(0) ? message.blockSize.toString() : undefined; obj.header = message.header ? Header.toAmino(message.header) : undefined; - obj.num_txs = message.numTxs ? message.numTxs.toString() : undefined; + obj.num_txs = message.numTxs !== BigInt(0) ? message.numTxs.toString() : undefined; return obj; }, fromAminoMsg(object: BlockMetaAminoMsg): BlockMeta { diff --git a/__fixtures__/v-next/outputv4/tendermint/types/validator.ts b/__fixtures__/v-next/outputv4/tendermint/types/validator.ts index 104304adf3..cd32dbc43c 100644 --- a/__fixtures__/v-next/outputv4/tendermint/types/validator.ts +++ b/__fixtures__/v-next/outputv4/tendermint/types/validator.ts @@ -158,10 +158,10 @@ export const ValidatorSet = { if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); } else { - obj.validators = []; + obj.validators = message.validators; } obj.proposer = message.proposer ? Validator.toAmino(message.proposer) : undefined; - obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.total_voting_power = message.totalVotingPower !== BigInt(0) ? message.totalVotingPower.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorSetAminoMsg): ValidatorSet { @@ -305,8 +305,8 @@ export const Validator = { const obj: any = {}; obj.address = message.address ? base64FromBytes(message.address) : undefined; 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority !== BigInt(0) ? message.proposerPriority.toString() : undefined; return obj; }, fromAminoMsg(object: ValidatorAminoMsg): Validator { @@ -415,7 +415,7 @@ export const SimpleValidator = { 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; + obj.voting_power = message.votingPower !== BigInt(0) ? message.votingPower.toString() : undefined; return obj; }, fromAminoMsg(object: SimpleValidatorAminoMsg): SimpleValidator { diff --git a/__fixtures__/v-next/outputv4/tendermint/version/types.ts b/__fixtures__/v-next/outputv4/tendermint/version/types.ts index b2fe2649bc..1f1933a734 100644 --- a/__fixtures__/v-next/outputv4/tendermint/version/types.ts +++ b/__fixtures__/v-next/outputv4/tendermint/version/types.ts @@ -132,8 +132,8 @@ export const App = { }, toAmino(message: App): AppAmino { const obj: any = {}; - obj.protocol = message.protocol ? message.protocol.toString() : undefined; - obj.software = message.software; + obj.protocol = message.protocol !== BigInt(0) ? message.protocol.toString() : undefined; + obj.software = message.software === "" ? undefined : message.software; return obj; }, fromAminoMsg(object: AppAminoMsg): App { @@ -241,8 +241,8 @@ export const Consensus = { }, toAmino(message: Consensus): ConsensusAmino { const obj: any = {}; - obj.block = message.block ? message.block.toString() : undefined; - obj.app = message.app ? message.app.toString() : undefined; + obj.block = message.block !== BigInt(0) ? message.block.toString() : undefined; + obj.app = message.app !== BigInt(0) ? message.app.toString() : undefined; return obj; }, fromAminoMsg(object: ConsensusAminoMsg): Consensus { diff --git a/package.json b/package.json index bc8a41e7e9..ebe8b4e697 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "ast:fixture": "lerna run test:ast --parallel --scope \"@cosmology/ast\"", "ast:watch": "lerna run test:watch --parallel --scope \"@cosmology/ast\"", "regen": "lerna run test --parallel --scope \"@cosmology/telescope\"", + "resnap": "lerna run test:update --parallel --scope \"@cosmology/ast\"", "buidl:clean": "lerna run buidl:clean", "buidl:ast": "lerna run buidl --parallel --scope \"@cosmology/ast\"", "buidl:parser": "lerna run buidl --parallel --scope \"@cosmology/proto-parser\"", diff --git a/packages/ast/.editorconfig b/packages/ast/.editorconfig index 4a7ea3036a..779f99a12b 100644 --- a/packages/ast/.editorconfig +++ b/packages/ast/.editorconfig @@ -2,7 +2,7 @@ root = true [*] indent_style = space -indent_size = 2 +indent_size = 4 end_of_line = lf charset = utf-8 trim_trailing_whitespace = true diff --git a/packages/ast/package.json b/packages/ast/package.json index adba1c0edd..85a0f44ac6 100644 --- a/packages/ast/package.json +++ b/packages/ast/package.json @@ -32,6 +32,7 @@ "test": "jest", "test:ast": "cross-env NODE_ENV=development babel-node scripts/test-ast.js", "test:watch": "jest --watch", + "test:update": "jest --watch -u", "test:debug": "node --inspect node_modules/.bin/jest --runInBand" }, "jest": { diff --git a/packages/ast/src/encoding/__snapshots__/object.spec.ts.snap b/packages/ast/src/encoding/__snapshots__/object.spec.ts.snap index 05846c452d..e14639e7ad 100644 --- a/packages/ast/src/encoding/__snapshots__/object.spec.ts.snap +++ b/packages/ast/src/encoding/__snapshots__/object.spec.ts.snap @@ -88,9 +88,9 @@ exports[`cosmos/staking/v1beta1 Delegation 1`] = ` }, toAmino(message: Delegation): DelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.shares = message.shares; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.shares = message.shares === "" ? undefined : message.shares; return obj; }, fromAminoMsg(object: DelegationAminoMsg): Delegation { @@ -205,9 +205,9 @@ exports[`cosmos/staking/v1beta1 Delegation useCosmosSDKDec 1`] = ` }, toAmino(message: Delegation): DelegationAmino { const obj: any = {}; - obj.delegator_address = message.delegatorAddress; - obj.validator_address = message.validatorAddress; - obj.shares = padDecimal(message.shares); + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; + obj.shares = padDecimal(message.shares) === "" ? undefined : padDecimal(message.shares); return obj; }, fromAminoMsg(object: DelegationAminoMsg): Delegation { @@ -324,7 +324,7 @@ exports[`cosmos/tx/signing/v1beta1/signing SignatureDescriptor 1`] = ` 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; + obj.sequence = message.sequence !== BigInt(0) ? message.sequence.toString() : undefined; return obj; }, fromAminoMsg(object: SignatureDescriptorAminoMsg): SignatureDescriptor { @@ -420,7 +420,7 @@ exports[`cosmos/tx/signing/v1beta1/signing SignatureDescriptors 1`] = ` if (message.signatures) { obj.signatures = message.signatures.map(e => e ? SignatureDescriptor.toAmino(e) : undefined); } else { - obj.signatures = []; + obj.signatures = message.signatures; } return obj; }, @@ -541,7 +541,7 @@ exports[`cosmos/tx/v1beta1/tx AuxSignerData 1`] = ` message.signDoc = SignDocDirectAux.fromAmino(object.sign_doc); } if (object.mode !== undefined && object.mode !== null) { - message.mode = signModeFromJSON(object.mode); + message.mode = object.mode; } if (object.sig !== undefined && object.sig !== null) { message.sig = bytesFromBase64(object.sig); @@ -550,9 +550,9 @@ exports[`cosmos/tx/v1beta1/tx AuxSignerData 1`] = ` }, toAmino(message: AuxSignerData): AuxSignerDataAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.sign_doc = message.signDoc ? SignDocDirectAux.toAmino(message.signDoc) : undefined; - obj.mode = message.mode; + obj.mode = message.mode === 0 ? undefined : message.mode; obj.sig = message.sig ? base64FromBytes(message.sig) : undefined; return obj; }, @@ -785,12 +785,12 @@ exports[`cosmwasm/wasm/v1/proposal 1`] = ` }, toAmino(message: PinCodesProposal): PinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, @@ -921,12 +921,12 @@ exports[`cosmwasm/wasm/v1/proposal 2`] = ` }, toAmino(message: UnpinCodesProposal): UnpinCodesProposalAmino { const obj: any = {}; - obj.title = message.title; - obj.description = message.description; + obj.title = message.title === "" ? undefined : message.title; + obj.description = message.description === "" ? undefined : message.description; if (message.codeIds) { obj.code_ids = message.codeIds.map(e => e.toString()); } else { - obj.code_ids = []; + obj.code_ids = message.codeIds; } return obj; }, @@ -1028,7 +1028,7 @@ exports[`cosmwasm/wasm/v1/query 1`] = ` }, toAmino(message: QueryRawContractStateRequest): QueryRawContractStateRequestAmino { const obj: any = {}; - obj.address = message.address; + obj.address = message.address === "" ? undefined : message.address; obj.query_data = message.queryData ? base64FromBytes(message.queryData) : undefined; return obj; }, @@ -1173,13 +1173,13 @@ exports[`evmos/fees/v1/tx 1`] = ` }, toAmino(message: MsgRegisterDevFeeInfo): MsgRegisterDevFeeInfoAmino { const obj: any = {}; - obj.contract_address = message.contractAddress; - obj.deployer_address = message.deployerAddress; - obj.withdraw_address = message.withdrawAddress; + obj.contract_address = message.contractAddress === "" ? undefined : message.contractAddress; + obj.deployer_address = message.deployerAddress === "" ? undefined : message.deployerAddress; + obj.withdraw_address = message.withdrawAddress === "" ? undefined : message.withdrawAddress; if (message.nonces) { obj.nonces = message.nonces.map(e => e.toString()); } else { - obj.nonces = []; + obj.nonces = message.nonces; } return obj; }, @@ -1303,10 +1303,10 @@ exports[`google/api/expr/conformance/v1alpha1/conformance_service ParseRequest 1 }, 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; + obj.cel_source = message.celSource === "" ? undefined : message.celSource; + obj.syntax_version = message.syntaxVersion === "" ? undefined : message.syntaxVersion; + obj.source_location = message.sourceLocation === "" ? undefined : message.sourceLocation; + obj.disable_macros = message.disableMacros === false ? undefined : message.disableMacros; return obj; }, fromAminoMsg(object: ParseRequestAminoMsg): ParseRequest { @@ -1469,20 +1469,20 @@ exports[`google/api/expr/v1alpha1/checked Decl_FunctionDecl_Overload MapType 1`] }, toAmino(message: Decl_FunctionDecl_Overload): Decl_FunctionDecl_OverloadAmino { const obj: any = {}; - obj.overload_id = message.overloadId; + obj.overload_id = message.overloadId === "" ? undefined : message.overloadId; if (message.params) { obj.params = message.params.map(e => e ? Type.toAmino(e) : undefined); } else { - obj.params = []; + obj.params = message.params; } if (message.typeParams) { obj.type_params = message.typeParams.map(e => e); } else { - obj.type_params = []; + obj.type_params = message.typeParams; } obj.result_type = message.resultType ? Type.toAmino(message.resultType) : undefined; - obj.is_instance_function = message.isInstanceFunction; - obj.doc = message.doc; + obj.is_instance_function = message.isInstanceFunction === false ? undefined : message.isInstanceFunction; + obj.doc = message.doc === "" ? undefined : message.doc; return obj; }, fromAminoMsg(object: Decl_FunctionDecl_OverloadAminoMsg): Decl_FunctionDecl_Overload { @@ -1692,16 +1692,16 @@ exports[`google/api/expr/v1alpha1/checked Type 1`] = ` message.dyn = Empty.fromAmino(object.dyn); } if (object.null !== undefined && object.null !== null) { - message.null = nullValueFromJSON(object.null); + message.null = object.null; } if (object.primitive !== undefined && object.primitive !== null) { - message.primitive = type_PrimitiveTypeFromJSON(object.primitive); + message.primitive = object.primitive; } if (object.wrapper !== undefined && object.wrapper !== null) { - message.wrapper = type_PrimitiveTypeFromJSON(object.wrapper); + message.wrapper = object.wrapper; } if (object.well_known !== undefined && object.well_known !== null) { - message.wellKnown = type_WellKnownTypeFromJSON(object.well_known); + message.wellKnown = object.well_known; } if (object.list_type !== undefined && object.list_type !== null) { message.listType = Type_ListType.fromAmino(object.list_type); @@ -1732,15 +1732,15 @@ exports[`google/api/expr/v1alpha1/checked Type 1`] = ` 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.null = message.null === null ? undefined : message.null; + obj.primitive = message.primitive === null ? undefined : message.primitive; + obj.wrapper = message.wrapper === null ? undefined : message.wrapper; + obj.well_known = message.wellKnown === null ? undefined : 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.message_type = message.messageType === null ? undefined : message.messageType; + obj.type_param = message.typeParam === null ? undefined : 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; @@ -2065,7 +2065,7 @@ exports[`google/api/expr/v1alpha1/checked typeHash (Long) CheckedExpr 1`] = ` }); } obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined; - obj.expr_version = message.exprVersion; + obj.expr_version = message.exprVersion === "" ? undefined : message.exprVersion; obj.expr = message.expr ? Expr.toAmino(message.expr) : undefined; return obj; }, @@ -2233,7 +2233,7 @@ exports[`google/api/expr/v1alpha1/syntax Constant 1`] = ` fromAmino(object: ConstantAmino): Constant { const message = createBaseConstant(); if (object.null_value !== undefined && object.null_value !== null) { - message.nullValue = nullValueFromJSON(object.null_value); + message.nullValue = object.null_value; } if (object.bool_value !== undefined && object.bool_value !== null) { message.boolValue = object.bool_value; @@ -2263,12 +2263,12 @@ exports[`google/api/expr/v1alpha1/syntax Constant 1`] = ` }, 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.null_value = message.nullValue === null ? undefined : message.nullValue; + obj.bool_value = message.boolValue === null ? undefined : message.boolValue; + obj.int64_value = message.int64Value !== BigInt(0) ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value !== BigInt(0) ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue === null ? undefined : message.doubleValue; + obj.string_value = message.stringValue === null ? undefined : message.stringValue; obj.bytes_value = message.bytesValue ? base64FromBytes(message.bytesValue) : undefined; obj.duration_value = message.durationValue ? Duration.toAmino(message.durationValue) : undefined; obj.timestamp_value = message.timestampValue ? Timestamp.toAmino(toTimestamp(message.timestampValue)) : undefined; @@ -2459,7 +2459,7 @@ exports[`google/api/expr/v1alpha1/value MapValue 1`] = ` if (message.entries) { obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); } else { - obj.entries = []; + obj.entries = message.entries; } return obj; }, @@ -2624,11 +2624,11 @@ exports[`google/api/expr/v1beta1/source 1`] = ` }, toAmino(message: SourceInfo): SourceInfoAmino { const obj: any = {}; - obj.location = message.location; + obj.location = message.location === "" ? undefined : message.location; if (message.lineOffsets) { obj.line_offsets = message.lineOffsets.map(e => e); } else { - obj.line_offsets = []; + obj.line_offsets = message.lineOffsets; } obj.positions = {}; if (message.positions) { @@ -2768,7 +2768,7 @@ exports[`google/api/quota keyType 1`] = ` }, toAmino(message: MetricRule): MetricRuleAmino { const obj: any = {}; - obj.selector = message.selector; + obj.selector = message.selector === "" ? undefined : message.selector; obj.metric_costs = {}; if (message.metricCosts) { Object.entries(message.metricCosts).forEach(([k, v]) => { @@ -3011,7 +3011,7 @@ exports[`google/api/servicecontrol/v1/log_entry LogEntry 1`] = ` message.timestamp = fromTimestamp(Timestamp.fromAmino(object.timestamp)); } if (object.severity !== undefined && object.severity !== null) { - message.severity = logSeverityFromJSON(object.severity); + message.severity = object.severity; } if (object.http_request !== undefined && object.http_request !== null) { message.httpRequest = HttpRequest.fromAmino(object.http_request); @@ -3049,12 +3049,12 @@ exports[`google/api/servicecontrol/v1/log_entry LogEntry 1`] = ` }, toAmino(message: LogEntry): LogEntryAmino { const obj: any = {}; - obj.name = message.name; + obj.name = message.name === "" ? undefined : message.name; obj.timestamp = message.timestamp ? Timestamp.toAmino(toTimestamp(message.timestamp)) : undefined; - obj.severity = message.severity; + obj.severity = message.severity === 0 ? undefined : message.severity; obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; - obj.trace = message.trace; - obj.insert_id = message.insertId; + obj.trace = message.trace === "" ? undefined : message.trace; + obj.insert_id = message.insertId === "" ? undefined : message.insertId; obj.labels = {}; if (message.labels) { Object.entries(message.labels).forEach(([k, v]) => { @@ -3062,7 +3062,7 @@ exports[`google/api/servicecontrol/v1/log_entry LogEntry 1`] = ` }); } obj.proto_payload = message.protoPayload ? Any.toAmino(message.protoPayload) : undefined; - obj.text_payload = message.textPayload; + obj.text_payload = message.textPayload === null ? undefined : 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; @@ -3169,7 +3169,7 @@ exports[`google/rpc/error_details name collisions 2`] = ` if (message.violations) { obj.violations = message.violations.map(e => e ? PreconditionFailure_Violation.toAmino(e) : undefined); } else { - obj.violations = []; + obj.violations = message.violations; } return obj; }, @@ -3295,7 +3295,7 @@ exports[`ibc/core/port/v1/query 1`] = ` message.connectionId = object.connection_id; } if (object.ordering !== undefined && object.ordering !== null) { - message.ordering = orderFromJSON(object.ordering); + message.ordering = object.ordering; } if (object.counterparty !== undefined && object.counterparty !== null) { message.counterparty = Counterparty.fromAmino(object.counterparty); @@ -3307,11 +3307,11 @@ exports[`ibc/core/port/v1/query 1`] = ` }, toAmino(message: QueryAppVersionRequest): QueryAppVersionRequestAmino { const obj: any = {}; - obj.port_id = message.portId; - obj.connection_id = message.connectionId; - obj.ordering = message.ordering; + obj.port_id = message.portId === "" ? undefined : message.portId; + obj.connection_id = message.connectionId === "" ? undefined : message.connectionId; + obj.ordering = message.ordering === 0 ? undefined : message.ordering; obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; - obj.proposed_version = message.proposedVersion; + obj.proposed_version = message.proposedVersion === "" ? undefined : message.proposedVersion; return obj; }, fromAminoMsg(object: QueryAppVersionRequestAminoMsg): QueryAppVersionRequest { @@ -3402,11 +3402,6 @@ exports[`ibc/core/port/v1/query 2`] = ` "name": "Counterparty", "type": "typeImport", }, - { - "import": "ibc/core/channel/v1/channel.proto", - "name": "orderFromJSON", - "type": "fromJSONEnum", - }, { "import": "ibc/core/channel/v1/channel.proto", "importedAs": "Counterparty", @@ -3819,7 +3814,7 @@ exports[`osmosis/gamm/v1beta1/query 1`] = ` if (message.pools) { obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; @@ -3956,13 +3951,13 @@ exports[`osmosis/gamm/v1beta1/tx MsgJoinPool 1`] = ` }, 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; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.pool_id = message.poolId !== BigInt(0) ? message.poolId.toString() : undefined; + obj.share_out_amount = message.shareOutAmount === "" ? undefined : message.shareOutAmount; if (message.tokenInMaxs) { obj.token_in_maxs = message.tokenInMaxs.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.token_in_maxs = []; + obj.token_in_maxs = message.tokenInMaxs; } return obj; }, @@ -4098,14 +4093,14 @@ exports[`osmosis/gamm/v1beta1/tx MsgSwapExactAmountIn 1`] = ` }, toAmino(message: MsgSwapExactAmountIn): MsgSwapExactAmountInAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; - obj.token_out_min_amount = message.tokenOutMinAmount; + obj.token_out_min_amount = message.tokenOutMinAmount === "" ? undefined : message.tokenOutMinAmount; return obj; }, fromAminoMsg(object: MsgSwapExactAmountInAminoMsg): MsgSwapExactAmountIn { @@ -4240,13 +4235,13 @@ exports[`osmosis/gamm/v1beta1/tx MsgSwapExactAmountOut 1`] = ` }, toAmino(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; if (message.routes) { obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); } else { - obj.routes = []; + obj.routes = message.routes; } - obj.token_in_max_amount = message.tokenInMaxAmount; + obj.token_in_max_amount = message.tokenInMaxAmount === "" ? undefined : message.tokenInMaxAmount; obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; return obj; }, diff --git a/packages/ast/src/encoding/__tests__/__snapshots__/duration.gov.test.ts.snap b/packages/ast/src/encoding/__tests__/__snapshots__/duration.gov.test.ts.snap index 4dbcab9c39..4c22a4a96e 100644 --- a/packages/ast/src/encoding/__tests__/__snapshots__/duration.gov.test.ts.snap +++ b/packages/ast/src/encoding/__tests__/__snapshots__/duration.gov.test.ts.snap @@ -51,7 +51,7 @@ exports[`Duraation: duration DepositParams 1`] = ` if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; return obj; @@ -131,7 +131,7 @@ exports[`Duration: string DepositParams 1`] = ` if (message.minDeposit) { obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.min_deposit = []; + obj.min_deposit = message.minDeposit; } obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; return obj; diff --git a/packages/ast/src/encoding/__tests__/__snapshots__/lockup.test.ts.snap b/packages/ast/src/encoding/__tests__/__snapshots__/lockup.test.ts.snap index 6495018707..f21c812b35 100644 --- a/packages/ast/src/encoding/__tests__/__snapshots__/lockup.test.ts.snap +++ b/packages/ast/src/encoding/__tests__/__snapshots__/lockup.test.ts.snap @@ -102,12 +102,12 @@ exports[`osmosis/lockup/tx duration 2`] = ` }, toAmino(message: MsgLockTokens): MsgLockTokensAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : 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 = []; + obj.coins = message.coins; } return obj; }, @@ -293,12 +293,12 @@ exports[`osmosis/lockup/tx string 2`] = ` }, toAmino(message: MsgLockTokens): MsgLockTokensAmino { const obj: any = {}; - obj.owner = message.owner; + obj.owner = message.owner === "" ? undefined : 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 = []; + obj.coins = message.coins; } return obj; }, diff --git a/packages/ast/src/encoding/__tests__/__snapshots__/misc.overall.test.ts.snap b/packages/ast/src/encoding/__tests__/__snapshots__/misc.overall.test.ts.snap index 3319ca7889..86dbb80dae 100644 --- a/packages/ast/src/encoding/__tests__/__snapshots__/misc.overall.test.ts.snap +++ b/packages/ast/src/encoding/__tests__/__snapshots__/misc.overall.test.ts.snap @@ -275,16 +275,16 @@ exports[`misc/eval_request date 1`] = ` obj.refs[k] = IdRef.toAmino(v); }); } - obj.test_num = message.testNum; - obj.test_string = message.testString; - obj.test_bool = message.testBool; + obj.test_num = message.testNum === 0 ? undefined : message.testNum; + obj.test_string = message.testString === "" ? undefined : message.testString; + obj.test_bool = message.testBool === false ? undefined : message.testBool; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; - obj.id = message.id; - obj.name = message.name; + obj.id = message.id === null ? undefined : message.id; + obj.name = message.name === null ? undefined : message.name; if (message.testArray) { obj.test_array = message.testArray.map(e => e); } else { - obj.test_array = []; + obj.test_array = message.testArray; } return obj; }, @@ -581,16 +581,16 @@ exports[`misc/eval_request timestamp 1`] = ` obj.refs[k] = IdRef.toAmino(v); }); } - obj.test_num = message.testNum; - obj.test_string = message.testString; - obj.test_bool = message.testBool; + obj.test_num = message.testNum === 0 ? undefined : message.testNum; + obj.test_string = message.testString === "" ? undefined : message.testString; + obj.test_bool = message.testBool === false ? undefined : message.testBool; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; - obj.id = message.id; - obj.name = message.name; + obj.id = message.id === null ? undefined : message.id; + obj.name = message.name === null ? undefined : message.name; if (message.testArray) { obj.test_array = message.testArray.map(e => e); } else { - obj.test_array = []; + obj.test_array = message.testArray; } return obj; }, diff --git a/packages/ast/src/encoding/__tests__/__snapshots__/tendermint.test.ts.snap b/packages/ast/src/encoding/__tests__/__snapshots__/tendermint.test.ts.snap index 9b98f894b5..63192d76a7 100644 --- a/packages/ast/src/encoding/__tests__/__snapshots__/tendermint.test.ts.snap +++ b/packages/ast/src/encoding/__tests__/__snapshots__/tendermint.test.ts.snap @@ -258,7 +258,7 @@ exports[`ibc/lightclients/tendermint/v1/tendermint duration 2`] = ` }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : 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; @@ -268,15 +268,15 @@ exports[`ibc/lightclients/tendermint/v1/tendermint duration 2`] = ` if (message.proofSpecs) { obj.proof_specs = message.proofSpecs.map(e => e ? ProofSpec.toAmino(e) : undefined); } else { - obj.proof_specs = []; + obj.proof_specs = message.proofSpecs; } if (message.upgradePath) { obj.upgrade_path = message.upgradePath.map(e => e); } else { - obj.upgrade_path = []; + obj.upgrade_path = message.upgradePath; } - obj.allow_update_after_expiry = message.allowUpdateAfterExpiry; - obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour; + obj.allow_update_after_expiry = message.allowUpdateAfterExpiry === false ? undefined : message.allowUpdateAfterExpiry; + obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour === false ? undefined : message.allowUpdateAfterMisbehaviour; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { @@ -735,7 +735,7 @@ exports[`ibc/lightclients/tendermint/v1/tendermint string 2`] = ` }, toAmino(message: ClientState): ClientStateAmino { const obj: any = {}; - obj.chain_id = message.chainId; + obj.chain_id = message.chainId === "" ? undefined : 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; @@ -745,15 +745,15 @@ exports[`ibc/lightclients/tendermint/v1/tendermint string 2`] = ` if (message.proofSpecs) { obj.proof_specs = message.proofSpecs.map(e => e ? ProofSpec.toAmino(e) : undefined); } else { - obj.proof_specs = []; + obj.proof_specs = message.proofSpecs; } if (message.upgradePath) { obj.upgrade_path = message.upgradePath.map(e => e); } else { - obj.upgrade_path = []; + obj.upgrade_path = message.upgradePath; } - obj.allow_update_after_expiry = message.allowUpdateAfterExpiry; - obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour; + obj.allow_update_after_expiry = message.allowUpdateAfterExpiry === false ? undefined : message.allowUpdateAfterExpiry; + obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour === false ? undefined : message.allowUpdateAfterMisbehaviour; return obj; }, fromAminoMsg(object: ClientStateAminoMsg): ClientState { diff --git a/packages/ast/src/encoding/__tests__/misc.overall.test.ts b/packages/ast/src/encoding/__tests__/misc.overall.test.ts index dc59ae6ff4..0ebe36ed68 100644 --- a/packages/ast/src/encoding/__tests__/misc.overall.test.ts +++ b/packages/ast/src/encoding/__tests__/misc.overall.test.ts @@ -29,7 +29,8 @@ cases( context.options.interfaces!.enabled = true; context.options.interfaces!.useGlobalDecoderRegistry = true; context.options.aminoEncoding = { - enabled: true + enabled: true, + omitEmptyTags: ["omitempty" , "dont_omitempty"] } expectCode( diff --git a/packages/ast/src/encoding/amino/from-amino-json/index.ts b/packages/ast/src/encoding/amino/from-amino-json/index.ts index 7fe288c5b7..25c992a707 100644 --- a/packages/ast/src/encoding/amino/from-amino-json/index.ts +++ b/packages/ast/src/encoding/amino/from-amino-json/index.ts @@ -1,5 +1,5 @@ import * as t from '@babel/types'; -import { ProtoType, ProtoField } from '@cosmology/types'; +import { ProtoField, ProtoType } from '@cosmology/types'; import { arrowFunctionExpression } from '../../../utils'; import { AminoParseContext } from '../../context'; import { protoFieldsToArray } from '../utils'; @@ -18,7 +18,7 @@ export interface FromAminoParseField { fieldPath: ProtoField[]; nested: number; isOptional: boolean; -}; +} export const fromAminoParseField = ({ context, @@ -146,6 +146,7 @@ export const fromAminoParseField = ({ case 'fixed32': case 'sfixed32': case 'bool': + return fromAmino.defaultType(args) case 'bytes': return fromAmino.defaultType(args) diff --git a/packages/ast/src/encoding/amino/from-amino-json/utils.ts b/packages/ast/src/encoding/amino/from-amino-json/utils.ts index 3ef30e9e0b..b57952e14a 100644 --- a/packages/ast/src/encoding/amino/from-amino-json/utils.ts +++ b/packages/ast/src/encoding/amino/from-amino-json/utils.ts @@ -1,90 +1,130 @@ -import * as t from '@babel/types'; +import * as t from "@babel/types"; import { BILLION, memberExpressionOrIdentifierAminoCaseField, shorthandProperty, - TypeLong -} from '../../../utils'; -import { FromAminoParseField, fromAminoParseField } from './index' -import { protoFieldsToArray } from '../utils'; -import { getOneOfs, getFieldOptionality } from '../../proto'; -import { ProtoField } from '@cosmology/types'; -import { GenericParseContext } from '../../context'; + TypeLong, +} from "../../../utils"; +import { FromAminoParseField, fromAminoParseField } from "./index"; +import { protoFieldsToArray } from "../utils"; +import { getFieldOptionality, getOneOfs } from "../../proto"; +import { ProtoField } from "@cosmology/types"; +import { GenericParseContext } from "../../context"; export const fromAmino = { defaultType(args: FromAminoParseField) { - if (args.field.name === args.context.aminoCaseField(args.field) && args.scope.length === 1) { + if ( + args.field.name === args.context.aminoCaseField(args.field) && + args.scope.length === 1 + ) { return shorthandProperty(args.field.name); } + + const useNullHandling = !!args.context.pluginValue( + "aminoEncoding.legacy.useNullHandling" + ); + return t.objectProperty( t.identifier(args.field.name), - memberExpressionOrIdentifierAminoCaseField(args.fieldPath, args.context.aminoCaseField) + memberExpressionOrIdentifierAminoCaseField( + args.fieldPath, + args.context.aminoCaseField, + useNullHandling + ) ); }, string(args: FromAminoParseField) { - - if (args.field.name === args.context.aminoCaseField(args.field) && args.scope.length === 1) { + if ( + args.field.name === args.context.aminoCaseField(args.field) && + args.scope.length === 1 + ) { return shorthandProperty(args.field.name); } + const useNullHandling = !!args.context.pluginValue( + "aminoEncoding.legacy.useNullHandling" + ); return t.objectProperty( t.identifier(args.field.name), - memberExpressionOrIdentifierAminoCaseField(args.fieldPath, args.context.aminoCaseField) + memberExpressionOrIdentifierAminoCaseField( + args.fieldPath, + args.context.aminoCaseField, + useNullHandling + ) ); }, rawBytes(args: FromAminoParseField) { - args.context.addUtil('toUtf8'); + args.context.addUtil("toUtf8"); + const useNullHandling = !!args.context.pluginValue( + "aminoEncoding.legacy.useNullHandling" + ); + let prop = memberExpressionOrIdentifierAminoCaseField( + args.fieldPath, + args.context.aminoCaseField, + useNullHandling + ); + let value = t.callExpression(t.identifier("toUtf8"), [ + t.callExpression( + t.memberExpression( + t.identifier("JSON"), + t.identifier("stringify") + ), + [prop] + ), + ]); return t.objectProperty( t.identifier(args.field.name), - t.callExpression( - t.identifier('toUtf8'), - [ - t.callExpression( - t.memberExpression( - t.identifier('JSON'), - t.identifier('stringify') - ), - [ - memberExpressionOrIdentifierAminoCaseField(args.fieldPath, args.context.aminoCaseField) - ] - ) - ] - ) + this.nullCheckCondition(prop, prop, value, useNullHandling) ); }, wasmByteCode(args: FromAminoParseField) { - args.context.addUtil('fromBase64'); + args.context.addUtil("fromBase64"); + const useNullHandling = !!args.context.pluginValue( + "aminoEncoding.legacy.useNullHandling" + ); + let prop = memberExpressionOrIdentifierAminoCaseField( + args.fieldPath, + args.context.aminoCaseField, + useNullHandling + ); + let value = t.callExpression(t.identifier("fromBase64"), [prop]); return t.objectProperty( t.identifier(args.field.name), - t.callExpression( - t.identifier('fromBase64'), - [ - memberExpressionOrIdentifierAminoCaseField(args.fieldPath, args.context.aminoCaseField) - ] - ) + this.nullCheckCondition(prop, prop, value, useNullHandling) ); }, long(args: FromAminoParseField) { TypeLong.addUtil(args.context); - - return t.objectProperty(t.identifier(args.field.name), - t.callExpression( - TypeLong.getFromString(args.context), - [ - memberExpressionOrIdentifierAminoCaseField(args.fieldPath, args.context.aminoCaseField) - ] - )); + const useNullHandling = !!args.context.pluginValue( + "aminoEncoding.legacy.useNullHandling" + ); + const prop = memberExpressionOrIdentifierAminoCaseField( + args.fieldPath, + args.context.aminoCaseField, + useNullHandling + ); + return t.objectProperty( + t.identifier(args.field.name), + this.nullCheckCondition( + prop, + prop, + t.callExpression(TypeLong.getFromString(args.context), [prop]), + useNullHandling + ) + ); }, duration(args: FromAminoParseField) { - const durationFormat = args.context.pluginValue('prototypes.typingsFormat.duration'); + const durationFormat = args.context.pluginValue( + "prototypes.typingsFormat.duration" + ); switch (durationFormat) { - case 'duration': + case "duration": // TODO duration amino type - case 'string': + case "string": default: return fromAmino.durationString(args); } @@ -92,139 +132,203 @@ export const fromAmino = { durationString(args: FromAminoParseField) { TypeLong.addUtil(args.context); - - const value = t.objectExpression( - [ - t.objectProperty(t.identifier('seconds'), t.callExpression( - TypeLong.getFromNumber(args.context), [ + const useNullHandling = !!args.context.pluginValue( + "aminoEncoding.legacy.useNullHandling" + ); + let property = memberExpressionOrIdentifierAminoCaseField( + args.fieldPath, + args.context.aminoCaseField, + useNullHandling + ); + const value = t.objectExpression([ + t.objectProperty( + t.identifier("seconds"), + t.callExpression(TypeLong.getFromNumber(args.context), [ t.callExpression( t.memberExpression( - t.identifier('Math'), - t.identifier('floor') + t.identifier("Math"), + t.identifier("floor") ), [ - t.binaryExpression('/', - t.callExpression( - t.identifier('parseInt'), - [ - memberExpressionOrIdentifierAminoCaseField(args.fieldPath, args.context.aminoCaseField) - ] - ), + t.binaryExpression( + "/", + t.callExpression(t.identifier("parseInt"), [ + property, + ]), BILLION - ) + ), ] - ) - ] - )), - t.objectProperty( - t.identifier('nanos'), - t.binaryExpression('%', - t.callExpression( - t.identifier('parseInt'), - [ - memberExpressionOrIdentifierAminoCaseField(args.fieldPath, args.context.aminoCaseField) - ] - ), - BILLION - ) + ), + ]) + ), + t.objectProperty( + t.identifier("nanos"), + t.binaryExpression( + "%", + t.callExpression(t.identifier("parseInt"), [property]), + BILLION ) - ] + ), + ]); + return t.objectProperty( + t.identifier(args.field.name), + this.nullCheckCondition(property, property, value, useNullHandling) ); - return t.objectProperty(t.identifier(args.field.name), value); }, height(args: FromAminoParseField) { TypeLong.addUtil(args.context); const longType = TypeLong.getType(args.context); + const useNullHandling = !!args.context.pluginValue( + "aminoEncoding.legacy.useNullHandling" + ); let revisionHeightArgs: t.Expression[] = [ t.logicalExpression( - '||', + "||", t.memberExpression( - memberExpressionOrIdentifierAminoCaseField(args.fieldPath, args.context.aminoCaseField), - t.identifier(args.context.aminoCasingFn('revision_height')) + memberExpressionOrIdentifierAminoCaseField( + args.fieldPath, + args.context.aminoCaseField, + useNullHandling + ), + t.identifier(args.context.aminoCasingFn("revision_height")), + false, + true ), - t.stringLiteral('0') - ) + t.stringLiteral("0") + ), ]; let revisionNumberArgs: t.Expression[] = [ t.logicalExpression( - '||', + "||", t.memberExpression( - memberExpressionOrIdentifierAminoCaseField(args.fieldPath, args.context.aminoCaseField), - t.identifier(args.context.aminoCasingFn('revision_number')) + memberExpressionOrIdentifierAminoCaseField( + args.fieldPath, + args.context.aminoCaseField, + useNullHandling + ), + t.identifier(args.context.aminoCasingFn("revision_number")), + false, + true ), - t.stringLiteral('0') - ) + t.stringLiteral("0") + ), ]; - if (longType == 'Long') { - revisionHeightArgs.push(t.booleanLiteral(true)) - revisionNumberArgs.push(t.booleanLiteral(true)) + if (longType == "Long") { + revisionHeightArgs.push(t.booleanLiteral(true)); + revisionNumberArgs.push(t.booleanLiteral(true)); } return t.objectProperty( t.identifier(args.field.name), t.conditionalExpression( - memberExpressionOrIdentifierAminoCaseField(args.fieldPath, args.context.aminoCaseField), + memberExpressionOrIdentifierAminoCaseField( + args.fieldPath, + args.context.aminoCaseField, + useNullHandling + ), t.objectExpression([ - t.objectProperty(t.identifier('revisionHeight'), + t.objectProperty( + t.identifier("revisionHeight"), t.callExpression( TypeLong.getFromString(args.context), revisionHeightArgs ) ), - t.objectProperty(t.identifier('revisionNumber'), + t.objectProperty( + t.identifier("revisionNumber"), t.callExpression( TypeLong.getFromString(args.context), revisionNumberArgs ) - ) + ), ]), - t.identifier('undefined') + t.identifier("undefined") ) - ) + ); }, - enum({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: FromAminoParseField) { - const enumFunction = context.lookupEnumFromJson(field, currentProtoPath); - const value = t.callExpression( - t.identifier(enumFunction), [ - memberExpressionOrIdentifierAminoCaseField(fieldPath, context.aminoCaseField) - ]); - return t.objectProperty(t.identifier(field.name), value); + enum({ + context, + field, + currentProtoPath, + scope, + fieldPath, + nested, + isOptional, + }: FromAminoParseField) { + const enumFunction = context.lookupEnumFromJson( + field, + currentProtoPath + ); + const useNullHandling = !!context.pluginValue('aminoEncoding.legacy.useNullHandling'); + let prop = memberExpressionOrIdentifierAminoCaseField( + fieldPath, + context.aminoCaseField, + useNullHandling + ); + const value = t.callExpression(t.identifier(enumFunction), [prop]); + return t.objectProperty( + t.identifier(field.name), + this.nullCheckCondition(prop, prop, value, useNullHandling) + ); }, - enumArray({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: FromAminoParseField) { - const enumFunction = context.lookupEnumFromJson(field, currentProtoPath); - const value = t.callExpression( + enumArray({ + context, + field, + currentProtoPath, + scope, + fieldPath, + nested, + isOptional, + }: FromAminoParseField) { + const useNullHandling = !!context.pluginValue('aminoEncoding.legacy.useNullHandling'); + const enumFunction = context.lookupEnumFromJson( + field, + currentProtoPath + ); + const callExpression = useNullHandling ? t.optionalCallExpression : t.callExpression; + const value = callExpression( t.memberExpression( - memberExpressionOrIdentifierAminoCaseField(fieldPath, context.aminoCaseField), - t.identifier('map') + memberExpressionOrIdentifierAminoCaseField( + fieldPath, + context.aminoCaseField, + useNullHandling + ), + t.identifier("map"), + false, + true ), [ t.arrowFunctionExpression( - [ - t.identifier('el') - ], - t.callExpression( - t.identifier(enumFunction), - [ - t.identifier('el') - ] - ) - ) - ] + [t.identifier("el")], + t.callExpression(t.identifier(enumFunction), [ + t.identifier("el"), + ]) + ), + ], + true ); return t.objectProperty(t.identifier(field.name), value); }, - type({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: FromAminoParseField) { + type({ + context, + field, + currentProtoPath, + scope, + fieldPath, + nested, + isOptional, + }: FromAminoParseField) { const parentField = field; const Type = context.getTypeFromCurrentPath(field, currentProtoPath); const oneOfs = getOneOfs(Type); - const properties = protoFieldsToArray(Type).map(field => { + const properties = protoFieldsToArray(Type).map((field) => { const isOneOf = oneOfs.includes(field.name); const isOptional = getFieldOptionality(context, field, isOneOf); @@ -236,46 +340,66 @@ export const fromAmino = { scope: [...scope], fieldPath: [...fieldPath], nested: nested + 1, - isOptional // TODO how to handle nested optionality? - }) + isOptional, // TODO how to handle nested optionality? + }); }); - return t.objectProperty(t.identifier(field.name), - t.objectExpression( - properties - ) + const useNullHandling = !!context.pluginValue('aminoEncoding.legacy.useNullHandling'); + let prop = memberExpressionOrIdentifierAminoCaseField( + fieldPath, + context.aminoCaseField, + useNullHandling + ); + + return t.objectProperty( + t.identifier(field.name), + this.nullCheckCondition(prop, prop, t.objectExpression(properties), useNullHandling) ); }, arrayFrom(args: FromAminoParseField) { - return t.objectProperty(t.identifier(args.field.name), - t.callExpression( - t.memberExpression( - t.identifier('Array'), - t.identifier('from') - ), - [ - memberExpressionOrIdentifierAminoCaseField(args.fieldPath, args.context.aminoCaseField) - ] - )); + const useNullHandling = !!args.context.pluginValue( + "aminoEncoding.legacy.useNullHandling" + ); + let prop = memberExpressionOrIdentifierAminoCaseField( + args.fieldPath, + args.context.aminoCaseField, + useNullHandling + ); + let value = t.callExpression( + t.memberExpression(t.identifier("Array"), t.identifier("from")), + [prop] + ); + return t.objectProperty( + t.identifier(args.field.name), + this.nullCheckCondition(prop, prop, value, useNullHandling) + ); }, - typeArray({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: FromAminoParseField) { + typeArray({ + context, + field, + currentProtoPath, + scope, + fieldPath, + nested, + isOptional, + }: FromAminoParseField) { ////// - const variable = 'el' + nested; + const variable = "el" + nested; const f = JSON.parse(JSON.stringify(field)); // clone const varProto: ProtoField = { - ...f + ...f, }; varProto.name = variable; - varProto.options['(telescope:orig)'] = variable; - varProto.options['(telescope:name)'] = variable; - varProto.options['(telescope:camel)'] = variable; + varProto.options["(telescope:orig)"] = variable; + varProto.options["(telescope:name)"] = variable; + varProto.options["(telescope:camel)"] = variable; ////// const parentField = field; const Type = context.getTypeFromCurrentPath(field, currentProtoPath); const oneOfs = getOneOfs(Type); - const properties = protoFieldsToArray(Type).map(field => { + const properties = protoFieldsToArray(Type).map((field) => { const isOneOf = oneOfs.includes(field.name); const isOptional = getFieldOptionality(context, field, isOneOf); @@ -288,81 +412,110 @@ export const fromAmino = { scope: [variable], fieldPath: [varProto], nested: nested + 1, - isOptional // TODO how to handle nested optionality? - }) + isOptional, // TODO how to handle nested optionality? + }); }); + const useNullHandling = !!context.pluginValue('aminoEncoding.legacy.useNullHandling'); - const expr = t.callExpression( + const callExpression = useNullHandling ? t.optionalCallExpression : t.callExpression; + + const expr = callExpression( t.memberExpression( - memberExpressionOrIdentifierAminoCaseField(fieldPath, context.aminoCaseField), - t.identifier('map') + memberExpressionOrIdentifierAminoCaseField( + fieldPath, + context.aminoCaseField, + useNullHandling + ), + t.identifier("map"), + false, + true ), [ t.arrowFunctionExpression( - [ - t.identifier(variable) - ], - t.objectExpression( - properties - ) - ) - ] + [t.identifier(variable)], + t.objectExpression(properties) + ), + ], + true ); - return t.objectProperty(t.identifier(field.name), - expr - ); + return t.objectProperty(t.identifier(field.name), expr); }, - - scalarArray({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: FromAminoParseField, arrayTypeAstFunc: Function) { - const variable = 'el' + nested; - - const expr = t.callExpression( + scalarArray( + { + context, + field, + currentProtoPath, + scope, + fieldPath, + nested, + isOptional, + }: FromAminoParseField, + arrayTypeAstFunc: Function + ) { + const variable = "el" + nested; + const useNullHandling = !!context.pluginValue('aminoEncoding.legacy.useNullHandling'); + + const callExpression = useNullHandling ? t.optionalCallExpression : t.callExpression; + + const expr = callExpression( t.memberExpression( - memberExpressionOrIdentifierAminoCaseField(fieldPath, context.aminoCaseField), - t.identifier('map') + memberExpressionOrIdentifierAminoCaseField( + fieldPath, + context.aminoCaseField, + useNullHandling + ), + t.identifier("map"), + false, + true ), [ t.arrowFunctionExpression( - [ - t.identifier(variable) - ], + [t.identifier(variable)], arrayTypeAstFunc(variable, context) - ) - ] + ), + ], + true ); - return t.objectProperty(t.identifier(field.name), - expr - ); + return t.objectProperty(t.identifier(field.name), expr); }, pubkey(args: FromAminoParseField) { - args.context.addUtil('encodePubkey'); + args.context.addUtil("encodePubkey"); return t.objectProperty( t.identifier(args.field.name), - t.callExpression( - t.identifier('encodePubkey'), - [ - t.identifier('pubkey') - ] - ) - ) - } -}; + t.callExpression(t.identifier("encodePubkey"), [ + t.identifier("pubkey"), + ]) + ); + }, + /** + * value == null ? nullExpr : nonNullExpr + */ + nullCheckCondition( + value: t.Expression, + nullExpr: t.Expression, + nonNullExpr: t.Expression, + useNullHandling: boolean = false + ) { + return useNullHandling ? t.conditionalExpression( + t.binaryExpression("==", value, t.nullLiteral()), + nullExpr, + nonNullExpr + ) : nonNullExpr; + }, +}; export const arrayTypes = { long(varname: string, ctx: GenericParseContext) { TypeLong.addUtil(ctx); - return t.callExpression( - TypeLong.getFromString(ctx), - [ - t.identifier(varname) - ] - ) - } -} + return t.callExpression(TypeLong.getFromString(ctx), [ + t.identifier(varname), + ]); + }, +}; diff --git a/packages/ast/src/encoding/amino/to-amino-json/index.ts b/packages/ast/src/encoding/amino/to-amino-json/index.ts index 0f92c0060d..ff0f719b9f 100644 --- a/packages/ast/src/encoding/amino/to-amino-json/index.ts +++ b/packages/ast/src/encoding/amino/to-amino-json/index.ts @@ -5,6 +5,7 @@ import { ProtoType, ProtoField } from '@cosmology/types'; import { protoFieldsToArray } from '../utils'; import { arrayTypes, toAmino } from './utils'; import { getFieldOptionality, getOneOfs } from '../../proto'; +import { shouldOmitEmpty } from '@cosmology/utils'; const needsImplementation = (name: string, field: ProtoField) => { throw new Error(`need to implement toAmino (${field.type} rules[${field.rule}] name[${name}])`); @@ -22,7 +23,7 @@ export interface ToAminoParseField { fieldPath: ProtoField[]; nested: number; isOptional: boolean; -}; +} export const toAminoParseField = ({ context, @@ -70,9 +71,6 @@ export const toAminoParseField = ({ case 'bool': case 'bytes': return toAmino.defaultType(args); - - case 'string': - return toAmino.string(args); } switch (field.parsedType.type) { @@ -134,16 +132,18 @@ export const toAminoParseField = ({ } } + let omitEmpty = shouldOmitEmpty(args.context, field); + // scalar types... switch (field.type) { case 'string': - return toAmino.string(args); + return toAmino.string(args, omitEmpty); case 'int64': case 'sint64': case 'uint64': case 'fixed64': case 'sfixed64': - return toAmino.long(args); + return toAmino.long(args, omitEmpty); case 'double': case 'float': case 'int32': @@ -152,8 +152,9 @@ export const toAminoParseField = ({ case 'fixed32': case 'sfixed32': case 'bool': + return toAmino.defaultType(args, omitEmpty) case 'bytes': - return toAmino.defaultType(args) + return toAmino.defaultType(args, false) default: warningDefaultImplementation(field.name, field); @@ -226,4 +227,4 @@ export const toAminoJsonMethod = ({ )) ); -}; \ No newline at end of file +}; diff --git a/packages/ast/src/encoding/amino/to-amino-json/utils.ts b/packages/ast/src/encoding/amino/to-amino-json/utils.ts index baf65b991a..9baf1663aa 100644 --- a/packages/ast/src/encoding/amino/to-amino-json/utils.ts +++ b/packages/ast/src/encoding/amino/to-amino-json/utils.ts @@ -1,123 +1,177 @@ -import * as t from '@babel/types'; -import { BILLION, memberExpressionOrIdentifier, shorthandProperty, TypeLong } from "../../../utils"; -import { protoFieldsToArray } from '../utils'; -import { ToAminoParseField, toAminoParseField } from './index' -import { getFieldOptionality, getOneOfs } from '../../proto'; -import { ProtoField } from '@cosmology/types'; +import * as t from "@babel/types"; +import { + BILLION, + memberExpressionOrIdentifier, + shorthandProperty, + TypeLong, +} from "../../../utils"; +import { protoFieldsToArray } from "../utils"; +import { ToAminoParseField, toAminoParseField } from "./index"; +import { getFieldOptionality, getOneOfs } from "../../proto"; +import { ProtoField } from "@cosmology/types"; export const toAmino = { - defaultType(args: ToAminoParseField) { - if (args.field.name === args.context.aminoCaseField(args.field) && args.scope.length === 1) { + defaultType(args: ToAminoParseField, omitEmpty?: boolean) { + const useOmitEmpty = !!args.context.pluginValue( + "aminoEncoding.legacy.useOmitEmpty" + ); + + if ( + !(useOmitEmpty && omitEmpty) && + args.field.name === args.context.aminoCaseField(args.field) && + args.scope.length === 1 + ) { return shorthandProperty(args.field.name); } - return t.objectProperty(t.identifier(args.context.aminoCaseField(args.field)), memberExpressionOrIdentifier(args.scope)) + + let valueExpr = + useOmitEmpty && omitEmpty + ? this.omitDefaultMemberExpressionOrIdentifier(args, args.scope) + : memberExpressionOrIdentifier(args.scope); + + return t.objectProperty( + t.identifier(args.context.aminoCaseField(args.field)), + valueExpr + ); }, - long(args: ToAminoParseField) { - return t.objectProperty(t.identifier(args.context.aminoCaseField(args.field)), - t.callExpression( - t.memberExpression(memberExpressionOrIdentifier(args.scope), t.identifier('toString')), - []) - ) + long(args: ToAminoParseField, omitEmpty?: boolean) { + const useOmitEmpty = !!args.context.pluginValue( + "aminoEncoding.legacy.useOmitEmpty" + ); + const useNullHandling = !!args.context.pluginValue( + "aminoEncoding.legacy.useNullHandling" + ); + let valueExpr = + useOmitEmpty && omitEmpty + ? this.omitDefaultMemberExpressionOrIdentifier(args, args.scope) + : memberExpressionOrIdentifier(args.scope); + + const callExpression = useNullHandling + ? t.optionalCallExpression + : t.callExpression; + + return t.objectProperty( + t.identifier(args.context.aminoCaseField(args.field)), + callExpression( + useNullHandling + ? t.optionalMemberExpression( + valueExpr, + t.identifier("toString"), + false, + true + ) + : t.memberExpression(valueExpr, t.identifier("toString")), + [], + true + ) + ); }, - string(args: ToAminoParseField) { - const useCosmosSDKDec = args.context.pluginValue('aminoEncoding.customTypes.useCosmosSDKDec'); - - if(useCosmosSDKDec){ - const isCosmosSDKDec = - (args.field.options?.['(gogoproto.customtype)'] == - 'github.com/cosmos/cosmos-sdk/types.Dec') || - (args.field.options?.['(gogoproto.customtype)'] == - 'cosmossdk.io/math.LegacyDec'); - - if (isCosmosSDKDec) { - args.context.addUtil('padDecimal'); - return t.objectProperty(t.identifier(args.context.aminoCaseField(args.field)), - t.callExpression( - t.identifier('padDecimal'), - [ - memberExpressionOrIdentifier(args.scope) - ] - ) - ) - } + string(args: ToAminoParseField, omitEmpty?: boolean) { + const useCosmosSDKDec = args.context.pluginValue( + "aminoEncoding.customTypes.useCosmosSDKDec" + ); + + if (useCosmosSDKDec) { + const isCosmosSDKDec = + args.field.options?.["(gogoproto.customtype)"] == + "github.com/cosmos/cosmos-sdk/types.Dec" || + args.field.options?.["(gogoproto.customtype)"] == + "cosmossdk.io/math.LegacyDec"; + + if (isCosmosSDKDec) { + args.context.addUtil("padDecimal"); + return t.objectProperty( + t.identifier(args.context.aminoCaseField(args.field)), + t.callExpression(t.identifier("padDecimal"), [ + memberExpressionOrIdentifier(args.scope), + ]) + ); + } } - if (args.field.name === args.context.aminoCaseField(args.field) && args.scope.length === 1) { - return shorthandProperty(args.field.name); + if ( + args.field.name === args.context.aminoCaseField(args.field) && + args.scope.length === 1 + ) { + return shorthandProperty(args.field.name); } - return t.objectProperty(t.identifier(args.context.aminoCaseField(args.field)), memberExpressionOrIdentifier(args.scope)) + return t.objectProperty( + t.identifier(args.context.aminoCaseField(args.field)), + memberExpressionOrIdentifier(args.scope) + ); }, stringArray(args: ToAminoParseField) { - const useCosmosSDKDec = args.context.pluginValue('aminoEncoding.customTypes.useCosmosSDKDec'); + const useCosmosSDKDec = args.context.pluginValue( + "aminoEncoding.customTypes.useCosmosSDKDec" + ); - if(useCosmosSDKDec){ - const isCosmosSDKDec = - (args.field.options?.['(gogoproto.customtype)'] == - 'github.com/cosmos/cosmos-sdk/types.Dec') || - (args.field.options?.['(gogoproto.customtype)'] == - 'cosmossdk.io/math.LegacyDec'); + if (useCosmosSDKDec) { + const isCosmosSDKDec = + args.field.options?.["(gogoproto.customtype)"] == + "github.com/cosmos/cosmos-sdk/types.Dec" || + args.field.options?.["(gogoproto.customtype)"] == + "cosmossdk.io/math.LegacyDec"; - if (isCosmosSDKDec) { - return toAmino.scalarArray(args, arrayTypes.stringDec) + if (isCosmosSDKDec) { + return toAmino.scalarArray(args, arrayTypes.stringDec); + } } - } - if (args.field.name === args.context.aminoCaseField(args.field) && args.scope.length === 1) { - return shorthandProperty(args.field.name); - } + if ( + args.field.name === args.context.aminoCaseField(args.field) && + args.scope.length === 1 + ) { + return shorthandProperty(args.field.name); + } - return t.objectProperty(t.identifier(args.context.aminoCaseField(args.field)), memberExpressionOrIdentifier(args.scope)) + return t.objectProperty( + t.identifier(args.context.aminoCaseField(args.field)), + memberExpressionOrIdentifier(args.scope) + ); }, rawBytes(args: ToAminoParseField) { - args.context.addUtil('fromUtf8'); + args.context.addUtil("fromUtf8"); return t.objectProperty( t.identifier(args.context.aminoCaseField(args.field)), t.callExpression( - t.memberExpression( - t.identifier('JSON'), - t.identifier('parse') - ), + t.memberExpression(t.identifier("JSON"), t.identifier("parse")), [ - t.callExpression( - t.identifier('fromUtf8'), - [ - memberExpressionOrIdentifier(args.scope) - ] - ) + t.callExpression(t.identifier("fromUtf8"), [ + memberExpressionOrIdentifier(args.scope), + ]), ] ) - ); }, wasmByteCode(args: ToAminoParseField) { - args.context.addUtil('toBase64'); + args.context.addUtil("toBase64"); return t.objectProperty( t.identifier(args.context.aminoCaseField(args.field)), - t.callExpression( - t.identifier('toBase64'), - [ - memberExpressionOrIdentifier(args.scope) - ] - ) - + t.callExpression(t.identifier("toBase64"), [ + memberExpressionOrIdentifier(args.scope), + ]) ); }, duration(args: ToAminoParseField) { - const durationFormat = args.context.pluginValue('prototypes.typingsFormat.duration'); - const updatedDuration = args.context.pluginValue('prototypes.typingsFormat.updatedDuration'); + const durationFormat = args.context.pluginValue( + "prototypes.typingsFormat.duration" + ); + const updatedDuration = args.context.pluginValue( + "prototypes.typingsFormat.updatedDuration" + ); switch (durationFormat) { - case 'duration': + case "duration": if (updatedDuration) { return toAmino.durationType(args); } - case 'string': + case "string": default: return toAmino.durationString(args); } @@ -126,33 +180,33 @@ export const toAmino = { // (duration * 1_000_000_000).toString(), durationString(args: ToAminoParseField) { const exp = t.binaryExpression( - '*', + "*", memberExpressionOrIdentifier(args.scope), BILLION ); exp.extra = { parenthesized: true }; const value = t.callExpression( - t.memberExpression( - exp, - t.identifier('toString') - ), + t.memberExpression(exp, t.identifier("toString")), [] - ) - return t.objectProperty(t.identifier(args.context.aminoCaseField(args.field)), value); + ); + return t.objectProperty( + t.identifier(args.context.aminoCaseField(args.field)), + value + ); }, // (duration.seconds.toInt() * 1_000_000_000).toString(), // what about nanos? durationType(args: ToAminoParseField) { const exp = t.binaryExpression( - '*', + "*", t.callExpression( t.memberExpression( t.memberExpression( memberExpressionOrIdentifier(args.scope), - t.identifier('seconds') + t.identifier("seconds") ), - t.identifier('toInt') + t.identifier("toInt") ), [] ), @@ -160,70 +214,57 @@ export const toAmino = { ); exp.extra = { parenthesized: true }; const value = t.callExpression( - t.memberExpression( - exp, - t.identifier('toString') - ), + t.memberExpression(exp, t.identifier("toString")), [] - ) + ); return t.objectProperty( - t.identifier( - args.context.aminoCaseField(args.field) - ), + t.identifier(args.context.aminoCaseField(args.field)), value ); }, height(args: ToAminoParseField) { - args.context.addUtil('omitDefault'); + args.context.addUtil("omitDefault"); - const value = t.objectExpression( - [ - t.objectProperty( - t.identifier(args.context.aminoCasingFn('revision_height')), - t.optionalCallExpression( - t.optionalMemberExpression( - t.callExpression( - t.identifier('omitDefault'), - [ - t.memberExpression( - memberExpressionOrIdentifier(args.scope), - t.identifier('revisionHeight') - ) - ] + const value = t.objectExpression([ + t.objectProperty( + t.identifier(args.context.aminoCasingFn("revision_height")), + t.optionalCallExpression( + t.optionalMemberExpression( + t.callExpression(t.identifier("omitDefault"), [ + t.memberExpression( + memberExpressionOrIdentifier(args.scope), + t.identifier("revisionHeight") ), - t.identifier('toString'), - false, - true - ), - [], - false - ) - ), - // - t.objectProperty( - t.identifier(args.context.aminoCasingFn('revision_number')), - t.optionalCallExpression( - t.optionalMemberExpression( - t.callExpression( - t.identifier('omitDefault'), - [ - t.memberExpression( - memberExpressionOrIdentifier(args.scope), - t.identifier('revisionNumber') - ) - ] + ]), + t.identifier("toString"), + false, + true + ), + [], + false + ) + ), + // + t.objectProperty( + t.identifier(args.context.aminoCasingFn("revision_number")), + t.optionalCallExpression( + t.optionalMemberExpression( + t.callExpression(t.identifier("omitDefault"), [ + t.memberExpression( + memberExpressionOrIdentifier(args.scope), + t.identifier("revisionNumber") ), - t.identifier('toString'), - false, - true - ), - [], - false - ) + ]), + t.identifier("toString"), + false, + true + ), + [], + false ) - ] - ); + ), + ]); const cond = t.conditionalExpression( memberExpressionOrIdentifier(args.scope), @@ -231,61 +272,72 @@ export const toAmino = { t.objectExpression([]) ); - return t.objectProperty(t.identifier(args.context.aminoCaseField(args.field)), cond); + return t.objectProperty( + t.identifier(args.context.aminoCaseField(args.field)), + cond + ); }, coinAmount(args: ToAminoParseField) { const longType = TypeLong.getType(args.context); switch (longType) { - case 'BigInt': + case "BigInt": return t.memberExpression( memberExpressionOrIdentifier(args.scope), - t.identifier('amount') - ) - case 'Long': + t.identifier("amount") + ); + case "Long": default: TypeLong.addUtil(args.context); return t.callExpression( t.memberExpression( - t.callExpression( - TypeLong.getFromValue(args.context), - [ - t.memberExpression( - memberExpressionOrIdentifier(args.scope), - t.identifier('amount') - ) - ] - ), - t.identifier('toString') + t.callExpression(TypeLong.getFromValue(args.context), [ + t.memberExpression( + memberExpressionOrIdentifier(args.scope), + t.identifier("amount") + ), + ]), + t.identifier("toString") ), [] - ) + ); } }, coin(args: ToAminoParseField) { const value = t.objectExpression([ - t.objectProperty(t.identifier('denom'), t.memberExpression( - memberExpressionOrIdentifier(args.scope), - t.identifier('denom'), - )), t.objectProperty( - t.identifier('amount'), - toAmino.coinAmount(args) - ) + t.identifier("denom"), + t.memberExpression( + memberExpressionOrIdentifier(args.scope), + t.identifier("denom") + ) + ), + t.objectProperty(t.identifier("amount"), toAmino.coinAmount(args)), ]); - return t.objectProperty(t.identifier(args.context.aminoCaseField(args.field)), value); + return t.objectProperty( + t.identifier(args.context.aminoCaseField(args.field)), + value + ); }, - type({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: ToAminoParseField) { + type({ + context, + field, + currentProtoPath, + scope, + fieldPath, + nested, + isOptional, + }: ToAminoParseField) { /// TODO (can this be refactored out? e.g. no recursive calls in this file?) /// BEGIN const Type = context.getTypeFromCurrentPath(field, currentProtoPath); const parentField = field; const oneOfs = getOneOfs(Type); - const properties = protoFieldsToArray(Type).map(field => { + const properties = protoFieldsToArray(Type).map((field) => { const isOneOf = oneOfs.includes(field.name); const isOptional = getFieldOptionality(context, field, isOneOf); @@ -297,39 +349,46 @@ export const toAmino = { scope: [...scope], fieldPath: [...fieldPath], nested, - isOptional // TODO how to handle nested optionality - }) + isOptional, // TODO how to handle nested optionality + }); }); /// END - return t.objectProperty(t.identifier(context.aminoCaseField(field)), - t.objectExpression( - properties - ) + return t.objectProperty( + t.identifier(context.aminoCaseField(field)), + t.objectExpression(properties) ); }, - typeArray({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: ToAminoParseField) { + typeArray({ + context, + field, + currentProtoPath, + scope, + fieldPath, + nested, + isOptional, + }: ToAminoParseField) { ////// - const variable = 'el' + nested; + const variable = "el" + nested; const f = JSON.parse(JSON.stringify(field)); // clone const varProto: ProtoField = { - ...f + ...f, }; varProto.name = variable; - varProto.options['(telescope:orig)'] = variable; - varProto.options['(telescope:name)'] = variable; - varProto.options['(telescope:camel)'] = variable; + varProto.options["(telescope:orig)"] = variable; + varProto.options["(telescope:name)"] = variable; + varProto.options["(telescope:camel)"] = variable; ////// - if (field.parsedType.type !== 'Type') { - throw new Error('Arrays only support types[Type] right now.'); + if (field.parsedType.type !== "Type") { + throw new Error("Arrays only support types[Type] right now."); } const Type = context.getTypeFromCurrentPath(field, currentProtoPath); const parentField = field; const oneOfs = getOneOfs(Type); - const properties = protoFieldsToArray(Type).map(field => { + const properties = protoFieldsToArray(Type).map((field) => { const isOneOf = oneOfs.includes(field.name); const isOptional = getFieldOptionality(context, field, isOneOf); @@ -342,89 +401,103 @@ export const toAmino = { scope: [variable], fieldPath: [varProto], nested: nested + 1, - isOptional // TODO how to handle nested optionality + isOptional, // TODO how to handle nested optionality }); }); - const expr = t.callExpression( t.memberExpression( memberExpressionOrIdentifier(scope), - t.identifier('map') + t.identifier("map") ), [ t.arrowFunctionExpression( - [ - t.identifier(variable) - ], - t.objectExpression( - properties - ) - ) + [t.identifier(variable)], + t.objectExpression(properties) + ), ] ); - return t.objectProperty(t.identifier(context.aminoCaseField(field)), + return t.objectProperty( + t.identifier(context.aminoCaseField(field)), expr ); }, - scalarArray({ context, field, currentProtoPath, scope, nested, isOptional }: ToAminoParseField, arrayTypeAstFunc: Function) { - const variable = 'el' + nested; + scalarArray( + { + context, + field, + currentProtoPath, + scope, + nested, + isOptional, + }: ToAminoParseField, + arrayTypeAstFunc: Function + ) { + const variable = "el" + nested; const expr = t.callExpression( t.memberExpression( memberExpressionOrIdentifier(scope), - t.identifier('map') + t.identifier("map") ), [ t.arrowFunctionExpression( - [ - t.identifier(variable) - ], - arrayTypeAstFunc(variable, { context, field, currentProtoPath, scope, nested, isOptional }) - ) + [t.identifier(variable)], + arrayTypeAstFunc(variable, { + context, + field, + currentProtoPath, + scope, + nested, + isOptional, + }) + ), ] ); - return t.objectProperty(t.identifier(context.aminoCaseField(field)), + return t.objectProperty( + t.identifier(context.aminoCaseField(field)), expr ); }, pubkey(args: ToAminoParseField) { - args.context.addUtil('decodePubkey'); + args.context.addUtil("decodePubkey"); return t.objectProperty( t.identifier(args.field.name), t.tsNonNullExpression( - t.callExpression( - t.identifier('decodePubkey'), - [ - t.identifier(args.field.name) - ] - ) - ), - ) - - } + t.callExpression(t.identifier("decodePubkey"), [ + t.identifier(args.field.name), + ]) + ) + ); + }, + omitDefaultMemberExpressionOrIdentifier(args: ToAminoParseField, names) { + args.context.addUtil("omitDefault"); + return t.callExpression(t.identifier("omitDefault"), [ + memberExpressionOrIdentifier(names), + ]); + }, }; export const arrayTypes = { long(varname: string) { return t.callExpression( - t.memberExpression(memberExpressionOrIdentifier([varname]), t.identifier('toString')), + t.memberExpression( + memberExpressionOrIdentifier([varname]), + t.identifier("toString") + ), [] - ) + ); }, stringDec(varname: string, args: ToAminoParseField) { - args.context.addUtil('padDecimal'); - return t.callExpression( - t.identifier('padDecimal'), - [ - memberExpressionOrIdentifier([varname]) - ] - ) - } -} + args.context.addUtil("padDecimal"); + return t.callExpression(t.identifier("padDecimal"), [ + memberExpressionOrIdentifier([varname]), + ]); + }, +}; diff --git a/packages/ast/src/encoding/proto/__snapshots__/interfaces-amino.test.ts.snap b/packages/ast/src/encoding/proto/__snapshots__/interfaces-amino.test.ts.snap index bca00f43ea..fbdac4b5fb 100644 --- a/packages/ast/src/encoding/proto/__snapshots__/interfaces-amino.test.ts.snap +++ b/packages/ast/src/encoding/proto/__snapshots__/interfaces-amino.test.ts.snap @@ -160,8 +160,8 @@ exports[`Height 1`] = ` }, 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; + obj.revision_number = message.revisionNumber !== BigInt(0) ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight !== BigInt(0) ? message.revisionHeight.toString() : undefined; return obj; }, fromAminoMsg(object: HeightAminoMsg): Height { @@ -334,9 +334,9 @@ exports[`MsgCreateValidator 1`] = ` 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.min_self_delegation = message.minSelfDelegation === "" ? undefined : message.minSelfDelegation; + obj.delegator_address = message.delegatorAddress === "" ? undefined : message.delegatorAddress; + obj.validator_address = message.validatorAddress === "" ? undefined : message.validatorAddress; obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; obj.value = message.value ? Coin.toAmino(message.value) : undefined; return obj; @@ -453,7 +453,7 @@ exports[`MsgStoreCode 1`] = ` }, toAmino(message: MsgStoreCode): MsgStoreCodeAmino { const obj: any = {}; - obj.sender = message.sender; + obj.sender = message.sender === "" ? undefined : message.sender; obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; return obj; @@ -580,9 +580,9 @@ exports[`MsgSubmitProposal 1`] = ` if (message.initialDeposit) { obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); } else { - obj.initial_deposit = []; + obj.initial_deposit = message.initialDeposit; } - obj.proposer = message.proposer; + obj.proposer = message.proposer === "" ? undefined : message.proposer; return obj; }, fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { @@ -753,13 +753,13 @@ exports[`MsgTransfer 1`] = ` }, toAmino(message: MsgTransfer): MsgTransferAmino { const obj: any = {}; - obj.source_port = message.sourcePort; - obj.source_channel = message.sourceChannel; + obj.source_port = message.sourcePort === "" ? undefined : message.sourcePort; + obj.source_channel = message.sourceChannel === "" ? undefined : message.sourceChannel; obj.token = message.token ? Coin.toAmino(message.token) : undefined; - obj.sender = message.sender; - obj.receiver = message.receiver; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.receiver = message.receiver === "" ? undefined : message.receiver; obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; - obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp !== BigInt(0) ? message.timeoutTimestamp.toString() : undefined; return obj; }, fromAminoMsg(object: MsgTransferAminoMsg): MsgTransfer { diff --git a/packages/ast/src/encoding/proto/__tests__/__snapshots__/contracts.test.ts.snap b/packages/ast/src/encoding/proto/__tests__/__snapshots__/contracts.test.ts.snap index f70ca7fea5..c069876226 100644 --- a/packages/ast/src/encoding/proto/__tests__/__snapshots__/contracts.test.ts.snap +++ b/packages/ast/src/encoding/proto/__tests__/__snapshots__/contracts.test.ts.snap @@ -122,13 +122,13 @@ exports[`MsgExecuteContract interface 2`] = ` }, toAmino(message: MsgExecuteContract): MsgExecuteContractAmino { const obj: any = {}; - obj.sender = message.sender; - obj.contract = message.contract; + obj.sender = message.sender === "" ? undefined : message.sender; + obj.contract = message.contract === "" ? undefined : 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 = []; + obj.funds = message.funds; } return obj; }, diff --git a/packages/ast/src/encoding/proto/from-amino/index.ts b/packages/ast/src/encoding/proto/from-amino/index.ts index 034b00a99a..ba46e1d109 100644 --- a/packages/ast/src/encoding/proto/from-amino/index.ts +++ b/packages/ast/src/encoding/proto/from-amino/index.ts @@ -80,7 +80,7 @@ export const fromAminoMethodFields = ( default: switch (field.parsedType.type) { case "Enum": - return fromAminoJSON.array(args, arrayTypes.enum(args)); + return fromAminoJSON.array(args, arrayTypes.enum()); case "Type": return fromAminoJSON.array(args, arrayTypes.type(args)); } diff --git a/packages/ast/src/encoding/proto/from-amino/utils.ts b/packages/ast/src/encoding/proto/from-amino/utils.ts index 9bf53001db..b9fe2ca012 100644 --- a/packages/ast/src/encoding/proto/from-amino/utils.ts +++ b/packages/ast/src/encoding/proto/from-amino/utils.ts @@ -162,16 +162,7 @@ export const fromAmino = { }, enum(args: fromAminoMethod) { - const { origName } = getFieldNames(args.field); - - const fromAminoJSONFuncName = args.context.getFromEnum(args.field); - - return setNotUndefinedAndNotNull( - args, - t.callExpression(t.identifier(fromAminoJSONFuncName), [ - t.memberExpression(t.identifier("object"), t.identifier(origName)), - ]) - ); + return setNotUndefinedAndNotNull(args); }, bytes(args: fromAminoMethod) { @@ -535,11 +526,8 @@ export const arrayTypes = { sfixed32() { return arrayTypes.identity(); }, - enum(args: fromAminoMethod) { - const fromAminoJSONFuncName = args.context.getFromEnum(args.field); - return t.callExpression(t.identifier(fromAminoJSONFuncName), [ - t.identifier("e"), - ]); + enum() { + return arrayTypes.identity(); }, // message.codeIds = object.codeIds?.map(e => Long.fromValue(e)) || []; diff --git a/packages/ast/src/encoding/proto/implements/__tests__/__snapshots__/interface-decoder.test.ts.snap b/packages/ast/src/encoding/proto/implements/__tests__/__snapshots__/interface-decoder.test.ts.snap index 3c30eba460..7ee739bf3d 100644 --- a/packages/ast/src/encoding/proto/implements/__tests__/__snapshots__/interface-decoder.test.ts.snap +++ b/packages/ast/src/encoding/proto/implements/__tests__/__snapshots__/interface-decoder.test.ts.snap @@ -113,7 +113,7 @@ exports[`PoolI objects 1`] = ` if (message.pools) { obj.pools = message.pools.map(e => e ? PoolI_ToAmino((e as Any)) : undefined); } else { - obj.pools = []; + obj.pools = message.pools; } obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; return obj; diff --git a/packages/ast/src/encoding/proto/implements/__tests__/__snapshots__/interface-from-amino.test.ts.snap b/packages/ast/src/encoding/proto/implements/__tests__/__snapshots__/interface-from-amino.test.ts.snap index 5090e39cac..68a3eeca22 100644 --- a/packages/ast/src/encoding/proto/implements/__tests__/__snapshots__/interface-from-amino.test.ts.snap +++ b/packages/ast/src/encoding/proto/implements/__tests__/__snapshots__/interface-from-amino.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`MsgCreateValidator MsgCreateValidator 1`] = ` -"export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino) => { +"export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino): Any => { return encodePubkey(content); };" `; exports[`ProposalContent ProposalContent 1`] = ` -"export const ProposalContentI_FromAmino = (content: AnyAmino) => { +"export const ProposalContentI_FromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/v1/TextProposal": return Any.fromPartial({ @@ -66,7 +66,7 @@ exports[`ProposalContent ProposalContent 1`] = ` `; exports[`ProposalContent ProposalContent helper 1`] = ` -"export const ProposalContentI_fromAmino = (content: AnyAmino) => { +"export const ProposalContentI_fromAmino = (content: AnyAmino): Any => { switch (content.type) { case "cosmos-sdk/TextProposal": return Any.fromPartial({ diff --git a/packages/ast/src/encoding/proto/implements/from-amino.ts b/packages/ast/src/encoding/proto/implements/from-amino.ts index 729141638b..c13bea43d6 100644 --- a/packages/ast/src/encoding/proto/implements/from-amino.ts +++ b/packages/ast/src/encoding/proto/implements/from-amino.ts @@ -12,27 +12,33 @@ export const getInterfaceFromAminoName = (str: string) => { }; const makeFunctionWrapper = (functionName: string, stmt: t.Statement) => { + let arrowFunction = t.arrowFunctionExpression( + [ + identifier( + 'content', + t.tsTypeAnnotation( + t.tsTypeReference( + t.identifier('AnyAmino') + ) + ) + ) + ], + t.blockStatement([ + stmt + ]) + ); + arrowFunction.returnType = t.tsTypeAnnotation( + t.tsTypeReference( + t.identifier('Any') + ) + ); return t.exportNamedDeclaration( t.variableDeclaration( 'const', [ t.variableDeclarator( t.identifier(functionName), - t.arrowFunctionExpression( - [ - identifier( - 'content', - t.tsTypeAnnotation( - t.tsTypeReference( - t.identifier('AnyAmino') - ) - ) - ) - ], - t.blockStatement([ - stmt - ]) - ) + arrowFunction ) ] ) @@ -189,4 +195,4 @@ export const createInterfaceFromAminoHelper = ( } return makeFunctionWrapper(functionName, ast); -}; \ No newline at end of file +}; diff --git a/packages/ast/src/encoding/proto/implements/to-amino.ts b/packages/ast/src/encoding/proto/implements/to-amino.ts index 32b50d6885..2c3130595d 100644 --- a/packages/ast/src/encoding/proto/implements/to-amino.ts +++ b/packages/ast/src/encoding/proto/implements/to-amino.ts @@ -206,4 +206,4 @@ export const createInterfaceToAminoHelper = ( } return makeFunctionWrapper(context, functionName, ast); -}; \ No newline at end of file +}; diff --git a/packages/ast/src/encoding/proto/to-amino/index.ts b/packages/ast/src/encoding/proto/to-amino/index.ts index 05344b4531..0b9a5a449f 100644 --- a/packages/ast/src/encoding/proto/to-amino/index.ts +++ b/packages/ast/src/encoding/proto/to-amino/index.ts @@ -4,7 +4,6 @@ import { identifier, objectMethod } from '../../../utils'; import { ProtoParseContext } from '../../context'; import { ProtoField, ProtoType } from '@cosmology/types'; import { arrayTypes, toAminoJSON, toAminoMessages } from './utils'; -import { pascal } from 'case'; import { SymbolNames } from '../../types'; import { getAminoTypeName } from '../../amino'; @@ -73,7 +72,7 @@ export const toAminoJSONMethodFields = (context: ProtoParseContext, name: string default: switch (field.parsedType.type) { case 'Enum': - return [...m, toAminoJSON.array(args, arrayTypes.enum(args))]; + return [...m, toAminoJSON.array(args, arrayTypes.enum())]; case 'Type': return [...m, toAminoJSON.array(args, arrayTypes.type(args))]; } diff --git a/packages/ast/src/encoding/proto/to-amino/utils.ts b/packages/ast/src/encoding/proto/to-amino/utils.ts index c0a29d7daa..64b697bd75 100644 --- a/packages/ast/src/encoding/proto/to-amino/utils.ts +++ b/packages/ast/src/encoding/proto/to-amino/utils.ts @@ -1,24 +1,31 @@ - import * as t from '@babel/types'; - import { ProtoType } from '@cosmology/types'; - import { BILLION, TypeLong, identifier } from '../../../utils'; - import { ProtoParseContext } from '../../context'; - import { getDefaultTSTypeFromProtoType, getFieldNames } from '../../types'; - import { getInterfaceToAminoName } from '../implements'; - import { ToAminoJSONMethod } from './index'; - - const setValue = (args: ToAminoJSONMethod, valExpr?: t.Expression) => { +import * as t from '@babel/types'; +import { ProtoType } from '@cosmology/types'; +import { BILLION, identifier, TypeLong } from '../../../utils'; +import { ProtoParseContext } from '../../context'; +import { getDefaultTSTypeFromProtoType, getFieldNames, getDefaultTSTypeFromAminoTypeDefault } from '../../types'; +import { getInterfaceToAminoName } from '../implements'; +import { ToAminoJSONMethod } from './index'; +import { shouldOmitEmpty } from '@cosmology/utils'; + +const setValue = (args: ToAminoJSONMethod, valExpr?: t.Expression) => { const { propName, origName } = getFieldNames(args.field); - const dontOmitempty = args.field.options["(amino.dont_omitempty)"]; - - valExpr = valExpr ? valExpr : t.memberExpression(t.identifier("message"), t.identifier(propName)); - - if (dontOmitempty) { - valExpr = t.logicalExpression( - "??", - valExpr, - getDefaultTSTypeFromProtoType(args.context, args.field, args.isOneOf) - ); + const omitEmpty = shouldOmitEmpty(args.context, args.field); + + valExpr = valExpr ?? t.memberExpression(t.identifier("message"), t.identifier(propName)); + + if (omitEmpty) { + valExpr = t.conditionalExpression(t.binaryExpression( + "===", + valExpr, + getDefaultTSTypeFromProtoType(args.context, args.field, args.isOneOf, true) + ), t.identifier('undefined'), valExpr); + } else { + valExpr = t.logicalExpression( + "??", + valExpr, + getDefaultTSTypeFromProtoType(args.context, args.field, args.isOneOf, true) + ); } return t.expressionStatement( @@ -32,8 +39,8 @@ export const toAminoJSON = { - scalar(args: ToAminoJSONMethod) { - return setValue(args) + scalar(args: ToAminoJSONMethod, valExpr?: t.Expression) { + return setValue(args, valExpr) }, string(args: ToAminoJSONMethod) { @@ -96,38 +103,39 @@ return toAminoJSON.scalar(args); }, + // obj.big = message.big ? message.big.toString() : "0"; + // obj.o_big = message.oBig !== BigInt(0) ? message.oBig.toString() : undefined; long(args: ToAminoJSONMethod) { - const { propName, origName } = getFieldNames(args.field); - - const dontOmitempty = args.field.options["(amino.dont_omitempty)"]; + const { propName, origName } = getFieldNames(args.field); - return t.expressionStatement( - t.assignmentExpression( - '=', - t.memberExpression( - t.identifier('obj'), - t.identifier(origName) - ), - t.conditionalExpression( - t.memberExpression( - t.identifier('message'), - t.identifier(propName) - ), - t.callExpression( - t.memberExpression( - t.memberExpression( - t.identifier('message'), - t.identifier(propName) - ), - t.identifier('toString') - ), - [] - ), - dontOmitempty ? t.stringLiteral("0") : t.identifier('undefined') - ) - ) - ); + const omitEmpty = shouldOmitEmpty(args.context, args.field); + const nullTest = omitEmpty + ? TypeLong.getLongNotZero(propName, args.context) + : t.memberExpression( + t.identifier("message"), + t.identifier(propName) + ); + return t.expressionStatement( + t.assignmentExpression( + "=", + t.memberExpression(t.identifier("obj"), t.identifier(origName)), + t.conditionalExpression( + nullTest, + t.callExpression( + t.memberExpression( + t.memberExpression( + t.identifier("message"), + t.identifier(propName) + ), + t.identifier("toString") + ), + [] + ), + omitEmpty ? t.identifier("undefined") : t.stringLiteral("0") + ) + ) + ); }, int64(args: ToAminoJSONMethod) { return toAminoJSON.long(args); @@ -145,13 +153,16 @@ return toAminoJSON.long(args); }, + // obj.proto = message.proto ? AccessConfig.toAmino(message.proto) : AccessConfig.toAmino(AccessConfig.fromPartial({})); + // obj.o_proto = message.oProto ? AccessConfig.toAmino(message.oProto) : undefined; protoType(args: ToAminoJSONMethod) { const { propName, origName } = getFieldNames(args.field); const name = args.context.getTypeName(args.field); - const dontOmitempty = args.field.options["(amino.dont_omitempty)"]; + const omitEmpty = shouldOmitEmpty(args.context, args.field); + + let defaultValue: t.Expression = omitEmpty ? t.identifier('undefined') : getDefaultTSTypeFromAminoTypeDefault(args.context, args.field); - let defaultValue: t.Expression = dontOmitempty ? getDefaultTSTypeFromProtoType(args.context, args.field, args.isOneOf) : t.identifier('undefined'); if (args.field.type === 'ibc.core.client.v1.Height') { defaultValue = t.objectExpression([]) } @@ -196,9 +207,9 @@ args.context.getTypeName(args.field); - const dontOmitempty = args.field.options["(amino.dont_omitempty)"]; + const omitEmpty = shouldOmitEmpty(args.context, args.field); - let defaultValue: t.Expression = dontOmitempty ? t.objectExpression([ + let defaultValue: t.Expression = !omitEmpty ? t.objectExpression([ t.objectProperty(t.identifier("type"), t.stringLiteral("")), t.objectProperty(t.identifier("value"), t.objectExpression([])), ]) : t.identifier('undefined'); @@ -276,9 +287,10 @@ args.context.addUtil('base64FromBytes'); const { propName, origName } = getFieldNames(args.field); - const dontOmitempty = args.field.options["(amino.dont_omitempty)"]; - let defaultValue: t.Expression = dontOmitempty ? t.stringLiteral("") : t.identifier('undefined'); + const omitEmpty = shouldOmitEmpty(args.context,args.field); + + let defaultValue: t.Expression = !omitEmpty ? t.stringLiteral("") : t.identifier('undefined'); const expr = t.callExpression( t.identifier('base64FromBytes'), @@ -330,9 +342,10 @@ const { propName, origName } = getFieldNames(args.field); args.context.addUtil('toTimestamp'); - const dontOmitempty = args.field.options["(amino.dont_omitempty)"]; - let defaultValue: t.Expression = dontOmitempty ? getDefaultTSTypeFromProtoType(args.context, args.field, args.isOneOf) : t.identifier('undefined'); + const omitEmpty = shouldOmitEmpty(args.context,args.field); + + let defaultValue: t.Expression = !omitEmpty ? getDefaultTSTypeFromProtoType(args.context, args.field, args.isOneOf, true) : t.identifier('undefined'); return t.expressionStatement( t.assignmentExpression( @@ -374,9 +387,9 @@ const { propName, origName } = getFieldNames(args.field); - const dontOmitempty = args.field.options["(amino.dont_omitempty)"]; + const omitEmpty = shouldOmitEmpty(args.context,args.field); - let defaultValue: t.Expression = dontOmitempty ? getDefaultTSTypeFromProtoType(args.context, args.field, args.isOneOf) : t.identifier('undefined'); + let defaultValue: t.Expression = !omitEmpty ? getDefaultTSTypeFromProtoType(args.context, args.field, args.isOneOf, true) : t.identifier('undefined'); return t.expressionStatement( t.assignmentExpression( @@ -412,9 +425,10 @@ const { propName, origName } = getFieldNames(args.field); - const dontOmitempty = args.field.options["(amino.dont_omitempty)"]; - let defaultValue: t.Expression = dontOmitempty ? t.objectExpression([]) : t.identifier('undefined'); + const omitEmpty = shouldOmitEmpty(args.context,args.field); + + let defaultValue: t.Expression = !omitEmpty ? t.objectExpression([]) : t.identifier('undefined'); return t.expressionStatement( t.assignmentExpression( @@ -458,9 +472,10 @@ const { propName, origName } = getFieldNames(args.field); - const dontOmitempty = args.field.options["(amino.dont_omitempty)"]; - let defaultValue: t.Expression = dontOmitempty ? t.stringLiteral("") : t.identifier('undefined'); + const omitEmpty = shouldOmitEmpty(args.context,args.field); + + let defaultValue: t.Expression = !omitEmpty ? t.stringLiteral("") : t.identifier('undefined'); return t.expressionStatement( t.assignmentExpression( @@ -653,7 +668,10 @@ t.identifier('obj'), t.identifier(origName) ), - t.arrayExpression([]) + t.memberExpression( + t.identifier('message'), + t.identifier(propName) + ) ) ) ]) @@ -769,7 +787,7 @@ export const arrayTypes = { t.identifier("e"), ]); }, - enum(args: ToAminoJSONMethod) { + enum() { return arrayTypes.scalar(); }, anyType(args: ToAminoJSONMethod) { @@ -981,4 +999,4 @@ export const toAminoMessages = { } } -} \ No newline at end of file +} diff --git a/packages/ast/src/encoding/proto/types.ts b/packages/ast/src/encoding/proto/types.ts index cf6c19ab06..373abe4627 100644 --- a/packages/ast/src/encoding/proto/types.ts +++ b/packages/ast/src/encoding/proto/types.ts @@ -1,6 +1,7 @@ import { ProtoType, ProtoField } from '@cosmology/types'; import { pascal } from 'case'; import { AminoParseContext, ProtoParseContext } from '../context'; +import { shouldOmitEmpty } from '@cosmology/utils'; export const SCALAR_TYPES = [ 'string', @@ -193,9 +194,7 @@ export const getFieldOptionalityForAmino = ( return true; } - const dontOmitempty = !!field?.options?.['(amino.dont_omitempty)']; - - return !dontOmitempty; + return shouldOmitEmpty(context, field) }; export const isScalarField = ( diff --git a/packages/ast/src/encoding/types.ts b/packages/ast/src/encoding/types.ts index 21fa71225c..f7294fa9d9 100644 --- a/packages/ast/src/encoding/types.ts +++ b/packages/ast/src/encoding/types.ts @@ -1,5 +1,5 @@ import * as t from '@babel/types'; -import { TraversalSymbol, ProtoField, TelescopeLogLevel } from '@cosmology/types'; +import { ProtoField, TelescopeLogLevel, TraversalSymbol } from '@cosmology/types'; import { getProtoFieldTypeName, TypeLong } from '../utils'; import { GenericParseContext, ProtoParseContext } from './context'; import { getFieldOptionalityForDefaults, GOOGLE_TYPES, SCALAR_TYPES } from './proto'; @@ -405,7 +405,8 @@ export const getTSTypeForProto = ( export const getDefaultTSTypeFromProtoType = ( context: ProtoParseContext, field: ProtoField, - isOneOf: boolean + isOneOf: boolean, + useNullForOptionals: boolean = false ) => { const isOptional = getFieldOptionalityForDefaults(context, field, isOneOf); @@ -421,7 +422,7 @@ export const getDefaultTSTypeFromProtoType = ( } if (isOptional) { - return t.identifier('undefined'); + return useNullForOptionals ? t.nullLiteral() : t.identifier('undefined'); } if (field.parsedType?.type === 'Enum') { @@ -520,6 +521,26 @@ export const getDefaultTSTypeFromProtoType = ( }; }; +export const getDefaultTSTypeFromAminoTypeDefault = ( + context: ProtoParseContext, + field: ProtoField +) => { + const typeName = getProtoFieldTypeName(context, field); + + return t.callExpression( + t.memberExpression(t.identifier(typeName), t.identifier("toAmino")), + [ + t.callExpression( + t.memberExpression( + t.identifier(getProtoFieldTypeName(context, field)), + t.identifier("fromPartial") + ), + [t.objectExpression([])] + ), + ] + ); +}; + function getDefaultTSTypeFromProtoTypeDefault(context: ProtoParseContext,field: ProtoField) { return t.callExpression( t.memberExpression( @@ -528,4 +549,5 @@ function getDefaultTSTypeFromProtoTypeDefault(context: ProtoParseContext,field: ), [t.objectExpression([])] ) -} \ No newline at end of file +} + diff --git a/packages/ast/src/utils/utils.ts b/packages/ast/src/utils/utils.ts index 1e87e33949..a3574e9fe1 100644 --- a/packages/ast/src/utils/utils.ts +++ b/packages/ast/src/utils/utils.ts @@ -7,203 +7,237 @@ BILLION.extra = { raw: "1_000_000_000", rawValue: 1000000000 }; export { BILLION }; export const cleanComment = (str) => { - return str.replace(/\*\//g, "*\\/"); + return str.replace(/\*\//g, "*\\/"); }; const ensureOneSpace = (str) => { - if (/^[\s\n\t]+/.test(str)) return str; - return ` ${str}`; + if (/^[\s\n\t]+/.test(str)) return str; + return ` ${str}`; }; export const makeCommentBlock = (comment: string): t.CommentBlock => { - if (!/[\n]+/.test(comment)) { + if (!/[\n]+/.test(comment)) { + return { + type: "CommentBlock", + value: `* ${cleanComment(comment)} `, + start: null, + end: null, + loc: null, + }; + } + + let lines = comment.split("\n"); + lines = ["*", ...lines, " "]; + const comments = lines.map((line, i) => { + if (i == 0) return line; + if (i == 1) return ` *${ensureOneSpace(cleanComment(line))}`; + if (i == lines.length - 1) return cleanComment(line); + return ` *${ensureOneSpace(cleanComment(line))}`; + }); + return { - type: "CommentBlock", - value: `* ${cleanComment(comment)} `, - start: null, - end: null, - loc: null, + type: "CommentBlock", + value: comments.join("\n"), + start: null, + end: null, + loc: null, }; - } - - let lines = comment.split("\n"); - lines = ["*", ...lines, " "]; - const comments = lines.map((line, i) => { - if (i == 0) return line; - if (i == 1) return ` *${ensureOneSpace(cleanComment(line))}`; - if (i == lines.length - 1) return cleanComment(line); - return ` *${ensureOneSpace(cleanComment(line))}`; - }); - - return { - type: "CommentBlock", - value: comments.join("\n"), - start: null, - end: null, - loc: null, - }; }; export const renderNameSafely = (name) => { - return name - .split("_") - .map((str) => { - const parts = str.split("."); - str = parts[parts.length - 1]; - return str; - }) - .join("_"); + return name + .split("_") + .map((str) => { + const parts = str.split("."); + str = parts[parts.length - 1]; + return str; + }) + .join("_"); }; export const getProtoFieldTypeName = ( - context: ProtoParseContext, - field: ProtoField + context: ProtoParseContext, + field: ProtoField ) => { - let name = context.getTypeName(field); - return renderNameSafely(name); + let name = context.getTypeName(field); + return renderNameSafely(name); }; export const recursiveNamespace = (names, moduleBlockBody) => { - if (!names || !names.length) return moduleBlockBody; - const name = names.pop(); - const body = [ - t.exportNamedDeclaration( - t.tsModuleDeclaration( - t.identifier(name), - t.tsModuleBlock(recursiveNamespace(names, moduleBlockBody)) - ) - ), - ]; - return body; + if (!names || !names.length) return moduleBlockBody; + const name = names.pop(); + const body = [ + t.exportNamedDeclaration( + t.tsModuleDeclaration( + t.identifier(name), + t.tsModuleBlock(recursiveNamespace(names, moduleBlockBody)) + ) + ), + ]; + return body; }; export const bindMethod = (name: string) => { - return t.expressionStatement( - t.assignmentExpression( - "=", - t.memberExpression(t.thisExpression(), t.identifier(name)), - t.callExpression( - t.memberExpression( - t.memberExpression(t.thisExpression(), t.identifier(name)), - t.identifier("bind") - ), - [t.thisExpression()] - ) - ) - ); + return t.expressionStatement( + t.assignmentExpression( + "=", + t.memberExpression(t.thisExpression(), t.identifier(name)), + t.callExpression( + t.memberExpression( + t.memberExpression(t.thisExpression(), t.identifier(name)), + t.identifier("bind") + ), + [t.thisExpression()] + ) + ) + ); }; export const shorthandProperty = (prop: string) => { - return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true); + return t.objectProperty( + t.identifier(prop), + t.identifier(prop), + false, + true + ); }; export const importStmt = (names: string[], path: string) => { - return t.importDeclaration( - names.map((name) => - t.importSpecifier(t.identifier(name), t.identifier(name)) - ), - t.stringLiteral(path) - ); + return t.importDeclaration( + names.map((name) => + t.importSpecifier(t.identifier(name), t.identifier(name)) + ), + t.stringLiteral(path) + ); }; export const memberExpressionOrIdentifier = (names) => { - if (names.length === 1) { - return t.identifier(names[0]); - } - if (names.length === 2) { - const [b, a] = names; - return t.memberExpression(t.identifier(a), t.identifier(b)); - } - const [name, ...rest] = names; + if (names.length === 1) { + return t.identifier(names[0]); + } + if (names.length === 2) { + const [b, a] = names; + return t.memberExpression(t.identifier(a), t.identifier(b)); + } + const [name, ...rest] = names; - return t.memberExpression( - memberExpressionOrIdentifier(rest), - t.identifier(name) - ); + return t.memberExpression( + memberExpressionOrIdentifier(rest), + t.identifier(name) + ); }; export const memberExpressionOrIdentifierAminoCasing = ( - names, - aminoCasingFn: Function + names, + aminoCasingFn: Function ) => { - if (names.length === 1) { - return t.identifier(aminoCasingFn(names[0])); - } - if (names.length === 2) { - const [b, a] = names; + if (names.length === 1) { + return t.identifier(aminoCasingFn(names[0])); + } + if (names.length === 2) { + const [b, a] = names; + return t.memberExpression( + t.identifier(aminoCasingFn(a)), + t.identifier(aminoCasingFn(b)) + ); + } + const [name, ...rest] = names; + return t.memberExpression( - t.identifier(aminoCasingFn(a)), - t.identifier(aminoCasingFn(b)) + memberExpressionOrIdentifierAminoCasing(rest, aminoCasingFn), + t.identifier(aminoCasingFn(name)) ); - } - const [name, ...rest] = names; - - return t.memberExpression( - memberExpressionOrIdentifierAminoCasing(rest, aminoCasingFn), - t.identifier(aminoCasingFn(name)) - ); }; export const memberExpressionOrIdentifierAminoCaseField = ( - fields: ProtoField[], - aminoCaseFunc: Function + fields: ProtoField[], + aminoCaseFunc: Function, + useNullHandling: boolean = false ) => { - if (fields.length === 1) { - return t.identifier(aminoCaseFunc(fields[0])); - } - if (fields.length === 2) { - const [b, a] = fields; - return t.memberExpression( - t.identifier(aminoCaseFunc(a)), - t.identifier(aminoCaseFunc(b)) - ); - } - const [field, ...rest] = fields; - - return t.memberExpression( - memberExpressionOrIdentifierAminoCaseField(rest, aminoCaseFunc), - t.identifier(aminoCaseFunc(field)) - ); + if (fields.length === 1) { + return t.identifier(aminoCaseFunc(fields[0])); + } + if (fields.length === 2) { + const [b, a] = fields; + return useNullHandling + ? t.memberExpression( + t.identifier(aminoCaseFunc(a)), + t.identifier(aminoCaseFunc(b)), + false, + true + ) + : t.memberExpression( + t.identifier(aminoCaseFunc(a)), + t.identifier(aminoCaseFunc(b)) + ); + } + const [field, ...rest] = fields; + + return useNullHandling + ? t.memberExpression( + memberExpressionOrIdentifierAminoCaseField( + rest, + aminoCaseFunc, + useNullHandling + ), + t.identifier(aminoCaseFunc(field)), + false, + true + ) + : t.memberExpression( + memberExpressionOrIdentifierAminoCaseField( + rest, + aminoCaseFunc, + useNullHandling + ), + t.identifier(aminoCaseFunc(field)) + ); }; export const promiseTypeAnnotation = (name) => { - return t.tsTypeAnnotation( - t.tsTypeReference( - t.identifier("Promise"), - t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(name))]) - ) - ); + return t.tsTypeAnnotation( + t.tsTypeReference( + t.identifier("Promise"), + t.tsTypeParameterInstantiation([ + t.tsTypeReference(t.identifier(name)), + ]) + ) + ); }; export const getAcceptedInterfacesTypes = ( - context: ProtoParseContext, - lookupInterface: string + context: ProtoParseContext, + lookupInterface: string ) => { - return lookupInterface ? context.store._symbols.filter( - (s) => - s.implementsType === lookupInterface && s.ref === context.ref.filename - ) : []; + return lookupInterface + ? context.store._symbols.filter( + (s) => + s.implementsType === lookupInterface && + s.ref === context.ref.filename + ) + : []; }; export const getSdkFieldName = (fieldName: string, field: ProtoField) => { - return field.options?.["(telescope:orig)"] ?? fieldName; + return field.options?.["(telescope:orig)"] ?? fieldName; }; export const getAminoFieldName = ( - fieldName: string, - field: ProtoField, - interfaceName: string, - context: ProtoParseContext + fieldName: string, + field: ProtoField, + interfaceName: string, + context: ProtoParseContext ) => { - const orig = field.options?.["(telescope:orig)"] ?? fieldName; - - if ( - (interfaceName === "Any" && - context.ref.proto.package === "google.protobuf" && - ( orig === "type_url" || orig === "typeUrl" ))) { - // type_url => type for amino - return "type"; - } - - return orig; + const orig = field.options?.["(telescope:orig)"] ?? fieldName; + + if ( + interfaceName === "Any" && + context.ref.proto.package === "google.protobuf" && + (orig === "type_url" || orig === "typeUrl") + ) { + // type_url => type for amino + return "type"; + } + + return orig; }; diff --git a/packages/ast/types/encoding/amino/from-amino-json/index.d.ts b/packages/ast/types/encoding/amino/from-amino-json/index.d.ts index 26afc0a66a..e00df8c8dc 100644 --- a/packages/ast/types/encoding/amino/from-amino-json/index.d.ts +++ b/packages/ast/types/encoding/amino/from-amino-json/index.d.ts @@ -1,5 +1,5 @@ import * as t from '@babel/types'; -import { ProtoType, ProtoField } from '@cosmology/types'; +import { ProtoField, ProtoType } from '@cosmology/types'; import { AminoParseContext } from '../../context'; export interface FromAminoParseField { context: AminoParseContext; diff --git a/packages/ast/types/encoding/amino/from-amino-json/utils.d.ts b/packages/ast/types/encoding/amino/from-amino-json/utils.d.ts index 945c3dd5b8..510c46092f 100644 --- a/packages/ast/types/encoding/amino/from-amino-json/utils.d.ts +++ b/packages/ast/types/encoding/amino/from-amino-json/utils.d.ts @@ -1,6 +1,6 @@ -import * as t from '@babel/types'; -import { FromAminoParseField } from './index'; -import { GenericParseContext } from '../../context'; +import * as t from "@babel/types"; +import { FromAminoParseField } from "./index"; +import { GenericParseContext } from "../../context"; export declare const fromAmino: { defaultType(args: FromAminoParseField): t.ObjectProperty; string(args: FromAminoParseField): t.ObjectProperty; @@ -10,13 +10,17 @@ export declare const fromAmino: { duration(args: FromAminoParseField): t.ObjectProperty; durationString(args: FromAminoParseField): t.ObjectProperty; height(args: FromAminoParseField): t.ObjectProperty; - enum({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: FromAminoParseField): t.ObjectProperty; - enumArray({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: FromAminoParseField): t.ObjectProperty; - type({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: FromAminoParseField): any; + enum({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional, }: FromAminoParseField): t.ObjectProperty; + enumArray({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional, }: FromAminoParseField): t.ObjectProperty; + type({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional, }: FromAminoParseField): any; arrayFrom(args: FromAminoParseField): t.ObjectProperty; - typeArray({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: FromAminoParseField): t.ObjectProperty; - scalarArray({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: FromAminoParseField, arrayTypeAstFunc: Function): t.ObjectProperty; + typeArray({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional, }: FromAminoParseField): any; + scalarArray({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional, }: FromAminoParseField, arrayTypeAstFunc: Function): t.ObjectProperty; pubkey(args: FromAminoParseField): t.ObjectProperty; + /** + * value == null ? nullExpr : nonNullExpr + */ + nullCheckCondition(value: t.Expression, nullExpr: t.Expression, nonNullExpr: t.Expression, useNullHandling?: boolean): t.Expression; }; export declare const arrayTypes: { long(varname: string, ctx: GenericParseContext): t.CallExpression; diff --git a/packages/ast/types/encoding/amino/to-amino-json/utils.d.ts b/packages/ast/types/encoding/amino/to-amino-json/utils.d.ts index 4dafebd3c8..0d254f13b7 100644 --- a/packages/ast/types/encoding/amino/to-amino-json/utils.d.ts +++ b/packages/ast/types/encoding/amino/to-amino-json/utils.d.ts @@ -1,9 +1,9 @@ -import * as t from '@babel/types'; -import { ToAminoParseField } from './index'; +import * as t from "@babel/types"; +import { ToAminoParseField } from "./index"; export declare const toAmino: { - defaultType(args: ToAminoParseField): t.ObjectProperty; - long(args: ToAminoParseField): t.ObjectProperty; - string(args: ToAminoParseField): t.ObjectProperty; + defaultType(args: ToAminoParseField, omitEmpty?: boolean): t.ObjectProperty; + long(args: ToAminoParseField, omitEmpty?: boolean): t.ObjectProperty; + string(args: ToAminoParseField, omitEmpty?: boolean): t.ObjectProperty; stringArray(args: ToAminoParseField): t.ObjectProperty; rawBytes(args: ToAminoParseField): t.ObjectProperty; wasmByteCode(args: ToAminoParseField): t.ObjectProperty; @@ -13,10 +13,11 @@ export declare const toAmino: { height(args: ToAminoParseField): t.ObjectProperty; coinAmount(args: ToAminoParseField): t.CallExpression | t.MemberExpression; coin(args: ToAminoParseField): t.ObjectProperty; - type({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: ToAminoParseField): any; - typeArray({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional }: ToAminoParseField): t.ObjectProperty; - scalarArray({ context, field, currentProtoPath, scope, nested, isOptional }: ToAminoParseField, arrayTypeAstFunc: Function): t.ObjectProperty; + type({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional, }: ToAminoParseField): any; + typeArray({ context, field, currentProtoPath, scope, fieldPath, nested, isOptional, }: ToAminoParseField): t.ObjectProperty; + scalarArray({ context, field, currentProtoPath, scope, nested, isOptional, }: ToAminoParseField, arrayTypeAstFunc: Function): t.ObjectProperty; pubkey(args: ToAminoParseField): t.ObjectProperty; + omitDefaultMemberExpressionOrIdentifier(args: ToAminoParseField, names: any): t.CallExpression; }; export declare const arrayTypes: { long(varname: string): t.CallExpression; diff --git a/packages/ast/types/encoding/proto/from-amino/utils.d.ts b/packages/ast/types/encoding/proto/from-amino/utils.d.ts index d0cec6aa2e..a0d646d8c5 100644 --- a/packages/ast/types/encoding/proto/from-amino/utils.d.ts +++ b/packages/ast/types/encoding/proto/from-amino/utils.d.ts @@ -48,7 +48,7 @@ export declare const arrayTypes: { sint32(): t.Identifier; fixed32(): t.Identifier; sfixed32(): t.Identifier; - enum(args: fromAminoMethod): t.CallExpression; + enum(): t.Identifier; long(args: fromAminoMethod): t.Expression; int64(args: fromAminoMethod): t.Expression; uint64(args: fromAminoMethod): t.Expression; diff --git a/packages/ast/types/encoding/proto/to-amino/utils.d.ts b/packages/ast/types/encoding/proto/to-amino/utils.d.ts index 2d421eb73f..96d1543b74 100644 --- a/packages/ast/types/encoding/proto/to-amino/utils.d.ts +++ b/packages/ast/types/encoding/proto/to-amino/utils.d.ts @@ -3,7 +3,7 @@ import { ProtoType } from '@cosmology/types'; import { ProtoParseContext } from '../../context'; import { ToAminoJSONMethod } from './index'; export declare const toAminoJSON: { - scalar(args: ToAminoJSONMethod): t.ExpressionStatement; + scalar(args: ToAminoJSONMethod, valExpr?: t.Expression): t.ExpressionStatement; string(args: ToAminoJSONMethod): t.ExpressionStatement; double(args: ToAminoJSONMethod): t.ExpressionStatement; float(args: ToAminoJSONMethod): t.ExpressionStatement; @@ -55,7 +55,7 @@ export declare const arrayTypes: { rawBytes(args: ToAminoJSONMethod): t.CallExpression; wasmByteCode(args: ToAminoJSONMethod): t.CallExpression; bytes(args: ToAminoJSONMethod): t.CallExpression; - enum(args: ToAminoJSONMethod): t.Identifier; + enum(): t.Identifier; anyType(args: ToAminoJSONMethod): t.ConditionalExpression; protoType(args: ToAminoJSONMethod): t.ConditionalExpression; type(args: ToAminoJSONMethod): t.ConditionalExpression; diff --git a/packages/ast/types/encoding/types.d.ts b/packages/ast/types/encoding/types.d.ts index 7cfadb641e..7a5a238357 100644 --- a/packages/ast/types/encoding/types.d.ts +++ b/packages/ast/types/encoding/types.d.ts @@ -27,4 +27,5 @@ export declare const getTSAminoType: (context: GenericParseContext, type: string export declare const getTSTypeFromGoogleType: (context: GenericParseContext, type: string, options?: TelescopeBaseTypes) => t.TSStringKeyword | t.TSTypeReference; export declare const getTSTypeForAmino: (context: GenericParseContext, field: ProtoField) => t.TSAnyKeyword | t.TSBooleanKeyword | t.TSNumberKeyword | t.TSStringKeyword | t.TSTypeReference; export declare const getTSTypeForProto: (context: GenericParseContext, field: ProtoField) => t.TSBooleanKeyword | t.TSNumberKeyword | t.TSStringKeyword | t.TSTypeReference; -export declare const getDefaultTSTypeFromProtoType: (context: ProtoParseContext, field: ProtoField, isOneOf: boolean) => t.Expression; +export declare const getDefaultTSTypeFromProtoType: (context: ProtoParseContext, field: ProtoField, isOneOf: boolean, useNullForOptionals?: boolean) => t.Expression; +export declare const getDefaultTSTypeFromAminoTypeDefault: (context: ProtoParseContext, field: ProtoField) => t.CallExpression; diff --git a/packages/ast/types/utils/amino.d.ts b/packages/ast/types/utils/amino.d.ts new file mode 100644 index 0000000000..c3102c60b0 --- /dev/null +++ b/packages/ast/types/utils/amino.d.ts @@ -0,0 +1,7 @@ +export declare const AminoUtils: { + shouldOmitEmpty(field: { + options: { + [p: string]: any; + }; + }): boolean; +}; diff --git a/packages/ast/types/utils/utils.d.ts b/packages/ast/types/utils/utils.d.ts index 8607340236..9cac29421d 100644 --- a/packages/ast/types/utils/utils.d.ts +++ b/packages/ast/types/utils/utils.d.ts @@ -13,7 +13,7 @@ export declare const shorthandProperty: (prop: string) => t.ObjectProperty; export declare const importStmt: (names: string[], path: string) => t.ImportDeclaration; export declare const memberExpressionOrIdentifier: (names: any) => any; export declare const memberExpressionOrIdentifierAminoCasing: (names: any, aminoCasingFn: Function) => any; -export declare const memberExpressionOrIdentifierAminoCaseField: (fields: ProtoField[], aminoCaseFunc: Function) => any; +export declare const memberExpressionOrIdentifierAminoCaseField: (fields: ProtoField[], aminoCaseFunc: Function, useNullHandling?: boolean) => any; export declare const promiseTypeAnnotation: (name: any) => t.TSTypeAnnotation; export declare const getAcceptedInterfacesTypes: (context: ProtoParseContext, lookupInterface: string) => import("@cosmology/types").TraversalSymbol[]; export declare const getSdkFieldName: (fieldName: string, field: ProtoField) => string; diff --git a/packages/telescope/README.md b/packages/telescope/README.md index 9c681236dc..29e155cbfe 100644 --- a/packages/telescope/README.md +++ b/packages/telescope/README.md @@ -262,12 +262,15 @@ telescope({ | option | description | defaults | | ------------------------------ | -------------------------------------------------------------- | ---------- | | `aminoEncoding.enabled` | generate amino types and amino converters | `true` | +| `aminoEncoding.omitEmptyTags` | An array of strings that determines whether a field should be omitted when serialized to JSON. If the array includes "omitempty", any field with the "omitempty" option in either gogoproto.jsontag or cosmos_proto.json_tag will be omitted. If the array includes "dont_omitempty", the field will be omitted or not based on the value of "(amino.dont_omitempty)": if it's null or false, the field will be omitted; if it's true, the field will not be omitted. | `["omitempty", "dont_omitempty"]` | | `aminoEncoding.disableMsgTypes` | disable generating AminoMsg types | `false` | | `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` | @deprecated. To use legacy inline encoding instead of using v2 recursive encoding | `false`| | `aminoEncoding.useRecursiveV2encoding` | this's been removed. See useLegacyInlineEncoding instead. | | +| `aminoEncoding.legacy.useNullHandling` | handle null case when generating legacy amino converters(those in tx.amino.ts) | | +| `aminoEncoding.legacy.useOmitEmpty` | handle omit empty or not when generating legacy amino converters(those in tx.amino.ts) | | ### Implemented Interface Options diff --git a/packages/telescope/__tests__/__snapshots__/impl-interfaces.test.ts.snap b/packages/telescope/__tests__/__snapshots__/impl-interfaces.test.ts.snap index 9c23e60993..39195bb049 100644 --- a/packages/telescope/__tests__/__snapshots__/impl-interfaces.test.ts.snap +++ b/packages/telescope/__tests__/__snapshots__/impl-interfaces.test.ts.snap @@ -45,7 +45,7 @@ exports[`implements interface works toAmino for interface 1`] = ` "value": Uint8Array [], }, ], - "opt": 0, + "opt": undefined, "single_msg": { "type": "", "value": Uint8Array [], @@ -73,7 +73,7 @@ exports[`implements interface works toAmino for interface with Any 1`] = ` "value": Uint8Array [], }, ], - "opt": 0, + "opt": undefined, "single_msg": { "type": "", "value": Uint8Array [], diff --git a/packages/telescope/__tests__/telescope-instant-rpc.test.ts b/packages/telescope/__tests__/telescope-instant-rpc.test.ts index 362779f469..d70ff69578 100644 --- a/packages/telescope/__tests__/telescope-instant-rpc.test.ts +++ b/packages/telescope/__tests__/telescope-instant-rpc.test.ts @@ -234,6 +234,10 @@ const options: TelescopeOptions = { aminoEncoding: { enabled: true, + legacy: { + useNullHandling: true, + useOmitEmpty: true + }, exceptions: { "/akash.audit.v1beta2.MsgSignProviderAttributes": { aminoType: "mymessage-testonly", diff --git a/packages/telescope/package.json b/packages/telescope/package.json index e253f43904..49b96808dd 100644 --- a/packages/telescope/package.json +++ b/packages/telescope/package.json @@ -78,7 +78,8 @@ "ts-jest": "^29.1.0", "ts-node": "10.9.1", "ts-node-dev": "2.0.0", - "typescript": "^5.0.4" + "typescript": "^5.0.4", + "@keplr-wallet/unit": "^0.12.53" }, "dependencies": { "@babel/generator": "^7.23.6", @@ -103,7 +104,6 @@ "minimist": "1.2.8", "mkdirp": "3.0.0", "parse-package-name": "1.0.0", - "rimraf": "5.0.0", - "shelljs": "0.8.5" + "rimraf": "5.0.0" } } diff --git a/packages/telescope/src/build.ts b/packages/telescope/src/build.ts index 2cb9b0e19b..a695373bfb 100644 --- a/packages/telescope/src/build.ts +++ b/packages/telescope/src/build.ts @@ -253,4 +253,4 @@ export class TelescopeParseContext implements TelescopeParseContext { mutations: getMutations(this.mutations) })); } -} \ No newline at end of file +} diff --git a/packages/telescope/src/helpers/internal-for-bigint.ts b/packages/telescope/src/helpers/internal-for-bigint.ts index bd4d815418..f7daa3dd47 100644 --- a/packages/telescope/src/helpers/internal-for-bigint.ts +++ b/packages/telescope/src/helpers/internal-for-bigint.ts @@ -45,7 +45,7 @@ export interface AminoHeight { readonly revision_height?: string; } -export function omitDefault( +export function omitDefault( input: T ): T | undefined { if (typeof input === 'string') { @@ -56,6 +56,10 @@ export function omitDefault( return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (typeof input === 'bigint') { return input === BigInt(0) ? undefined : input; } diff --git a/packages/telescope/src/helpers/internal.ts b/packages/telescope/src/helpers/internal.ts index 024a760c70..fc5871530b 100644 --- a/packages/telescope/src/helpers/internal.ts +++ b/packages/telescope/src/helpers/internal.ts @@ -54,7 +54,7 @@ export interface AminoHeight { readonly revision_height?: string; }; -export function omitDefault(input: T): T | undefined { +export function omitDefault(input: T): T | undefined { if (typeof input === "string") { return input === "" ? undefined : input; } @@ -63,8 +63,12 @@ export function omitDefault(input: T): T | und return input === 0 ? undefined : input; } + if (typeof input === "boolean"){ + return input === false ? undefined : input; + } + if (Long.isLong(input)) { - return input.isZero() ? undefined : input; + return (input as Long).isZero() ? undefined : input; } throw new Error(\`Got unsupported type \${typeof input}\`); diff --git a/packages/types/src/telescope.ts b/packages/types/src/telescope.ts index 94707b7687..0e9d8fcb51 100644 --- a/packages/types/src/telescope.ts +++ b/packages/types/src/telescope.ts @@ -87,6 +87,7 @@ interface TelescopeOpts { customTypes?: { useCosmosSDKDec?: boolean; }, + num64?: 'long' | 'bigint'; useDeepPartial?: boolean; useExact?: boolean; @@ -140,6 +141,7 @@ interface TelescopeOpts { customTypes?: { useCosmosSDKDec?: boolean; }, + omitEmptyTags?: ( "omitempty" | "dont_omitempty" )[]; useProtoOptionality?: boolean; disableMsgTypes?: boolean; casingFn?: Function; @@ -151,6 +153,10 @@ interface TelescopeOpts { * @deprecated The logic of useLegacyInlineEncoding will be deprecated in the future. */ useLegacyInlineEncoding?: boolean; + legacy?: { + useNullHandling?: boolean; + useOmitEmpty?: boolean; + } }; lcdClients?: { @@ -372,6 +378,7 @@ export const defaultTelescopeOptions: TelescopeOptions = { customTypes: { useCosmosSDKDec: false }, + omitEmptyTags: ["omitempty", "dont_omitempty"], casingFn: snake, exceptions: { ...DEFAULT_AMINO_EXCEPTIONS diff --git a/packages/types/types/telescope.d.ts b/packages/types/types/telescope.d.ts index 5ec64d20c5..363b3325fd 100644 --- a/packages/types/types/telescope.d.ts +++ b/packages/types/types/telescope.d.ts @@ -115,6 +115,7 @@ interface TelescopeOpts { customTypes?: { useCosmosSDKDec?: boolean; }; + omitEmptyTags?: ("omitempty" | "dont_omitempty")[]; useProtoOptionality?: boolean; disableMsgTypes?: boolean; casingFn?: Function; @@ -124,6 +125,10 @@ interface TelescopeOpts { * @deprecated The logic of useLegacyInlineEncoding will be deprecated in the future. */ useLegacyInlineEncoding?: boolean; + legacy?: { + useNullHandling?: boolean; + useOmitEmpty?: boolean; + }; }; lcdClients?: { enabled: boolean; diff --git a/packages/utils/src/__tests__/amino.test.ts b/packages/utils/src/__tests__/amino.test.ts new file mode 100644 index 0000000000..68d2ddc971 --- /dev/null +++ b/packages/utils/src/__tests__/amino.test.ts @@ -0,0 +1,311 @@ +import { shouldOmitEmpty } from "../amino"; +import { ProtoField } from "@cosmology/types"; +import cases from "jest-in-case"; + +describe("shouldOmitEmpty", () => { + cases( + `shouldOmitEmpty`, + (opts) => { + const ctx: any = { + pluginValue: jest.fn().mockReturnValue(opts.pluginValue), + }; + const field: ProtoField = { + id: 0, + options: opts.options, + }; + expect(shouldOmitEmpty(ctx, field)).toBe(opts.result); + }, + [ + // empty omitEmptyTags means the result would be true all the time. + { + name: "empty omitEmptyTags means the result would be true all the time.", + pluginValue: [], + options: { + "(amino.dont_omitempty)": false, + }, + result: true, + }, + { + name: "empty omitEmptyTags means the result would be true all the time.", + pluginValue: [], + options: { + "(amino.dont_omitempty)": true, + }, + result: true, + }, + { + name: "empty omitEmptyTags means the result would be true all the time.", + pluginValue: [], + options: { + "(gogoproto.jsontag)": "attributes,omitempty", + }, + result: true, + }, + { + name: "empty omitEmptyTags means the result would be true all the time.", + pluginValue: [], + options: { + "(gogoproto.jsontag)": "attributes", + }, + result: true, + }, + { + name: "empty omitEmptyTags means the result would be true all the time.", + pluginValue: [], + options: null, + result: true, + }, + + // aminoEncoding.omitEmptyTags includes "omitempty" + // if there're gogoproto.jsontag and cosmos_proto.json_tag and any of them includes omitempty, the result would be true, otherwise false. + { + name: "omitEmptyTags: omitempty, if none of gogoproto.jsontag and cosmos_proto.json_tag include omitempty, then false", + pluginValue: ["omitempty"], + options: { + "(gogoproto.jsontag)": "attributes", + }, + result: false, + }, + { + name: "omitEmptyTags: omitempty, if gogoproto.jsontag includes omitempty, then true", + pluginValue: ["omitempty"], + options: { + "(gogoproto.jsontag)": "attributes,omitempty", + }, + result: true, + }, + { + name: "omitEmptyTags: omitempty, if there's jsontag and none of cosmos_proto.json_tag and cosmos_proto.json_tag include omitempty, then false", + pluginValue: ["omitempty"], + options: { + "(cosmos_proto.json_tag)": "attributes", + }, + result: false, + }, + { + name: "omitEmptyTags: omitempty, if cosmos_proto.json_tag includes omitempty, then true", + pluginValue: ["omitempty"], + options: { + "(cosmos_proto.json_tag)": "attributes,omitempty", + }, + result: true, + }, + { + name: "omitEmptyTags: omitempty, if gogoproto.jsontag and cosmos_proto.json_tag both include omitempty, then true", + pluginValue: ["omitempty"], + options: { + "(gogoproto.jsontag)": "attributes,omitempty", + "(cosmos_proto.json_tag)": "attributes,omitempty", + }, + result: true, + }, + { + name: "omitEmptyTags: omitempty, if gogoproto.jsontag includes omitempty and cosmos_proto.json_tag does not include omitempty, then true", + pluginValue: ["omitempty"], + options: { + "(gogoproto.jsontag)": "attributes,omitempty", + "(cosmos_proto.json_tag)": "attributes", + }, + result: true, + }, + { + name: "omitEmptyTags: omitempty, if gogoproto.jsontag does not include omitempty and cosmos_proto.json_tag includes omitempty, then true", + pluginValue: ["omitempty"], + options: { + "(gogoproto.jsontag)": "attributes", + "(cosmos_proto.json_tag)": "attributes,omitempty", + }, + result: true, + }, + { + name: "omitEmptyTags: omitempty, if gogoproto.jsontag and cosmos_proto.json_tag both do not include omitempty, then false", + pluginValue: ["omitempty"], + options: { + "(gogoproto.jsontag)": "attributes", + "(cosmos_proto.json_tag)": "attributes", + }, + result: false, + }, + { + name: "omitEmptyTags: omitempty, if gogoproto.jsontag and cosmos_proto.json_tag both do not include omitempty, then false. And amino.dont_omitempty will be ignored.", + pluginValue: ["omitempty"], + options: { + "(gogoproto.jsontag)": "attributes", + "(cosmos_proto.json_tag)": "attributes", + "(amino.dont_omitempty)": false, + }, + result: false, + }, + { + name: "omitEmptyTags: omitempty, if options is null, then true. And amino.dont_omitempty will be ignored.", + pluginValue: ["omitempty"], + options: { + "(gogoproto.jsontag)": "attributes", + "(cosmos_proto.json_tag)": "attributes", + "(amino.dont_omitempty)": false, + }, + result: false, + }, + + // aminoEncoding.omitEmptyTags includes "dont_omitempty" only + // if amino.dont_omitempty is true, then false, otherwise true. + { + name: "omitEmptyTags: dont_omitempty, if amino.dont_omitempty is true, then false", + pluginValue: ["dont_omitempty"], + options: { + "(amino.dont_omitempty)": true, + }, + result: false, + }, + { + name: "omitEmptyTags: dont_omitempty, if amino.dont_omitempty is false, then true", + pluginValue: ["dont_omitempty"], + options: { + "(amino.dont_omitempty)": false, + }, + result: true, + }, + { + name: "omitEmptyTags: dont_omitempty, if amino.dont_omitempty is not present, then true", + pluginValue: ["dont_omitempty"], + options: {}, + result: true, + }, + { + name: "omitEmptyTags: dont_omitempty, if amino.dont_omitempty is true and gogoproto.jsontag includes omitempty, then false", + pluginValue: ["dont_omitempty"], + options: { + "(amino.dont_omitempty)": true, + "(gogoproto.jsontag)": "attributes,omitempty", + }, + result: false, + }, + { + name: "omitEmptyTags: dont_omitempty, if amino.dont_omitempty is false and gogoproto.jsontag includes omitempty, then true", + pluginValue: ["dont_omitempty"], + options: { + "(amino.dont_omitempty)": false, + "(gogoproto.jsontag)": "attributes,omitempty", + }, + result: true, + }, + + // aminoEncoding.omitEmptyTags includes both "omitempty" and "dont_omitempty" + // if there're gogoproto.jsontag and cosmos_proto.json_tag and any of them includes omitempty, the result would be true, otherwise false. And amino.dont_omitempty will be ignored. + // after that, if amino.dont_omitempty is true, then false, otherwise true. + // if there's no options, then true. + { + name: "omitEmptyTags: omitempty and dont_omitempty, if amino.dont_omitempty is true, then false", + pluginValue: ["omitempty", "dont_omitempty"], + options: { + "(amino.dont_omitempty)": true, + }, + result: false, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if amino.dont_omitempty is true and gogoproto.jsontag includes omitempty, then true", + pluginValue: ["omitempty", "dont_omitempty"], + options: { + "(amino.dont_omitempty)": true, + "(gogoproto.jsontag)": "attributes,omitempty", + }, + result: true, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if amino.dont_omitempty is false and gogoproto.jsontag does not include omitempty, then false", + pluginValue: ["omitempty", "dont_omitempty"], + options: { + "(amino.dont_omitempty)": false, + "(gogoproto.jsontag)": "attributes", + }, + result: false, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if amino.dont_omitempty is not present and gogoproto.jsontag includes omitempty, then true", + pluginValue: ["omitempty", "dont_omitempty"], + options: { + "(gogoproto.jsontag)": "attributes,omitempty", + }, + result: true, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if amino.dont_omitempty is not present and gogoproto.jsontag does not include omitempty, then false", + pluginValue: ["omitempty", "dont_omitempty"], + options: { + "(gogoproto.jsontag)": "attributes", + }, + result: false, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if amino.dont_omitempty is true and gogoproto.jsontag includes omitempty, then true", + pluginValue: ["omitempty", "dont_omitempty"], + options: { + "(amino.dont_omitempty)": true, + "(gogoproto.jsontag)": "attributes,omitempty", + }, + result: true, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if amino.dont_omitempty is false and gogoproto.jsontag includes omitempty, then true", + pluginValue: ["omitempty", "dont_omitempty"], + options: { + "(amino.dont_omitempty)": false, + "(gogoproto.jsontag)": "attributes,omitempty", + }, + result: true, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if amino.dont_omitempty is true and gogoproto.jsontag does not include omitempty, then false", + pluginValue: ["omitempty", "dont_omitempty"], + options: { + "(amino.dont_omitempty)": true, + "(gogoproto.jsontag)": "attributes", + }, + result: false, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if amino.dont_omitempty is false and gogoproto.jsontag does not include omitempty, then false", + pluginValue: ["omitempty", "dont_omitempty"], + options: { + "(amino.dont_omitempty)": false, + "(gogoproto.jsontag)": "attributes", + }, + result: false, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if amino.dont_omitempty is not present and gogoproto.jsontag includes omitempty, then true", + pluginValue: ["omitempty", "dont_omitempty"], + options: { + "(gogoproto.jsontag)": "attributes,omitempty", + }, + result: true, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if amino.dont_omitempty is not present and gogoproto.jsontag does not include omitempty, then false", + pluginValue: ["omitempty", "dont_omitempty"], + options: { + "(gogoproto.jsontag)": "attributes", + }, + result: false, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if options is null, then true", + pluginValue: ["omitempty", "dont_omitempty"], + options: null, + result: true, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if options is undefined, then true", + pluginValue: ["omitempty", "dont_omitempty"], + options: undefined, + result: true, + }, + { + name: "omitEmptyTags: omitempty and dont_omitempty, if options is an empty object, then true", + pluginValue: ["omitempty", "dont_omitempty"], + options: {}, + result: true, + }, + ] + ); +}); diff --git a/packages/utils/src/amino.ts b/packages/utils/src/amino.ts index 25b1c0e3b6..77b8e21eea 100644 --- a/packages/utils/src/amino.ts +++ b/packages/utils/src/amino.ts @@ -7,6 +7,7 @@ import { ProtoRef, TelescopeOptions, IParseContext, + ProtoField, } from "@cosmology/types"; import { kebab } from "case"; @@ -124,3 +125,43 @@ export const getAminoTypeNameByRef = ( } } }; + +/** + * Determines whether a field should be omitted when serializing to JSON based on its JSON tag options. + * + * @param ctx - The parse context. + * @param field - The field to check. + * @returns A boolean indicating whether the field should be omitted. + */ +export const shouldOmitEmpty = ( + ctx: IParseContext, + field: ProtoField +): boolean => { + const omitEmptyTags = ctx.pluginValue("aminoEncoding.omitEmptyTags") ?? []; + + if (omitEmptyTags.includes("omitempty")) { + // omitempty + // if any of gogoproto.jsontag or cosmos_proto.json_tag has omitempty, it should be omitted + let gogoJsonTag = field.options?.["(gogoproto.jsontag)"]; + let cosmosJsonTag = field.options?.["(cosmos_proto.json_tag)"]; + + if (gogoJsonTag || cosmosJsonTag) { + return ( + !!gogoJsonTag?.split(",").includes("omitempty") || + !!cosmosJsonTag?.split(",").includes("omitempty") + ); + } + } + + if (omitEmptyTags.includes("dont_omitempty")) { + // dont_omitempty + // null: should omit + // true: should not omit + // false: should omit + const dontOmitempty = !!field?.options?.["(amino.dont_omitempty)"]; + + return !dontOmitempty; + } + + return true; +}; diff --git a/packages/utils/types/amino.d.ts b/packages/utils/types/amino.d.ts index 9bb8548fe5..25e7de8f9c 100644 --- a/packages/utils/types/amino.d.ts +++ b/packages/utils/types/amino.d.ts @@ -1,5 +1,13 @@ -import { ProtoAny, ProtoRoot, ProtoType, ProtoRef, TelescopeOptions, IParseContext } from "@cosmology/types"; +import { ProtoAny, ProtoRoot, ProtoType, ProtoRef, TelescopeOptions, IParseContext, ProtoField } from "@cosmology/types"; export declare const getTypeUrlWithPkgAndName: (pkg: string, name: string) => string; export declare const getTypeUrl: (root: ProtoRoot, proto: ProtoAny | ProtoType) => string; export declare const getAminoTypeName: (context: IParseContext, root: ProtoRoot, proto: ProtoType) => any; export declare const getAminoTypeNameByRef: (ref: ProtoRef, options: TelescopeOptions, root: ProtoRoot, proto: ProtoType) => any; +/** + * Determines whether a field should be omitted when serializing to JSON based on its JSON tag options. + * + * @param ctx - The parse context. + * @param field - The field to check. + * @returns A boolean indicating whether the field should be omitted. + */ +export declare const shouldOmitEmpty: (ctx: IParseContext, field: ProtoField) => boolean; diff --git a/yarn.lock b/yarn.lock index 897266952c..e3fd8a5016 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15,7 +15,7 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.23.5": version "7.23.5" resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== @@ -49,21 +49,21 @@ json5 "^2.2.1" semver "^6.3.0" -"@babel/core@^7.11.6", "@babel/core@^7.12.3": - version "7.23.6" - resolved "https://registry.npmjs.org/@babel/core/-/core-7.23.6.tgz#8be77cd77c55baadcc1eae1c33df90ab6d2151d4" - integrity sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw== +"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.9": + version "7.23.9" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1" + integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.23.5" "@babel/generator" "^7.23.6" "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.6" - "@babel/parser" "^7.23.6" - "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.6" - "@babel/types" "^7.23.6" + "@babel/helpers" "^7.23.9" + "@babel/parser" "^7.23.9" + "@babel/template" "^7.23.9" + "@babel/traverse" "^7.23.9" + "@babel/types" "^7.23.9" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -115,10 +115,9 @@ semver "^6.3.1" "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.6.tgz#b04d915ce92ce363666f816a884cdcfc9be04953" - integrity sha512-cBXU1vZni/CpGF29iTu4YRbOZt3Wat6zCoMDxRF1MayiEc4URxOj31tT65HUM0CRpMowA3HCJaAOVOUnMf96cw== - dependencies: + version "7.23.10" + resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.10.tgz#25d55fafbaea31fd0e723820bb6cc3df72edf7ea" + integrity sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw== "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" @@ -270,14 +269,14 @@ "@babel/template" "^7.22.15" "@babel/types" "^7.22.19" -"@babel/helpers@^7.18.9", "@babel/helpers@^7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.6.tgz#d03af2ee5fb34691eec0cda90f5ecbb4d4da145a" - integrity sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA== +"@babel/helpers@^7.18.9", "@babel/helpers@^7.23.9": + version "7.23.9" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz#c3e20bbe7f7a7e10cb9b178384b4affdf5995c7d" + integrity sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ== dependencies: - "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.6" - "@babel/types" "^7.23.6" + "@babel/template" "^7.23.9" + "@babel/traverse" "^7.23.9" + "@babel/types" "^7.23.9" "@babel/highlight@^7.23.4": version "7.23.4" @@ -293,10 +292,10 @@ resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9" integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ== -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" - integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.20.7", "@babel/parser@^7.23.6", "@babel/parser@^7.23.9": + version "7.23.9" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b" + integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.23.3" @@ -633,15 +632,13 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-transform-classes@^7.18.9": - version "7.23.5" - resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz#e7a75f815e0c534cc4c9a39c56636c84fc0d64f2" - integrity sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg== - dependencies: + version "7.23.8" + resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92" + integrity sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg== "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-compilation-targets" "^7.22.15" + "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" - "@babel/helper-optimise-call-expression" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-replace-supers" "^7.22.20" "@babel/helper-split-export-declaration" "^7.22.6" @@ -734,9 +731,9 @@ "@babel/helper-simple-access" "^7.22.5" "@babel/plugin-transform-modules-systemjs@^7.18.9": - version "7.23.3" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz#fa7e62248931cb15b9404f8052581c302dd9de81" - integrity sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ== + version "7.23.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz#105d3ed46e4a21d257f83a2f9e2ee4203ceda6be" + integrity sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw== dependencies: "@babel/helper-hoist-variables" "^7.22.5" "@babel/helper-module-transforms" "^7.23.3" @@ -994,20 +991,20 @@ integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== "@babel/runtime@^7.11.2", "@babel/runtime@^7.18.9", "@babel/runtime@^7.19.0", "@babel/runtime@^7.19.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.8.4": - version "7.23.6" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.6.tgz#c05e610dc228855dc92ef1b53d07389ed8ab521d" - integrity sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ== + version "7.23.9" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7" + integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw== dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.18.10", "@babel/template@^7.22.15", "@babel/template@^7.3.3": - version "7.22.15" - resolved "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" - integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== +"@babel/template@^7.18.10", "@babel/template@^7.22.15", "@babel/template@^7.23.9", "@babel/template@^7.3.3": + version "7.23.9" + resolved "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz#f881d0487cba2828d3259dcb9ef5005a9731011a" + integrity sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA== dependencies: - "@babel/code-frame" "^7.22.13" - "@babel/parser" "^7.22.15" - "@babel/types" "^7.22.15" + "@babel/code-frame" "^7.23.5" + "@babel/parser" "^7.23.9" + "@babel/types" "^7.23.9" "@babel/traverse@7.18.11": version "7.18.11" @@ -1025,7 +1022,7 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/traverse@7.23.6", "@babel/traverse@^7.18.10", "@babel/traverse@^7.23.6": +"@babel/traverse@7.23.6": version "7.23.6" resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5" integrity sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ== @@ -1041,6 +1038,22 @@ debug "^4.3.1" globals "^11.1.0" +"@babel/traverse@^7.18.10", "@babel/traverse@^7.23.9": + version "7.23.9" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950" + integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg== + dependencies: + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.6" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.23.9" + "@babel/types" "^7.23.9" + debug "^4.3.1" + globals "^11.1.0" + "@babel/types@7.18.10": version "7.18.10" resolved "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6" @@ -1050,7 +1063,7 @@ "@babel/helper-validator-identifier" "^7.18.6" to-fast-properties "^2.0.0" -"@babel/types@7.23.6", "@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.3.3", "@babel/types@^7.4.4": +"@babel/types@7.23.6": version "7.23.6" resolved "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg== @@ -1059,6 +1072,15 @@ "@babel/helper-validator-identifier" "^7.22.20" to-fast-properties "^2.0.0" +"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.23.9" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002" + integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q== + dependencies: + "@babel/helper-string-parser" "^7.23.4" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -1089,20 +1111,20 @@ dependencies: "@babel/runtime" "^7.21.0" -"@chain-registry/types@^0.17.1": - version "0.17.1" - resolved "https://registry.npmjs.org/@chain-registry/types/-/types-0.17.1.tgz#0ac7bda6178d3917834578627f232a247fe5def8" - integrity sha512-O0CgrtJgIlqXvZm1CqDZe/7jZz068O/uuCIoyDXCegFHK03rdHacKcDGwEIUuI0MNUf8YV3jdE4xHQMSAX+79w== +"@chain-registry/types@^0.18.0": + version "0.18.0" + resolved "https://registry.npmjs.org/@chain-registry/types/-/types-0.18.0.tgz#68d91054a5b36ff621248f2843f3ff62dc9ade7f" + integrity sha512-jRFOKOMIAcA5Qp5cXEiAPyXs13WbSP19kvcb8qm5vaRwXvHMufPd/ZxLC80yq/LB62FeZeaVYfsjorLf3M6tTw== dependencies: "@babel/runtime" "^7.21.0" "@chain-registry/utils@^1.10.0": - version "1.17.0" - resolved "https://registry.npmjs.org/@chain-registry/utils/-/utils-1.17.0.tgz#f3072c2ca59bc81516f8fac0994ac05d9236a60a" - integrity sha512-MNIfpFM8rF1Gex+LhmuHgUElLbjz2vgmjI9qpRl9MMuQUSndu/NVhCDWcgvGNVKCD6woR6ohD9UIs9n0/Q91AA== + version "1.18.0" + resolved "https://registry.npmjs.org/@chain-registry/utils/-/utils-1.18.0.tgz#d711efc2660b3b65077a5bee90b45ddc6af2194f" + integrity sha512-FAPyP1FN1jr88GfiBWnppe5S1ddgbK9TfwkyKuNSKHlk9Q+fhdC4nPM552bEz76AuFyfv7SFHg3kDuQSgYYZBw== dependencies: "@babel/runtime" "^7.21.0" - "@chain-registry/types" "^0.17.1" + "@chain-registry/types" "^0.18.0" bignumber.js "9.1.1" sha.js "^2.4.11" @@ -1736,12 +1758,12 @@ integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== "@humanwhocodes/config-array@^0.11.8": - version "0.11.13" - resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297" - integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ== + version "0.11.14" + resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" + integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== dependencies: - "@humanwhocodes/object-schema" "^2.0.1" - debug "^4.1.1" + "@humanwhocodes/object-schema" "^2.0.2" + debug "^4.3.1" minimatch "^3.0.5" "@humanwhocodes/module-importer@^1.0.1": @@ -1749,10 +1771,10 @@ resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== -"@humanwhocodes/object-schema@^2.0.1": - version "2.0.1" - resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044" - integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw== +"@humanwhocodes/object-schema@^2.0.2": + version "2.0.2" + resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917" + integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw== "@hutson/parse-repository-url@^3.0.0": version "3.0.2" @@ -1824,7 +1846,7 @@ js-yaml "^3.13.1" resolve-from "^5.0.0" -"@istanbuljs/schema@^0.1.2": +"@istanbuljs/schema@^0.1.2", "@istanbuljs/schema@^0.1.3": version "0.1.3" resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== @@ -2083,18 +2105,18 @@ chalk "^4.0.0" "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.3" - resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" - integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== + version "0.3.4" + resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.4.tgz#9b18145d26cf33d08576cf4c7665b28554480ed7" + integrity sha512-Oud2QPM5dHviZNn4y/WhhYKSXksv+1xLEIsNrAbGcFzUN3ubqWRFT5gwPchNc5NuzILOU4tPBDTZ4VwhL8Y7cw== dependencies: "@jridgewell/set-array" "^1.0.1" "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" "@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0": - version "3.1.1" - resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" - integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== + version "3.1.2" + resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== "@jridgewell/set-array@^1.0.1": version "1.1.2" @@ -2115,9 +2137,9 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.20" - resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f" - integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q== + version "0.3.23" + resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.23.tgz#afc96847f3f07841477f303eed687707a5aacd80" + integrity sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg== dependencies: "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" @@ -2144,10 +2166,10 @@ axios "^0.27.2" long "^4.0.0" -"@keplr-wallet/types@0.12.62": - version "0.12.62" - resolved "https://registry.npmjs.org/@keplr-wallet/types/-/types-0.12.62.tgz#46ece9a5f0c3514c4613941cd0796d508f058858" - integrity sha512-IM6Z5wxYyHUIOiFx3Jc48JmFfYMJTLvFqBpKlsYv+Zozpp99R+qSySzj3BOSi1wUmW3VoIKHLaGFGjIu4iDCzw== +"@keplr-wallet/types@0.12.70": + version "0.12.70" + resolved "https://registry.npmjs.org/@keplr-wallet/types/-/types-0.12.70.tgz#55cd9a79479156da0979558b78179781a0e9c9f1" + integrity sha512-oOZEkWVOj/GCrKpcJR8EQKp6SvWHHzuZAwVkRnxJc9UKaaOE6kiOJnu02dl9jLhTziK2/JqUbXOsF/Hopw7xOQ== dependencies: long "^4.0.0" @@ -2170,11 +2192,11 @@ utility-types "^3.10.0" "@keplr-wallet/unit@^0.12.53": - version "0.12.62" - resolved "https://registry.npmjs.org/@keplr-wallet/unit/-/unit-0.12.62.tgz#f2d6761f443ac2b189d370de7d2791b49ca41beb" - integrity sha512-2cCFkilVREb86sr/EMqcLrv4JfxgEW0fpY+DqzGsIwzZ8f/lmOgMhLlUWkbBUqRLD43iZQFiOMpl1X9KgAwpjg== + version "0.12.70" + resolved "https://registry.npmjs.org/@keplr-wallet/unit/-/unit-0.12.70.tgz#a8207c81156582da73e3bb3fc60afb6f62c25273" + integrity sha512-yIfwa7R+z9hJdggGF0lcJN2JEfEP75XI1m3UCzL92P09r8QR5x0ZBxf3nsyt0BQIHlGEqhYaI5orWsJ1srNEQg== dependencies: - "@keplr-wallet/types" "0.12.62" + "@keplr-wallet/types" "0.12.70" big-integer "^1.6.48" utility-types "^3.10.0" @@ -2723,9 +2745,9 @@ type-detect "4.0.8" "@sinonjs/commons@^3.0.0": - version "3.0.0" - resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72" - integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA== + version "3.0.1" + resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd" + integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ== dependencies: type-detect "4.0.8" @@ -2736,6 +2758,13 @@ dependencies: "@sinonjs/commons" "^3.0.0" +"@sinonjs/fake-timers@^11.2.2": + version "11.2.2" + resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz#50063cc3574f4a27bd8453180a04171c85cc9699" + integrity sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw== + dependencies: + "@sinonjs/commons" "^3.0.0" + "@sinonjs/fake-timers@^9.1.2": version "9.1.2" resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c" @@ -2752,7 +2781,7 @@ lodash.get "^4.4.2" type-detect "^4.0.8" -"@sinonjs/text-encoding@^0.7.1": +"@sinonjs/text-encoding@^0.7.2": version "0.7.2" resolved "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918" integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ== @@ -2835,9 +2864,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.20.4" - resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.4.tgz#ec2c06fed6549df8bc0eb4615b683749a4a92e1b" - integrity sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA== + version "7.20.5" + resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz#7b7502be0aa80cc4ef22978846b983edaafcd4dd" + integrity sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ== dependencies: "@babel/types" "^7.20.7" @@ -2876,9 +2905,9 @@ "@types/istanbul-lib-report" "*" "@types/jest@^29.5.0": - version "29.5.11" - resolved "https://registry.npmjs.org/@types/jest/-/jest-29.5.11.tgz#0c13aa0da7d0929f078ab080ae5d4ced80fa2f2c" - integrity sha512-S2mHmYIVe13vrm6q4kN6fLYYAka15ALQki/vgDC3mIukEOx8WJlv0kQPM+d4w8Gp6u0uSdKND04IlTXBv0rwnQ== + version "29.5.12" + resolved "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544" + integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw== dependencies: expect "^29.0.0" pretty-format "^29.0.0" @@ -2914,9 +2943,9 @@ integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== "@types/node@*", "@types/node@>=13.7.0": - version "20.10.5" - resolved "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz#47ad460b514096b7ed63a1dae26fad0914ed3ab2" - integrity sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw== + version "20.11.20" + resolved "https://registry.npmjs.org/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659" + integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg== dependencies: undici-types "~5.26.4" @@ -3006,14 +3035,14 @@ acorn-jsx@^5.3.2: integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^8.1.1: - version "8.3.1" - resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.1.tgz#2f10f5b69329d90ae18c58bf1fa8fccd8b959a43" - integrity sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw== + version "8.3.2" + resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa" + integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A== acorn@^8.4.1, acorn@^8.9.0: - version "8.11.2" - resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b" - integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w== + version "8.11.3" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" + integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== add-stream@^1.0.0: version "1.0.0" @@ -3270,11 +3299,11 @@ axios@1.6.0: proxy-from-env "^1.1.0" axios@^1.0.0, axios@^1.6.0: - version "1.6.2" - resolved "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2" - integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A== + version "1.6.7" + resolved "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7" + integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA== dependencies: - follow-redirects "^1.15.0" + follow-redirects "^1.15.4" form-data "^4.0.0" proxy-from-env "^1.1.0" @@ -3465,13 +3494,13 @@ brorand@^1.1.0: resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== -browserslist@^4.22.2: - version "4.22.2" - resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b" - integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A== +browserslist@^4.22.2, browserslist@^4.22.3: + version "4.23.0" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab" + integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== dependencies: - caniuse-lite "^1.0.30001565" - electron-to-chromium "^1.4.601" + caniuse-lite "^1.0.30001587" + electron-to-chromium "^1.4.668" node-releases "^2.0.14" update-browserslist-db "^1.0.13" @@ -3606,10 +3635,10 @@ camelcase@^6.2.0: resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001565: - version "1.0.30001571" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001571.tgz#4182e93d696ff42930f4af7eba515ddeb57917ac" - integrity sha512-tYq/6MoXhdezDLFZuCO/TKboTzuQ/xR5cFdgXPfDtM7/kchBO3b4VWghE/OAi/DV7tTdhmLjZiZBZi1fA/GheQ== +caniuse-lite@^1.0.30001587: + version "1.0.30001589" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001589.tgz#7ad6dba4c9bf6561aec8291976402339dc157dfb" + integrity sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg== case@1.6.3: version "1.6.3" @@ -3681,9 +3710,9 @@ charenc@~0.0.1: integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA== chokidar@^3.5.1: - version "3.5.3" - resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + version "3.6.0" + resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== dependencies: anymatch "~3.1.2" braces "~3.0.2" @@ -4010,11 +4039,11 @@ convert-source-map@^2.0.0: integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== core-js-compat@^3.21.0, core-js-compat@^3.22.1: - version "3.34.0" - resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.34.0.tgz#61a4931a13c52f8f08d924522bba65f8c94a5f17" - integrity sha512-4ZIyeNbW/Cn1wkMMDy+mvrRUxrwFNjKwbhCfQpDd+eLgYipDqp8oGFGtLmhh18EDPKA0g3VUBYOxQGGwvWLVpA== + version "3.36.0" + resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.36.0.tgz#087679119bc2fdbdefad0d45d8e5d307d45ba190" + integrity sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw== dependencies: - browserslist "^4.22.2" + browserslist "^4.22.3" core-util-is@~1.0.0: version "1.0.3" @@ -4214,13 +4243,13 @@ defaults@^1.0.3: clone "^1.0.2" define-data-property@^1.0.1: - version "1.1.1" - resolved "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" - integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== + version "1.1.4" + resolved "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== dependencies: - get-intrinsic "^1.2.1" + es-define-property "^1.0.0" + es-errors "^1.3.0" gopd "^1.0.1" - has-property-descriptors "^1.0.0" define-lazy-prop@^2.0.0: version "2.0.0" @@ -4272,9 +4301,9 @@ diff@^4.0.1: integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== diff@^5.0.0: - version "5.1.0" - resolved "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40" - integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw== + version "5.2.0" + resolved "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531" + integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A== dir-glob@^3.0.1: version "3.0.1" @@ -4303,9 +4332,9 @@ dotenv-expand@~10.0.0: integrity sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A== dotenv@~16.3.1: - version "16.3.1" - resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" - integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ== + version "16.3.2" + resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz#3cb611ce5a63002dbabf7c281bc331f69d28f03f" + integrity sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ== dotty@0.1.2: version "0.1.2" @@ -4336,10 +4365,10 @@ ejs@^3.1.7: dependencies: jake "^10.8.5" -electron-to-chromium@^1.4.601: - version "1.4.616" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.616.tgz#4bddbc2c76e1e9dbf449ecd5da3d8119826ea4fb" - integrity sha512-1n7zWYh8eS0L9Uy+GskE0lkBUNK83cXTVJI0pU3mGprFsbfSdAc15VTFbo+A+Bq4pwstmL30AVcEU3Fo463lNg== +electron-to-chromium@^1.4.668: + version "1.4.682" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.682.tgz#27577b88ccccc810e09b05093345cf1830f1bd65" + integrity sha512-oCglfs8yYKs9RQjJFOHonSnhikPK3y+0SvSYc/YpYJV//6rqc0/hbwd0c7vgK4vrl6y2gJAwjkhkSGWK+z4KRA== elliptic@^6.4.0, elliptic@^6.5.3, elliptic@^6.5.4: version "6.5.4" @@ -4455,9 +4484,9 @@ es6-weak-map@^2.0.3: es6-symbol "^3.1.1" escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + version "3.1.2" + resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" + integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" @@ -4724,9 +4753,9 @@ fast-safe-stringify@2.0.4: integrity sha512-mNlGUdKOeGNleyrmgbKYtbnCr9KZkZXU7eM89JRo8vY10f7Ul1Fbj07hUBW3N4fC0xM+fmfFfa2zM7mIizhpNQ== fastq@^1.6.0: - version "1.16.0" - resolved "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz#83b9a9375692db77a822df081edb6a9cf6839320" - integrity sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA== + version "1.17.1" + resolved "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" + integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== dependencies: reusify "^1.0.4" @@ -4815,16 +4844,16 @@ flat@^5.0.2: integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== flatted@^3.2.9: - version "3.2.9" - resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" - integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== + version "3.3.1" + resolved "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" + integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== fn.name@1.x.x: version "1.1.0" resolved "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -follow-redirects@^1.10.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0: +follow-redirects@^1.10.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0, follow-redirects@^1.15.4: version "1.15.5" resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020" integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw== @@ -4918,11 +4947,12 @@ get-caller-file@^2.0.5: resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: - version "1.2.2" - resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" - integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== +get-intrinsic@^1.1.3, get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== dependencies: + es-errors "^1.3.0" function-bind "^1.1.2" has-proto "^1.0.1" has-symbols "^1.0.3" @@ -5181,16 +5211,16 @@ has-flag@^4.0.0: integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== has-property-descriptors@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340" - integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg== + version "1.0.2" + resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== dependencies: - get-intrinsic "^1.2.2" + es-define-property "^1.0.0" has-proto@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" - integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== + version "1.0.3" + resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== has-symbols@^1.0.3: version "1.0.3" @@ -5220,10 +5250,9 @@ hash.js@^1.0.0, hash.js@^1.0.3, hash.js@~1.1.7: minimalistic-assert "^1.0.1" hasown@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" - integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== - dependencies: + version "2.0.1" + resolved "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa" + integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA== function-bind "^1.1.2" hmac-drbg@^1.0.1: @@ -5334,9 +5363,9 @@ ignore-walk@^6.0.0: minimatch "^9.0.0" ignore@^5.0.4, ignore@^5.2.0: - version "5.3.0" - resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" - integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== + version "5.3.1" + resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" + integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== import-fresh@^3.0.0, import-fresh@^3.2.1, import-fresh@^3.3.0: version "3.3.0" @@ -5492,10 +5521,13 @@ interpret@^1.0.0: resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== -ip@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105" - integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ== +ip-address@^9.0.5: + version "9.0.5" + resolved "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a" + integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g== + dependencies: + jsbn "1.1.0" + sprintf-js "^1.1.3" is-arrayish@^0.2.1: version "0.2.1" @@ -5648,11 +5680,6 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== - isarray@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -5690,13 +5717,13 @@ istanbul-lib-instrument@^5.0.4: semver "^6.3.0" istanbul-lib-instrument@^6.0.0: - version "6.0.1" - resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz#71e87707e8041428732518c6fb5211761753fbdf" - integrity sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA== + version "6.0.2" + resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz#91655936cf7380e4e473383081e38478b69993b1" + integrity sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw== dependencies: - "@babel/core" "^7.12.3" - "@babel/parser" "^7.14.7" - "@istanbuljs/schema" "^0.1.2" + "@babel/core" "^7.23.9" + "@babel/parser" "^7.23.9" + "@istanbuljs/schema" "^0.1.3" istanbul-lib-coverage "^3.2.0" semver "^7.5.4" @@ -5719,9 +5746,9 @@ istanbul-lib-source-maps@^4.0.0: source-map "^0.6.1" istanbul-reports@^3.1.3: - version "3.1.6" - resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a" - integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg== + version "3.1.7" + resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b" + integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" @@ -6246,6 +6273,11 @@ js-yaml@^3.10.0, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" +jsbn@1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" + integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A== + jsesc@^2.5.1: version "2.5.2" resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -6320,10 +6352,10 @@ jsonparse@^1.2.0, jsonparse@^1.3.1: resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== -just-extend@^4.0.2: - version "4.2.1" - resolved "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744" - integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg== +just-extend@^6.2.0: + version "6.2.0" + resolved "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz#b816abfb3d67ee860482e7401564672558163947" + integrity sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw== keyv@^4.5.3: version "4.5.4" @@ -6635,9 +6667,9 @@ lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== "lru-cache@^9.1.1 || ^10.0.0": - version "10.1.0" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484" - integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag== + version "10.2.0" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" + integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== lru-queue@^0.1.0: version "0.1.0" @@ -7077,15 +7109,15 @@ next-tick@1, next-tick@^1.1.0: integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== nise@^5.1.2: - version "5.1.5" - resolved "https://registry.npmjs.org/nise/-/nise-5.1.5.tgz#f2aef9536280b6c18940e32ba1fbdc770b8964ee" - integrity sha512-VJuPIfUFaXNRzETTQEEItTOP8Y171ijr+JLq42wHes3DiryR8vT+1TXQW/Rx8JNUhyYYWyIvjXTU6dOhJcs9Nw== + version "5.1.9" + resolved "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz#0cb73b5e4499d738231a473cd89bd8afbb618139" + integrity sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww== dependencies: - "@sinonjs/commons" "^2.0.0" - "@sinonjs/fake-timers" "^10.0.2" - "@sinonjs/text-encoding" "^0.7.1" - just-extend "^4.0.2" - path-to-regexp "^1.7.0" + "@sinonjs/commons" "^3.0.0" + "@sinonjs/fake-timers" "^11.2.2" + "@sinonjs/text-encoding" "^0.7.2" + just-extend "^6.2.0" + path-to-regexp "^6.2.1" node-addon-api@^3.2.1: version "3.2.1" @@ -7107,10 +7139,9 @@ node-fetch@^2.6.12, node-fetch@^2.6.7, node-fetch@^2.6.9: whatwg-url "^5.0.0" node-gyp-build@^4.3.0: - version "4.7.1" - resolved "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.7.1.tgz#cd7d2eb48e594874053150a9418ac85af83ca8f7" - integrity sha512-wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg== - + version "4.8.0" + resolved "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd" + integrity sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og== node-gyp@^9.0.0: version "9.4.1" resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185" @@ -7650,12 +7681,10 @@ path-scurry@^1.10.1, path-scurry@^1.6.1: lru-cache "^9.1.1 || ^10.0.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" -path-to-regexp@^1.7.0: - version "1.8.0" - resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" - integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== - dependencies: - isarray "0.0.1" +path-to-regexp@^6.2.1: + version "6.2.1" + resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz#d54934d6798eb9e5ef14e7af7962c945906918e5" + integrity sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw== path-type@^3.0.0: version "3.0.0" @@ -8280,9 +8309,9 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1: integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4: - version "7.5.4" - resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + version "7.6.0" + resolved "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" + integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== dependencies: lru-cache "^6.0.0" @@ -8408,11 +8437,11 @@ socks-proxy-agent@^7.0.0: socks "^2.6.2" socks@^2.6.2: - version "2.7.1" - resolved "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" - integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== + version "2.8.1" + resolved "https://registry.npmjs.org/socks/-/socks-2.8.1.tgz#22c7d9dd7882649043cba0eafb49ae144e3457af" + integrity sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ== dependencies: - ip "^2.0.0" + ip-address "^9.0.5" smart-buffer "^4.2.0" sort-keys@^2.0.0: @@ -8452,9 +8481,9 @@ spdx-correct@^3.0.0: spdx-license-ids "^3.0.0" spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + version "2.5.0" + resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66" + integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w== spdx-expression-parse@^3.0.0: version "3.0.1" @@ -8465,9 +8494,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.16" - resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" - integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== + version "3.0.17" + resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c" + integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg== split2@^3.2.2: version "3.2.2" @@ -8483,6 +8512,11 @@ split@^1.0.1: dependencies: through "2" +sprintf-js@^1.1.3: + version "1.1.3" + resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" + integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -8848,9 +8882,9 @@ triple-beam@^1.3.0: integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg== ts-jest@^29.1.0: - version "29.1.1" - resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b" - integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA== + version "29.1.2" + resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.2.tgz#7613d8c81c43c8cb312c6904027257e814c40e09" + integrity sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g== dependencies: bs-logger "0.x" fast-json-stable-stringify "2.x" @@ -9144,9 +9178,9 @@ util@^0.10.3: inherits "2.0.3" utility-types@^3.10.0: - version "3.10.0" - resolved "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b" - integrity sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg== + version "3.11.0" + resolved "https://registry.npmjs.org/utility-types/-/utility-types-3.11.0.tgz#607c40edb4f258915e901ea7995607fdf319424c" + integrity sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw== uuid@^9.0.0: version "9.0.1" @@ -9255,9 +9289,9 @@ wide-align@^1.1.5: string-width "^1.0.2 || 2 || 3 || 4" winston-transport@^4.4.0: - version "4.6.0" - resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.6.0.tgz#f1c1a665ad1b366df72199e27892721832a19e1b" - integrity sha512-wbBA9PbPAHxKiygo7ub7BYRiKxms0tpfU2ljtWzb3SjRjv5yl6Ozuy/TkXf00HTAt+Uylo3gSkNwzc4ME0wiIg== + version "4.7.0" + resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz#e302e6889e6ccb7f383b926df6936a5b781bd1f0" + integrity sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg== dependencies: logform "^2.3.2" readable-stream "^3.6.0"